amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1675 commits 8 branches 146 tags 314 MiB
Commit graph

1675 commits

This branch
This branch
All branches
Author SHA1 Message Date
M.Ravi e17792badb Merge branch 'master' of https://github.com/ungleich/dynamicweb 2017-07-02 23:38:07 +02:00
M.Ravi 8b9359ede5 Reverted back to the default behavior of bootstrap-validator 2017-07-02 23:37:31 +02:00
Pcoder 352c549269 Merge pull request #357 from amarynets/feature/add_google_analytics 
Task #3503, Add google analytics to data center light
 2017-07-02 23:04:45 +02:00
Andrii Marynets a91de372e0 Merge branch 'master' into feature/add_google_analytics 2017-07-02 23:01:42 +03:00
Andrii Marynets 5ea35bd4d8 add ids for dev and staging server 2017-07-02 23:00:56 +03:00
M.Ravi f67343ab5c Added missing validation code 2017-07-02 21:26:10 +02:00
Pcoder bb9ea518d1 Merge pull request #365 from geethamondi/bug/3418/calc_errmsg_position 
Changed the position of error messages in dcl landing page.
 2017-07-02 20:06:42 +02:00
Mondi Geetha 3a865bd010 Increased minimum length of the name to 3 2017-07-02 23:33:33 +05:30
Mondi Geetha 5b6a069137 Added DE translations for error messages 2017-07-02 23:16:19 +05:30
Mondi Geetha 5c7ee11815 Merge branch 'master' into bug/3418/calc_errmsg_position 2017-07-02 21:09:10 +05:30
Mondi Geetha fd856d7613 Reverted back email templates as they are part of another PR 2017-07-02 20:55:08 +05:30
Andrii Marynets 1f658a425f Merge with master 2017-07-02 17:56:49 +03:00
Andrii Marynets 303d99d70d Merge branch 'master' into feature/add_google_analytics 
# Conflicts:
#	datacenterlight/templates/datacenterlight/order_detail.html
 2017-07-02 17:56:07 +03:00
M.Ravi 871237d84f Updated Changelog for the release 1.0.18 2017-07-02 15:33:11 +02:00
Mondi Geetha f48ea4714e changed error message color 2017-07-02 18:34:17 +05:30
Mondi Geetha 0a2b2c815d Aligned Logo, Text, Signature to left 2017-07-02 02:14:18 +05:30
Pcoder c8d0a2e91f Merge pull request #364 from pcoder/master 
Fixed hosting template footer for unauthenticated case
 2017-07-01 14:44:24 +02:00
Mondi Geetha 0c969946f7 Added code for proper return when name/email are not good 2017-07-01 18:02:10 +05:30
Mondi Geetha e4cfcbf618 Added some classes and divs for error msg alignment alongside the input field 2017-07-01 18:01:08 +05:30
Mondi Geetha afcec7eb03 Removed unwanted code and add bootstrap-validator cdn js 2017-07-01 17:59:34 +05:30
Mondi Geetha 36877d613d Added styles for proper positioning of error msgs 2017-07-01 17:58:42 +05:30
PCoder f847302acd Fixed hosting template footer for unauthenticated case (direct payment + order confirmation) 2017-07-01 11:22:12 +05:30
Pcoder d8786c9a3c Merge pull request #363 from pcoder/new_flow_enhancement 
Fixed logo in payment/order confirmation page not redirecting to inde…
 2017-07-01 01:16:11 +02:00
PCoder b502cb5da8 Fixed logo in payment/order confirmation page not redirecting to index issue 2017-07-01 04:29:11 +05:30
Pcoder 3aa1357960 Merge pull request #362 from pcoder/new_flow_enhancement 
- DE translations added
 - Missing OS configuration added to payment and order confirmation pages
 - Autofill of billing address when pressing back button on order confirmation page
 2017-07-01 00:32:36 +02:00
PCoder 4857bc2cd8 Now fetching billing address data from session variable 2017-07-01 03:54:08 +05:30
PCoder bd766e2073 Fixed filling up of users details while going back to payment page from order confirmation page 2017-07-01 03:11:16 +05:30
PCoder 285ce2e710 Added OS configuration to the Order Confirmation page 2017-07-01 02:16:24 +05:30
PCoder e286fc8aaf Added OS configuration to the payment page 2017-07-01 02:10:30 +05:30
PCoder 0b0892a299 Added OS to the payment page 2017-07-01 01:59:24 +05:30
PCoder dfd910465c Added dcl translations used in new flow 2017-07-01 01:40:17 +05:30
Pcoder 0ad3e0d7c7 Merge pull request #361 from pcoder/new_flow_enhancement 
New flow enhancement
 2017-06-30 19:13:37 +02:00
PCoder 160df7685c Refactored dcl text and support email 2017-06-30 12:47:04 +05:30
PCoder 699326dc57 Made to return empty string for the template filter get_value_from_dict instead of None 2017-06-30 12:33:28 +05:30
PCoder 2350247cdb Removed unused code 2017-06-30 12:27:18 +05:30
PCoder 1deeec4c33 Added the locale time code to new flow order detail 2017-06-30 12:18:31 +05:30
PCoder aa561a6cb3 Merge branch 'master' into new_flow_enhancement 2017-06-30 12:14:45 +05:30
PCoder 3eca55a32a Fixed billing address bug. Fixed back button issues in the new flow 2017-06-30 12:08:07 +05:30
PCoder d32d2a8976 Added a form in order confirmation page 2017-06-30 12:06:41 +05:30
Andrii Marynets 9431e9846c Add middleware for fix "get_host() method fails when the host is behind multiple proxies" 2017-06-30 08:44:39 +03:00
PCoder d161a285b8 Added get_card_details function to stripe_utils 2017-06-30 11:08:00 +05:30
PCoder 4c3d8627b1 Added code to fetch cc data and put in context 2017-06-30 11:06:58 +05:30
PCoder d0376f35f8 Now getting info in Order Confirmation from session and context 2017-06-30 11:05:34 +05:30
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
PCoder cb6aeae1ae Refactored the logic to OrderConfirmationView from the PaymentOrderView 2017-06-29 13:08:24 +05:30