Commit graph

1686 commits

Author SHA1 Message Date
Andrii Marynets
5b53daa14a Merge branch 'master' into feature/add_google_analytics 2017-06-30 01:43:06 +03:00
Andrii Marynets
ebf8b0646d Fix not add analytics if DEBUG=True 2017-06-30 01:33:12 +03:00
Andrii Marynets
2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +03:00
Pcoder
381ac1fea0 Merge pull request #352 from levivm/feature/added_localtime
Feature/added localtime

The time shows up fine on the VM order confirmation and the ssh keys page both on chrome and firefox.
2017-06-29 21:27:11 +02:00
Pcoder
69fde64149 Added missing colon 2017-06-29 21:24:52 +02:00
Pcoder
b649bcd87e Fixed a typo 2017-06-29 21:24:04 +02:00
siarheipuhach
a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach
e681b0d8c2 Merge pull request #1 from siarheipuhach/feature/flake8
Added Flake8 lib and fixed PEP8 violations
2017-06-29 18:57:30 +03:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
PCoder
cb6aeae1ae Refactored the logic to OrderConfirmationView from the PaymentOrderView 2017-06-29 13:08:24 +05:30
PCoder
a2153777e4 We do not have order created when in Order Confirmation page. So removed the id parameter in url 2017-06-29 13:06:05 +05:30
PCoder
3313dab485 Added get_value_from_dict filter to obtain values from a dict in templates 2017-06-29 13:05:06 +05:30
PCoder
a3c3a5cd2e Changed the way we get info in dcl order_detail template 2017-06-29 13:04:13 +05:30
Andrii Marynets
007fc794c3 Add google analytics to data center light 2017-06-27 23:47:30 +03:00
Levi Velázquez
8904a14961 Merge branch 'master' into feature/added_localtime 2017-06-23 00:31:23 -05:00
Levi
720270bac5 fixed firefox issue 2017-06-23 00:30:31 -05:00
M.Ravi
ed9e5c591c Merge branch 'pcoder-new_flow' 2017-06-23 04:54:15 +05:30
M.Ravi
796fbbe1f8 Removed status from the order page 2017-06-23 04:38:10 +05:30
M.Ravi
aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
Pcoder
8408e3e7ac Merge pull request #350 from pcoder/task/3379/text_style_activation
Task/3379/text style activation and moep's and sanghee's de translations added
2017-06-22 23:13:58 +02:00
M.Ravi
654d73e51d Add some de translations and invoice now called 'Confirm Order' 2017-06-23 02:33:59 +05:30
M.Ravi
82e8c377af Added membership django.po 2017-06-23 02:14:54 +05:30
M.Ravi
165dfa49ab Fixed __proxy__ to string conversion issue 2017-06-23 01:42:37 +05:30
M.Ravi
3ca7153414 Changed invoice text 2017-06-23 01:34:31 +05:30
M.Ravi
82ebafa5f5 Merge branch 'moeps_translation_fixes' into task/3379/text_style_activation 2017-06-23 01:16:07 +05:30
M.Ravi
9aba565ec0 Added + corrected de translations 2017-06-23 01:15:48 +05:30
M.Ravi
5b8a26eeb3 Fixed a blunder mistake. Was using name instead of email 2017-06-23 00:31:08 +05:30
M.Ravi
e5929b8f76 Removed call to refresh_from_db as it was wrongly used 2017-06-23 00:15:47 +05:30
M.Ravi
d4e7eb9511 Added CustomUser model reload code 2017-06-22 23:48:14 +05:30
M.Ravi
5caa79f199 Added CustomUser.DoesNotExist error exception 2017-06-22 13:40:39 +05:30
M.Ravi
31c389e72c Added order_detail.html for dcl 2017-06-22 13:23:13 +05:30
M.Ravi
b4c3172a4d Added send_email flag to send/not send email on user registration. Added get_random_password method to CustomUser 2017-06-22 13:22:14 +05:30
M.Ravi
c4c110b506 Added OrderConfirmationView to dcl 2017-06-22 13:21:07 +05:30
M.Ravi
e848c318d0 Addd order confirmation url 2017-06-22 13:18:54 +05:30
M.Ravi
041352ac6d Cleaned up some commented code 2017-06-22 00:28:44 +05:30
M.Ravi
da0d8bf937 Added one.vm.rename xml-rpc call to rename a created vm 2017-06-22 00:17:53 +05:30
Levi
8c7687fe7c fixed issue error 500 2017-06-21 13:32:23 -05:00
Levi
de64744120 fixed issue on order view 2017-06-21 13:31:02 -05:00
Levi
1897f4b5f6 fixing date format 2017-06-21 13:28:53 -05:00
Levi
339e20d0b7 changd date format on orders view 2017-06-21 13:24:38 -05:00
M.Ravi
387c45b969 We need the logo in the payment page even when user is not logged in 2017-06-21 23:38:35 +05:30
M.Ravi
bbfc7e8515 Not persisting stripe details to db 2017-06-21 23:37:36 +05:30
Levi
f1f6074c78 fixed time 2017-06-21 12:49:29 -05:00
Levi
ed6fdcb049 fixed ssh key time 2017-06-21 12:26:09 -05:00
Levi
d8389993ce Merge branch 'master' into feature/added_localtime 2017-06-21 12:06:58 -05:00
Levi
4f318a6f2d changed UTC to localtime in ssh key view 2017-06-21 11:48:11 -05:00
Levi
9b6bb4eb26 changed UTC to localtime in ssh key view 2017-06-21 11:45:35 -05:00
M.Ravi
66f82572f1 Added payment url 2017-06-21 13:15:37 +05:30
M.Ravi
52524a97a6 Added PaymentOrderView 2017-06-21 13:14:58 +05:30