moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • 817f800fbd fixed #3350 Levi 2017-06-11 11:44:14 -05:00
  • 98b9e2ee92 Updated Changelog 1.0.10 M.Ravi 2017-06-11 20:19:49 +05:30
  • 792280f112 Updated changelog M.Ravi 2017-06-11 20:12:46 +05:30
  • 620e93bb9f Merge branch 'telmich-feature/nonhtml-email' M.Ravi 2017-06-11 20:07:54 +05:30
  • 943fc741bf Modified the IndexView to send text email on receiving new order M.Ravi 2017-06-11 20:06:54 +05:30
  • d7a2335cf4 Merge branch 'master' into telmich-feature/nonhtml-email M.Ravi 2017-06-11 19:56:35 +05:30
  • c5fdb3da5a Updated change log 1.0.9 M.Ravi 2017-06-11 19:51:54 +05:30
  • 1d1743828b Merge pull request #325 from pcoder/feature/3371/calc_in_landing Nico Schottelius 2017-06-11 16:15:42 +02:00
  • a29ceb765f Updated the translation for the modified text M.Ravi 2017-06-11 17:46:42 +05:30
  • 8e95ed304b Updated the text in dcl index.html template M.Ravi 2017-06-11 16:57:20 +05:30
  • 24402a2ec8 Refactored the styles M.Ravi 2017-06-11 16:53:57 +05:30
  • 880e0f0dde Added functions to handle get and post requests. On get, we need to create a opennebula connection to fetch the templates. On successful post of the form, we need to send email and redirect user to order-success M.Ravi 2017-06-11 16:32:38 +05:30
  • 47d882d1fc Moved the calculator to the index.html template M.Ravi 2017-06-11 16:29:24 +05:30
  • d792c22e4e Created landing page style price-calc-section-landing which is same as price-calc-section except for padding (we don't need it in the landing page) M.Ravi 2017-06-11 16:28:11 +05:30
  • 2ec2b6980a Updated the CustomUser.register method so that we can handle register differently for digitalglarus and dcl M.Ravi 2017-06-11 05:19:56 +05:30
  • c989017a8f Added SignupValidateView and SignupValidatedView classes to handle respective views M.Ravi 2017-06-11 05:18:06 +05:30
  • ce11524fba Added signup-validate and validate endpoints to hosting's urls M.Ravi 2017-06-11 05:15:48 +05:30
  • 707d8e7370 Added condition to hosting form to show message for account that have not yet been validated after account creation M.Ravi 2017-06-11 05:14:20 +05:30
  • b8463360b5 Added styles for message title and text for email confirmation M.Ravi 2017-06-11 05:11:09 +05:30
  • bd10d1cf9f Added signup_validate html template. This is an empty template that we use to show appropriate message during email confirmation M.Ravi 2017-06-11 05:10:00 +05:30
  • 32e5011241 Added user_activation email templates M.Ravi 2017-06-11 05:08:13 +05:30
  • 9b40af3975 Removed the unnecessary new_order_notification* email templates as we no longer use them. M.Ravi 2017-06-10 15:41:25 +05:30
  • 3750ba5182 Changed the to and reply-to fields for EmailMessage to list, as it expects input of that type M.Ravi 2017-06-10 12:42:31 +05:30
  • 9f2f0f7db3 Send order emails as plain text Nico Schottelius 2017-06-10 00:33:26 +02:00
  • d2e9096cc2 Fix conflicts in url footer and fix navbar language Henry Bravo 2017-06-09 16:47:39 -05:00
  • 7004536a19 Fix conflicts Henry Bravo 2017-06-09 16:18:41 -05:00
  • def473e5ef Merge pull request #321 from levivm/develop Levi Velázquez 2017-06-09 16:09:30 -05:00
  • 24ecdd2f26 footer links Levi 2017-06-09 16:08:37 -05:00
  • 7b197ec75b Merge pull request #320 from levivm/develop Levi Velázquez 2017-06-09 15:39:12 -05:00
  • 54b339a546 Staging fix and cleaned html Henry Bravo 2017-06-09 15:37:14 -05:00
  • d43855adda fixed #3350, #3328, #3316, #3339 Levi 2017-06-09 15:36:14 -05:00
  • 7485c182c4 Redesign vm order page Henry Bravo 2017-06-09 13:55:45 -05:00
  • db5d0f864c Merge pull request #314 from levivm/develop Levi Velázquez 2017-06-09 10:42:02 -05:00
  • 331b7dea98 Merge branch 'master' into develop Levi 2017-06-09 10:37:06 -05:00
  • ce33a4b3f2 Updated Changelog 1.0.8 M.Ravi 2017-06-09 12:38:25 +05:30
  • 132629734a Merge branch 'telmich-feature/introduce_templating' M.Ravi 2017-06-09 12:34:15 +05:30
  • a679d83910 Merge branch 'pcoder-bug-fix/3363/de_typos' M.Ravi 2017-06-09 12:33:45 +05:30
  • 382b0b979d Modified po/mo files to fix de typos (bug 3363) M.Ravi 2017-06-09 12:10:36 +05:30
  • 47970fb00a Added load staticfiles and i18n and extended datacenterlight/base.html explicitly M.Ravi 2017-06-09 11:32:51 +05:30
  • b15bae4940 Add template base.html Nico Schottelius 2017-06-08 21:55:35 +02:00
  • a1dd4b2941 Updated changelog 1.0.7 M.Ravi 2017-06-08 11:40:01 +05:30
  • 154277ca8d Merge pull request #317 from pcoder/master Pcoder 2017-06-08 02:25:36 +02:00
  • 31107ff4e1 Fixed a bug due to i18n not loaded in html template. This caused the images in the posts of the blog not to appear. M.Ravi 2017-06-08 05:50:32 +05:30
  • a60ef7cf7a Changed BaseEmail to accept from_address to modify the from header accordingly M.Ravi 2017-06-07 11:35:16 +05:30
  • a44f64e8e7 Merge branch 'feature/manualorder' 1.0.6 M.Ravi 2017-06-07 03:05:26 +05:30
  • cd524350d8 Attempted manual merge to avoid conflicts M.Ravi 2017-06-07 03:05:21 +05:30
  • de76ef140b Updated Changelog M.Ravi 2017-06-07 02:56:42 +05:30
  • a131489e8c Fixed font on order page for mobile view. Changed from Lato-black to Montserrat-Bold M.Ravi 2017-06-07 02:40:45 +05:30
  • d8ef935fae Updated text on the button to Request Beta Access to go along the text alongside M.Ravi 2017-06-07 02:13:21 +05:30
  • 06f95dc5ed Made to take the user to /order on click of Order Now button M.Ravi 2017-06-07 02:12:35 +05:30
  • 94bac7222c Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before. M.Ravi 2017-06-07 02:02:31 +05:30
  • bef6b03872 Reverted pricing.html to what was before. We should create a new template for order. M.Ravi 2017-06-07 01:35:05 +05:30
  • c111ad13a8 Updated translation text after completion of manual order. M.Ravi 2017-06-07 01:26:56 +05:30
  • 366f11be83 Fixed an issue related to redirection to datacenterlight/order url M.Ravi 2017-06-07 01:07:47 +05:30
  • 6a3f4578db Updated mo file to include the change for exclamation mark missing in german translation M.Ravi 2017-06-07 00:59:19 +05:30
  • dcdb06d4f6 Added missing exlamation mark for german translation. Updated the translation M.Ravi 2017-06-07 00:47:25 +05:30
  • 663ea2d713 Merged master into feature/manualorder M.Ravi 2017-06-07 00:41:27 +05:30
  • 69001db65f Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files. M.Ravi 2017-06-07 00:16:54 +05:30
  • b7bae03fd7 Merge branch 'henrys_pr' into feature/manualorder M.Ravi 2017-06-06 22:13:46 +05:30
  • 9ffd32b4cb Merge branch 'master' of https://github.com/HenryGBC/dynamicweb into henry_pr M.Ravi 2017-06-06 22:10:35 +05:30
  • 6f6277cc49 Mobile styles to calculator card Henry Bravo 2017-06-06 10:36:47 -05:00
  • b5f93e4ea7 align buttons Henry Bravo 2017-06-06 10:33:36 -05:00
  • 96272ffd44 added mo files 1.0.5 Levi 2017-06-06 00:08:22 -05:00
  • 6fa14971d9 Merge branch 'master' of github.com:ungleich/dynamicweb Levi 2017-06-05 23:08:58 -05:00
  • 596896c700 Merge branch 'HenryGBC-develop' into develop Levi 2017-06-05 22:52:09 -05:00
  • a355ae9087 Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop Levi 2017-06-05 22:51:53 -05:00
  • 7fcd72086a Merge pull request #312 from telmich/cleanup_201706 Levi Velázquez 2017-06-05 22:26:13 -05:00
  • b7faceb5dc Merge pull request #311 from Modulos/fix/ssh_typo Levi Velázquez 2017-06-05 22:26:04 -05:00
  • d31b05a219 Added jquery validation for the order form M.Ravi 2017-06-06 05:26:02 +05:30
  • 74c57a42db Added top margin style for error messages M.Ravi 2017-06-06 05:24:39 +05:30
  • 949f47d124 Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template M.Ravi 2017-06-06 04:27:38 +05:30
  • b54b46c08b Renamed success url to order_success for clarity. M.Ravi 2017-06-06 04:23:15 +05:30
  • 474e0ddc95 Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this) M.Ravi 2017-06-06 04:22:03 +05:30
  • 92fb72197d Resolved some conflicts M.Ravi 2017-06-06 03:47:37 +05:30
  • f4a81e9096 Fixed getting template name from template id M.Ravi 2017-06-06 03:43:50 +05:30
  • 170f386811 Merge pull request #313 from HenryGBC/master Pcoder 2017-06-06 00:11:56 +02:00
  • b68f116931 Added the logic to handle orders manually M.Ravi 2017-06-06 03:09:34 +05:30
  • d7625712f1 Changed template variable name in email template for new order notification M.Ravi 2017-06-06 03:02:57 +05:30
  • 4ad45dfd43 Added notification email template M.Ravi 2017-06-06 02:55:07 +05:30
  • 515cbff001 copy PricingView Henry Bravo 2017-06-05 16:03:32 -05:00
  • 2ead42bd1a Add input fields (email, name) in Calculator (Pricing page) and Sucess page Henry Bravo 2017-06-05 15:35:48 -05:00
  • 5583648293 Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing M.Ravi 2017-06-06 01:43:43 +05:30
  • c69694274f Fix conflicts Henry Bravo 2017-06-05 14:55:41 -05:00
  • b44ab0ce0a Add input fields (email, name) in Calculator (Pricing page) Henry Bravo 2017-06-05 14:30:41 -05:00
  • bc7f90b615 Merge branch 'master' into cleanup_201706 Nico Schottelius 2017-06-05 18:41:22 +02:00
  • 25bfb41081 Typo public_key -> ssh_key Modulos 2017-06-05 15:51:56 +02:00
  • ccfa36bdd7 Update changelog 1.0.4 Nico Schottelius 2017-06-05 15:32:39 +02:00
  • 6204cbc990 Add all domains to ALLOwED_HOSTS Nico Schottelius 2017-06-05 12:29:27 +02:00
  • f4997f041c Merge pull request #309 from levivm/develop Levi Velázquez 2017-06-04 17:42:34 -05:00
  • 484ab5f1c6 fixed payment when user has already a card Levi 2017-06-04 17:41:48 -05:00
  • c38b36a8a5 Merge pull request #308 from levivm/develop Levi Velázquez 2017-06-04 17:24:21 -05:00
  • 9d8ebed1cf Merge branch 'Modulos-feature/delete_ssh_key' into develop Levi 2017-06-04 17:23:04 -05:00
  • 5be46db5a3 Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key Levi 2017-06-04 17:22:52 -05:00
  • 0f84373e19 Merge pull request #307 from levivm/develop Levi Velázquez 2017-06-04 17:08:26 -05:00
  • 8adcb75b8c Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2017-06-04 17:08:09 -05:00
  • 9f06c98554 Merge pull request #283 from Modulos/hosting_i18n Levi Velázquez 2017-06-04 17:07:17 -05:00
  • 8598c540b9 removed pdb Levi 2017-06-04 17:05:48 -05:00
  • ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support Levi 2017-06-04 17:04:38 -05:00
  • ba03cf232e 'what is it' section text change and fixed typo Henry Bravo 2017-06-03 21:57:21 -05:00
  • 9b121cc702 improveded mobile responsiveness Henry Bravo 2017-06-03 21:19:13 -05:00