Commit graph

173 commits

Author SHA1 Message Date
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
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
M.Ravi 3ca7153414 Changed invoice text 2017-06-23 01:34:31 +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 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 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 bbfc7e8515 Not persisting stripe details to db 2017-06-21 23:37:36 +05:30
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
M.Ravi 2959159863 Added cache_control decorator to control cache while returning back to the index page 2017-06-21 01:40:55 +05:30
M.Ravi b27342b493 Added dcl_text instead the hardcoded text 2017-06-20 23:44:10 +05:30
M.Ravi 543a52baf9 Fixed some more translations 2017-06-20 01:00:48 +05:30
M.Ravi b971751e2b Updated click here text in de 2017-06-20 00:22:12 +05:30
M.Ravi ed26ac8b59 Updated dcl's django.po to resolve some conflict 2017-06-19 12:44:48 +05:30
M.Ravi 47632c6bd1 Updated the django.po for datacenterlight 2017-06-19 12:34:58 +05:30
M.Ravi a7e9946a4f Refactored user activation html email template to use proper translation and parameters 2017-06-19 12:34:01 +05:30
M.Ravi bf941539d7 Refactored user_activation.txt email template 2017-06-19 12:32:08 +05:30
Levi Velázquez 5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
2017-06-15 15:22:00 -05:00
Levi Velázquez 3aa9b573cc Merge pull request #343 from ungleich/fix_translation
Fixed translations of validation messages
2017-06-15 13:38:16 -05:00
M.Ravi 06af225c97 Updated proper translation corrections 2017-06-16 00:00:26 +05:30
M.Ravi 36567071c0 Removed OrderView as we no longer use it 2017-06-15 23:36:58 +05:30
M.Ravi e897bb9c22 Removed unused /order url 2017-06-15 23:32:20 +05:30
M.Ravi 6c588e3531 Deleted the order.html 2017-06-15 23:31:19 +05:30
M.Ravi a56d08e729 Fixed translations of validation messages 2017-06-15 06:29:31 +05:30
M.Ravi 0b034ec2f8 Fixed typo 'Standort' instead of 'Strandort' 2017-06-15 04:29:57 +05:30
Henry Bravo 7992e39962 Generated .po 2017-06-14 17:34:26 -05:00
Henry Bravo 739a92505d deleted home.htm 2017-06-14 17:29:26 -05:00
Henry Bravo fb860b9a8d fixed typo and delete .mo 2017-06-14 17:16:43 -05:00
Henry Bravo b2379f7a02 Fixed DE Typo, and added text in calculator box 2017-06-14 16:51:42 -05:00
Henry Bravo 8acd249b4d Create Templatetag for change language whit the current path 2017-06-13 22:35:15 -05:00
Levi 8ec290a59f cleaned up index.html 2017-06-13 14:11:11 -05:00
Levi 9333532662 Merge branch 'master' into develop 2017-06-13 14:07:52 -05:00
Levi 11e59c8ea3 added translations 2017-06-13 13:47:55 -05:00
Henry Bravo 2d3e446568 fix locale 2017-06-13 13:39:47 -05:00
Henry Bravo a03f2f8f89 Fix conflicts 2017-06-13 10:36:39 -05:00
Levi b5bb26e445 added missing translations for datacenterlight 2017-06-13 01:48:36 -05:00
Levi 89dedab8ba resolved henry latest conflicts 2017-06-13 01:12:51 -05:00
Levi c7d29be24c Merge branch 'master' into develop 2017-06-12 23:51:03 -05:00
M.Ravi 1a7615dc9a Fixed a typo 2017-06-13 05:03:46 +05:30
M.Ravi 83802a0a52 Added from_address to EmailMessage 2017-06-13 04:39:30 +05:30
sangheekim f2aa5377d8 month added to landing calculator box 2017-06-11 23:32:37 +02:00
Levi Velázquez d2a8c13b9e Merge branch 'master' into bug/3328/dcl_email_headers 2017-06-11 12:30:09 -05:00
M.Ravi 943fc741bf Modified the IndexView to send text email on receiving new order 2017-06-11 20:06:54 +05:30
M.Ravi d7a2335cf4 Merge branch 'master' into telmich-feature/nonhtml-email 2017-06-11 19:56:35 +05:30
M.Ravi a29ceb765f Updated the translation for the modified text 2017-06-11 17:46:42 +05:30