aatish/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1569 commits 11 branches 82 tags 313 MiB
Commit graph

1569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi Velázquez
7fcd72086a Merge pull request #312 from telmich/cleanup_201706 
Cleanup 201706
 2017-06-05 22:26:13 -05:00
Levi Velázquez
b7faceb5dc Merge pull request #311 from Modulos/fix/ssh_typo 
Typo public_key -> ssh_key
 2017-06-05 22:26:04 -05:00
M.Ravi
d31b05a219 Added jquery validation for the order form 2017-06-06 05:26:02 +05:30
M.Ravi
74c57a42db Added top margin style for error messages 2017-06-06 05:24:39 +05:30
M.Ravi
949f47d124 Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template 2017-06-06 04:28:41 +05:30
M.Ravi
b54b46c08b Renamed success url to order_success for clarity. 2017-06-06 04:23:15 +05:30
M.Ravi
474e0ddc95 Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this) 2017-06-06 04:22:03 +05:30
M.Ravi
92fb72197d Resolved some conflicts 2017-06-06 03:47:37 +05:30
M.Ravi
f4a81e9096 Fixed getting template name from template id 2017-06-06 03:43:50 +05:30
Pcoder
170f386811 Merge pull request #313 from HenryGBC/master 
Add input fields (email, name) in Calculator (Pricing page) and Suces…
 2017-06-06 00:11:56 +02:00
M.Ravi
b68f116931 Added the logic to handle orders manually 2017-06-06 03:09:34 +05:30
M.Ravi
d7625712f1 Changed template variable name in email template for new order notification 2017-06-06 03:02:57 +05:30
M.Ravi
4ad45dfd43 Added notification email template 2017-06-06 02:55:07 +05:30
Henry Bravo
515cbff001 copy PricingView 2017-06-05 16:03:32 -05:00
Henry Bravo
2ead42bd1a Add input fields (email, name) in Calculator (Pricing page) and Sucess page 2017-06-05 15:35:48 -05:00
M.Ravi
5583648293 Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing 2017-06-06 01:44:23 +05:30
Henry Bravo
c69694274f Fix conflicts 2017-06-05 14:55:41 -05:00
Henry Bravo
b44ab0ce0a Add input fields (email, name) in Calculator (Pricing page) 2017-06-05 14:30:41 -05:00
Nico Schottelius
bc7f90b615 Merge branch 'master' into cleanup_201706 2017-06-05 18:41:22 +02:00
Modulos
25bfb41081 Typo public_key -> ssh_key 2017-06-05 15:51:56 +02:00
Nico Schottelius
ccfa36bdd7 Update changelog 2017-06-05 15:32:39 +02:00
Nico Schottelius
6204cbc990 Add all domains to ALLOwED_HOSTS 2017-06-05 15:29:37 +02:00
Levi Velázquez
f4997f041c Merge pull request #309 from levivm/develop 
fixed payment when user has already a card
 2017-06-04 17:42:34 -05:00
Levi
484ab5f1c6 fixed payment when user has already a card 2017-06-04 17:41:48 -05:00
Levi Velázquez
c38b36a8a5 Merge pull request #308 from levivm/develop 
Merging ssh fix from modulos
 2017-06-04 17:24:21 -05:00
Levi
9d8ebed1cf Merge branch 'Modulos-feature/delete_ssh_key' into develop 2017-06-04 17:23:04 -05:00
Levi
5be46db5a3 Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key 2017-06-04 17:22:52 -05:00
Levi Velázquez
0f84373e19 Merge pull request #307 from levivm/develop 
Added DE support for stripe error
 2017-06-04 17:08:26 -05:00
Levi
8adcb75b8c Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-04 17:08:09 -05:00
Levi Velázquez
9f06c98554 Merge pull request #283 from Modulos/hosting_i18n 
Add i18n to hosting/order
 2017-06-04 17:07:17 -05:00
Levi
8598c540b9 removed pdb 2017-06-04 17:05:48 -05:00
Levi
ab4d1cf9c9 Changes stripe v2 to stripe v3 and added localization support 2017-06-04 17:04:38 -05:00
Henry Bravo
ba03cf232e 'what is it' section text change and fixed typo 2017-06-03 21:57:21 -05:00
Henry Bravo
9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -05:00
Nico Schottelius
a6bc80e145 Add archlinux requirements 2017-06-03 21:43:23 +02:00
Nico Schottelius
cdac6c664b remove more media files 
Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
 2017-06-03 19:24:47 +02:00
Nico Schottelius
4ab08a14d5 cleanup media folder 
Signed-off-by: Nico Schottelius <nico@feder.schottelius.org>
 2017-06-03 19:24:22 +02:00
Nico Schottelius
25fc0081db Newest changes goes to the top, not bottom 2017-06-03 16:07:56 +02:00
Nico Schottelius
d2e0b26c40 Remove unused configs, unused requirements 2017-06-03 16:06:34 +02:00
Nico Schottelius
29c93c6f81 Remove log files 2017-06-03 16:04:31 +02:00
Nico Schottelius
266e33401e Remove old unused directory 2017-06-03 16:03:55 +02:00
Nico Schottelius
d8bb051f23 Remove unused code 2017-06-03 16:03:02 +02:00
Nico Schottelius
e7da97dc7f Shrink list of web admins 2017-06-03 15:56:36 +02:00
Nico Schottelius
596dde28c5 Delete unused files 2017-06-03 15:56:25 +02:00
Nico Schottelius
073fe76ece Delete old dump 2017-06-03 15:40:44 +02:00
Modulos
346733fbcd Allow users to delete ssh keys 2017-06-03 15:03:55 +02:00
modulos
ab29b138c3 Add delete ssh key modal 2017-06-03 13:33:05 +02:00
modulos
31e9377818 Merge branch 'develop' into hosting_i18n 2017-06-03 09:59:48 +02:00
Levi Velázquez
77314d04c8 Merge pull request #303 from levivm/develop 
Develop
 2017-06-02 11:21:25 -05:00
Levi
f2ee18deba Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-02 11:20:30 -05:00