PCoder
|
57c5255708
|
Update translation in DE : 200 to 2000
|
2017-12-22 23:37:49 +01:00 |
|
PCoder
|
3a558c86a6
|
Merge branch 'master' into task/3601/reduce_min_ram_to_1G
|
2017-12-22 23:27:32 +01:00 |
|
PCoder
|
3852ce04de
|
Set default RAM value to 2G in landing and hosting VM calculators
|
2017-12-21 08:41:29 +01:00 |
|
PCoder
|
979a62f120
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-21 02:04:17 +01:00 |
|
PCoder
|
4dff4e07cb
|
Change minimum required RAM from 2GB to 1GB
|
2017-12-21 01:25:52 +01:00 |
|
PCoder
|
4ee2ab8c45
|
Merge branch 'master' into task/3974/improve_invoice_number
|
2017-12-20 22:52:51 +01:00 |
|
PCoder
|
2628312bb9
|
Fix a bug and update delete vm email subject
|
2017-12-20 22:26:36 +01:00 |
|
PCoder
|
0634a1a41f
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-20 21:28:55 +01:00 |
|
PCoder
|
f61abf44c8
|
Remove unused import
|
2017-12-20 21:28:07 +01:00 |
|
PCoder
|
96de92d312
|
Reorganize code
|
2017-12-20 20:59:46 +01:00 |
|
PCoder
|
7d683e1257
|
Move Stripe subscription cancelation before deleting vm
|
2017-12-17 20:20:42 +01:00 |
|
PCoder
|
a04aa8542d
|
Add some logger debug messages
|
2017-12-12 22:55:30 +01:00 |
|
PCoder
|
1306dbe46a
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-12 20:23:25 +01:00 |
|
M.Ravi
|
88afdc1dd1
|
Removed unwanted logger debug msg
|
2017-12-12 16:49:50 +01:00 |
|
M.Ravi
|
24d85d5086
|
Check has_perm only for invoices
|
2017-12-12 15:43:25 +01:00 |
|
M.Ravi
|
091b277f7d
|
Correct call to has_perm
|
2017-12-12 12:42:40 +01:00 |
|
M.Ravi
|
57311eda73
|
Improve debug logs
|
2017-12-12 12:14:39 +01:00 |
|
PCoder
|
79b4b449d1
|
Add some logger messages
|
2017-12-12 09:53:19 +01:00 |
|
PCoder
|
beefeb62cb
|
Raise 404 for HostingOrder not belonging to user
|
2017-12-12 09:38:08 +01:00 |
|
Arvind Tiwari
|
8d64915d71
|
invoice footer added
|
2017-12-11 00:47:55 +05:30 |
|
PCoder
|
5e2c40f1a5
|
Fix flake8 warnings
|
2017-11-27 08:03:59 +01:00 |
|
PCoder
|
2102a89cdc
|
Test if PEP8 warnings can be detected in travis build
|
2017-11-27 07:56:28 +01:00 |
|
PCoder
|
94f0921168
|
Fix flake8 warning
|
2017-11-26 01:51:03 +01:00 |
|
PCoder
|
d466c56a17
|
Correct skipIf conditions
|
2017-11-26 01:49:54 +01:00 |
|
PCoder
|
273fa75d55
|
Fix PEP8 warnings
|
2017-11-26 01:12:16 +01:00 |
|
PCoder
|
2bc4db1cab
|
Add skipif to tests that require connecting to OpenNebula
|
2017-11-26 00:55:14 +01:00 |
|
PCoder
|
a3525c1d18
|
SignupViewTest.test_anonymous_user_can_signup: Commented out user comparison in context
|
2017-11-25 21:22:59 +01:00 |
|
PCoder
|
3715b969b6
|
Comment out PaymentVMViewTest.test_post
|
2017-11-25 21:17:27 +01:00 |
|
PCoder
|
57170b55be
|
Update site_name used in PasswordResetViewMixin
|
2017-11-25 20:02:41 +01:00 |
|
PCoder
|
ddf69accdf
|
Set validated=1 for user created in hosting.test_views.LoginViewTest
|
2017-11-25 19:44:19 +01:00 |
|
PCoder
|
baf00b1a8b
|
Remove context assertion in HostingPricingViewTest
|
2017-11-25 19:34:31 +01:00 |
|
PCoder
|
4c63a7d138
|
Remove assert comparison of contexts for the time-being
|
2017-11-25 19:28:58 +01:00 |
|
PCoder
|
ff43e748af
|
Set validated=1 when creating user in test
|
2017-11-25 19:23:18 +01:00 |
|
PCoder
|
3b6f047693
|
Comment out erroneous test code
|
2017-11-25 12:26:12 +01:00 |
|
PCoder
|
4a27890db5
|
Comment out test_anonymous_post
|
2017-11-24 22:43:39 +01:00 |
|
PCoder
|
6eec131218
|
Merge branch 'master' into task/3672/cleaning_existing_tests
|
2017-11-24 21:37:19 +01:00 |
|
Arvind Tiwari
|
372f015760
|
translation fix
|
2017-10-31 20:50:35 +05:30 |
|
Arvind Tiwari
|
64ffca6ded
|
signup form placeholder translation
|
2017-10-26 03:24:29 +05:30 |
|
Arvind Tiwari
|
88be7be180
|
translation fix
|
2017-10-16 01:07:54 +05:30 |
|
Arvind Tiwari
|
9bc86255c4
|
user account details added and translation fix
|
2017-10-16 01:04:49 +05:30 |
|
Arvind Tiwari
|
3370f06bff
|
msg fix
|
2017-10-15 02:30:42 +05:30 |
|
Arvind Tiwari
|
c60d45c292
|
merge master
|
2017-10-15 01:52:29 +05:30 |
|
Arvind Tiwari
|
1c50eb45e9
|
Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
|
2017-10-15 01:27:02 +05:30 |
|
Arvind Tiwari
|
ed1f1451ce
|
[] removed around the vm name
|
2017-10-15 00:41:31 +05:30 |
|
Arvind Tiwari
|
2cd1850f02
|
password reset email fix
|
2017-10-15 00:30:52 +05:30 |
|
Arvind Tiwari
|
7b71ba1749
|
merged master
|
2017-10-15 00:10:02 +05:30 |
|
M.Ravi
|
ed05411dac
|
Return if the form already contains error
|
2017-10-14 12:52:18 +02:00 |
|
Arvind Tiwari
|
606a687bc7
|
conflicts resolved
|
2017-10-13 02:08:28 +05:30 |
|
M.Ravi
|
764a51c0e7
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-12 19:32:00 +02:00 |
|
M.Ravi
|
859ccd54a6
|
Remove some more commented code and console logs
|
2017-10-12 19:06:26 +02:00 |
|
M.Ravi
|
1b14598cc9
|
Create Stripe elements only stripe key is defined
|
2017-10-12 00:43:55 +02:00 |
|
M.Ravi
|
a03040b449
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-11 21:25:52 +02:00 |
|
Arvind Tiwari
|
3e6084a1b1
|
translation fix
|
2017-10-11 00:30:32 +05:30 |
|
Arvind Tiwari
|
452089e103
|
translation fix
|
2017-10-10 21:38:49 +05:30 |
|
Arvind Tiwari
|
6cdca621b2
|
original pattern.jpg added
|
2017-10-07 23:35:13 +05:30 |
|
Arvind Tiwari
|
25e3980b20
|
pattern.jpg compressed
|
2017-10-07 23:33:08 +05:30 |
|
Arvind Tiwari
|
c400fdb02e
|
width adjusted
|
2017-10-07 23:17:57 +05:30 |
|
Arvind Tiwari
|
2dd2945ee9
|
wider auth box
|
2017-10-07 17:51:18 +05:30 |
|
Arvind Tiwari
|
d0003ce9f3
|
style fixes
|
2017-10-07 17:35:10 +05:30 |
|
Arvind Tiwari
|
f3832c1db9
|
content-dashboard removed for unregistered pages
|
2017-10-07 17:06:55 +05:30 |
|
Arvind Tiwari
|
1dc374e09d
|
footer links color changed
|
2017-10-07 16:23:04 +05:30 |
|
Arvind Tiwari
|
7d7b8661ea
|
translations
|
2017-10-07 16:19:53 +05:30 |
|
Arvind Tiwari
|
769396d95e
|
login pages restyled and footer included
|
2017-10-07 14:38:48 +05:30 |
|
Arvind Tiwari
|
88781e992c
|
24 hr fix
|
2017-10-06 04:20:38 +05:30 |
|
Arvind Tiwari
|
d3d57ade37
|
formats fixed
|
2017-10-06 04:16:58 +05:30 |
|
Arvind Tiwari
|
8e5654bdb5
|
date time converted to locale
|
2017-10-06 04:11:40 +05:30 |
|
Arvind Tiwari
|
4dbf08f995
|
Merge branch 'master' into task/3828/invoice_period
|
2017-10-06 02:39:07 +05:30 |
|
Arvind Tiwari
|
5e8b34d39c
|
Update hosting favicon to dcl favicon
|
2017-10-06 01:02:14 +05:30 |
|
M.Ravi
|
f0be6d6d7f
|
Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-04 19:32:02 +02:00 |
|
Arvind Tiwari
|
fc68715bcb
|
Merge pull request #507 from tiwariav/task/3811/create_vm_page_text
task/3811 create vm page lead text added
|
2017-10-04 01:00:03 +05:30 |
|
Arvind Tiwari
|
242f4edf8c
|
Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
|
2017-10-04 00:05:27 +05:30 |
|
Arvind Tiwari
|
1990c4758e
|
merged master
|
2017-10-03 23:49:26 +05:30 |
|
Arvind Tiwari
|
e7545247c9
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 23:46:43 +05:30 |
|
Arvind Tiwari
|
0ba6bca06b
|
Merge pull request #508 from tiwariav/task/3823/hosting_favicon
task/3823 hosting favicon link fixed
|
2017-10-03 23:42:57 +05:30 |
|
Arvind Tiwari
|
618a82fc66
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 21:51:28 +05:30 |
|
Arvind Tiwari
|
7e380267b7
|
Update payment.css
|
2017-10-03 21:49:51 +05:30 |
|
Arvind Tiwari
|
eb7b1a4ea0
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 21:46:23 +05:30 |
|
Arvind Tiwari
|
96d8f8358f
|
Merge pull request #512 from tiwariav/bugfix/card_input
Bugfix/hosting_card_input
|
2017-10-03 21:39:44 +05:30 |
|
Arvind Tiwari
|
c410e2cbc5
|
stripe_customer_id retrieved from request.user relation
|
2017-10-03 21:35:08 +05:30 |
|
Arvind Tiwari
|
bfbf4d87cc
|
Merge pull request #503 from tiwariav/task/3785/my_bills_page
Task/3785 update my bills page
|
2017-10-03 21:31:27 +05:30 |
|
Arvind Tiwari
|
315ce92a78
|
post request attributes changed
|
2017-10-03 21:24:35 +05:30 |
|
Arvind Tiwari
|
0263964705
|
stripe_id used instead of id
|
2017-10-03 21:04:25 +05:30 |
|
Arvind Tiwari
|
6802e2fdbc
|
merged master
|
2017-10-03 18:54:47 +05:30 |
|
Arvind Tiwari
|
734a41a371
|
merged master
|
2017-10-03 18:42:00 +05:30 |
|
Arvind Tiwari
|
2e34d404ea
|
translation
|
2017-10-03 18:25:32 +05:30 |
|
Arvind Tiwari
|
e4837b063c
|
alignment fix
|
2017-10-03 18:18:18 +05:30 |
|
M.Ravi
|
777aab7115
|
Add cancel subscription code on VM cancel
|
2017-10-03 13:07:41 +02:00 |
|
M.Ravi
|
60b233f082
|
Fix flake8 warnings
|
2017-10-03 00:26:50 +02:00 |
|
M.Ravi
|
44b5d9bb3a
|
hosting order: Add price to vm context
|
2017-10-02 23:17:37 +02:00 |
|
M.Ravi
|
7680e5aa25
|
Update hosting django.po
|
2017-10-02 00:13:28 +02:00 |
|
M.Ravi
|
22af001489
|
Merge upstream master
|
2017-10-02 00:09:38 +02:00 |
|
M.Ravi
|
68cbfdd393
|
Update translation and fix loginmixin required for dashboard view
|
2017-10-01 23:06:51 +02:00 |
|
M.Ravi
|
cf45a9ac75
|
Add messages to some hosting templates
|
2017-10-01 20:39:55 +02:00 |
|
M.Ravi
|
06b1ce9e72
|
Update error message
|
2017-10-01 20:32:51 +02:00 |
|
M.Ravi
|
167eaf2a0c
|
Add forbidden_view method adds the message and redirects to the same path
|
2017-10-01 20:17:03 +02:00 |
|
M.Ravi
|
9e8d930a3b
|
Refactor messages to includes/_messages.html
|
2017-10-01 20:16:05 +02:00 |
|
Arvind Tiwari
|
df93dfe047
|
day set to one before
|
2017-09-30 18:10:34 +05:30 |
|
Arvind Tiwari
|
1f09bab3e4
|
minimum month diff set to 1
|
2017-09-30 18:08:02 +05:30 |
|
Arvind Tiwari
|
3701899304
|
timezone aware
|
2017-09-30 18:06:50 +05:30 |
|
Arvind Tiwari
|
f1790445cd
|
timezone aware
|
2017-09-30 18:05:02 +05:30 |
|