Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• 0da78502a5 Fixed second alignment issue Polycarp Okock 2017-07-08 01:44:52 +03:00
• 37de810cc3 Fixed the alignment issue Polycarp Okock 2017-07-08 01:39:53 +03:00
• 4fe245901f Merge pull request #375 from karthikvrao/refactor/dcl_remove_duplicate_script_imports Pcoder 2017-07-08 00:00:00 +02:00
• efd90f8ddd Removed the extra btn Polycarp Okock 2017-07-08 00:50:41 +03:00
• 27ad654f43 Merged refactor/dcl_insert_body_end_tag from karthik into karthikvrao-refactor/dcl_insert_body_end_tag PCoder 2017-07-08 02:34:30 +05:30
• 545834d3d0 Merge pull request #377 from karthikvrao/refactor/dcl_better_indent_html Pcoder 2017-07-07 22:33:33 +02:00
• 153d83add2 Fixed typo you -> your Pcoder 2017-07-08 01:20:36 +05:30
• 9f3ea02584 Added translate block for text Pcoder 2017-07-08 01:14:02 +05:30
• e551ba911b Merge branch 'master' into master Polycarp Okock 2017-07-07 22:37:58 +03:00
• e90d0faa9e Fixing missing warning text and alignment Polycarp Okock 2017-07-07 22:19:59 +03:00
• 81404715d8 Merge pull request #381 from pcoder/task/3562/remove_btn_outline Pcoder 2017-07-07 21:17:29 +02:00
• e298f86290 Removed button outline when inactive PCoder 2017-07-08 00:12:10 +05:30
• aaff4f048d Removed some unnecessary code PCoder 2017-07-07 23:25:38 +05:30
• 79df35a765 Merge branch 'task/3354/modal_restyling' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3354/modal_restyling PCoder 2017-07-07 23:21:27 +05:30
• 53f797472b Update base.py Siarhei Puhach 2017-07-07 18:13:00 +03:00
• 1279d4efbb Merge branch 'master' into feature/ssh_keys Siarhei Puhach 2017-07-07 17:49:22 +03:00
• 705948fdb7 Merge remote-tracking branch 'upstream/master' Siarhei Puhach 2017-07-07 17:26:25 +03:00
• eec8caf5ad Merge pull request #378 from ungleich/pcoder-set_debug_false Pcoder 2017-07-07 02:20:50 +02:00
• 1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false PCoder 2017-07-07 04:47:15 +05:30
• a31cead827 Merge pull request #368 from ungleich/siarheipuhach-feature/flake8 Pcoder 2017-07-06 23:16:07 +02:00
• 67da139106 Fixed one more flake warning PCoder 2017-07-07 01:23:56 +05:30
• ddacfeacf3 Fixed some flake8 errors PCoder 2017-07-07 01:20:16 +05:30
• 1a20507c02 Merged master into siarheipuhach-feature/flake8 PCoder 2017-07-07 00:53:58 +05:30
• cfc1210a9a We probably need creating HostingBill PCoder 2017-07-07 00:12:29 +05:30
• fd0e689562 Correct the indentation in the html template files of dcl. Karthik Rao 2017-07-06 20:38:22 +05:30
• 759bfd75a3 Added question image file Siarhei Puhach 2017-07-06 14:18:57 +03:00
• d2d96e9951 Added private_key field to UserHostingkey model, some html updates Siarhei Puhach 2017-07-06 14:18:22 +03:00
• 8986aa6550 Added generation button with no field input required (generate ssh key name) Siarhei Puhach 2017-07-06 11:47:12 +03:00
• 3a673bdbac Remove repeated script imports from dcl's success.html Karthik Rao 2017-07-05 21:03:54 +05:30
• 7cc70a95ac Added new page(Choice ssh key generate/upload), changed design of generate ssh form Siarhei Puhach 2017-07-05 16:57:49 +03:00
• 66d0df7196 Insert missing body end tag to dcl's base.html Karthik Rao 2017-07-05 17:09:03 +05:30
• e4d0ec43a8 Fixed Pull request #372 Siarhei Puhach 2017-07-05 13:11:01 +03:00
• f49d6b398f Changed ssh keys design(+ mobile ver.) siarheipuhach 2017-07-05 08:41:50 +03:00
• 44d1a4aaed Merge branch 'master' into set_debug_false M.Ravi 2017-07-05 00:57:51 +02:00
• 86c4e7b408 Task: Improve credit card section - letting the user know that they're not making any payment there but on the next page deaspo 2017-07-05 01:53:01 +03:00
• e524aea1e5 Merge pull request #4 from ungleich/master Polycarp Okock 2017-07-05 01:51:34 +03:00
• 3304d862cb Moved static images urlpattern out of DEBUG case M.Ravi 2017-07-05 00:07:06 +02:00
• 4bdae326f7 Refactored the call to import local and prod files M.Ravi 2017-07-04 23:16:27 +02:00
• dafd11c592 Merge pull request #370 from ungleich/geethamondi-task/3488/create_whydcl_page Pcoder 2017-07-04 22:28:29 +02:00
• d12687015b opensource -> open source and some text adjustment M.Ravi 2017-07-04 22:18:23 +02:00
• 6496b5202d Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3488/create_whydcl_page M.Ravi 2017-07-04 22:14:30 +02:00
• 6d7a1d4e4a Added memcached cache M.Ravi 2017-07-04 21:00:00 +02:00
• 41220ef172 Added bool_env function to retrieve env variable and convert to python boolean M.Ravi 2017-07-04 20:46:42 +02:00
• ceb10d116e Added python-memcached to requirements.txt M.Ravi 2017-07-04 20:44:59 +02:00
• b96d13772e SSH keys list template changed Siarhei Puhach 2017-07-04 17:55:43 +03:00
• de0bada84a SSH key change design init Siarhei Puhach 2017-07-04 15:00:08 +03:00
• feb46a4b0a Merge branch 'master' into task/3354/modal_restyling Mondi Geetha 2017-07-04 13:06:33 +05:30
• 8bb7eee418 Corrected some mistakes M.Ravi 2017-07-04 08:47:55 +02:00
• f419ce784f Fixed some flake8 warnings M.Ravi 2017-07-03 23:53:37 +02:00
• f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 M.Ravi 2017-07-03 23:47:56 +02:00
• b6b218a401 Merge pull request #367 from amarynets/bugfix/fix_404_favicon.ico_on_digitalglarus.ch Pcoder 2017-07-03 23:15:16 +02:00
• d3e1204446 Merge branch 'master' into task/3354/modal_restyling Mondi Geetha 2017-07-04 01:16:39 +05:30
• bc73ad3c4c Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch Andrii Marynets 2017-07-03 22:32:32 +03:00
• 8aa7ffa2d3 Added Heading to Modals and styles Mondi Geetha 2017-07-04 00:56:49 +05:30
• cac84f5433 Changed some text Mondi Geetha 2017-07-04 00:10:23 +05:30
• e19d2e3c13 Updated Pricing Form with updated error messages Mondi Geetha 2017-07-03 23:31:35 +05:30
• 36976d923e Merged master into whydcl Mondi Geetha 2017-07-03 23:03:51 +05:30
• 49ae9adcb8 Added icons for modals Mondi Geetha 2017-07-03 22:34:39 +05:30
• b9d32afc67 Changed some styles for modal popup Mondi Geetha 2017-07-03 22:32:34 +05:30
• e17792badb Merge branch 'master' of https://github.com/ungleich/dynamicweb M.Ravi 2017-07-02 23:38:07 +02:00
• 8b9359ede5 Reverted back to the default behavior of bootstrap-validator M.Ravi 2017-07-02 23:37:31 +02:00
• 352c549269 Merge pull request #357 from amarynets/feature/add_google_analytics Pcoder 2017-07-02 23:04:45 +02:00
• a91de372e0 Merge branch 'master' into feature/add_google_analytics Andrii Marynets 2017-07-02 23:01:42 +03:00
• 5ea35bd4d8 add ids for dev and staging server Andrii Marynets 2017-07-02 23:00:56 +03:00
• f67343ab5c Added missing validation code M.Ravi 2017-07-02 21:26:10 +02:00
• bb9ea518d1 Merge pull request #365 from geethamondi/bug/3418/calc_errmsg_position Pcoder 2017-07-02 20:06:42 +02:00
• 3a865bd010 Increased minimum length of the name to 3 Mondi Geetha 2017-07-02 23:33:33 +05:30
• 5b6a069137 Added DE translations for error messages Mondi Geetha 2017-07-02 23:16:19 +05:30
• 5c7ee11815 Merge branch 'master' into bug/3418/calc_errmsg_position Mondi Geetha 2017-07-02 21:09:10 +05:30
• fd856d7613 Reverted back email templates as they are part of another PR Mondi Geetha 2017-07-02 20:55:08 +05:30
• 1f658a425f Merge with master Andrii Marynets 2017-07-02 17:56:49 +03:00
• 303d99d70d Merge branch 'master' into feature/add_google_analytics Andrii Marynets 2017-07-02 17:56:07 +03:00
• 871237d84f Updated Changelog for the release 1.0.18 1.0.18 M.Ravi 2017-07-02 15:33:11 +02:00
• f48ea4714e changed error message color Mondi Geetha 2017-07-02 18:34:17 +05:30
• 2045c424ca Added padding to LOGO in user activation email Mondi Geetha 2017-07-02 03:00:02 +05:30
• 6cbbbc70be Alinged Logo, Text, Signature to left side Mondi Geetha 2017-07-02 02:45:22 +05:30
• 0a2b2c815d Aligned Logo, Text, Signature to left Mondi Geetha 2017-07-02 02:14:18 +05:30
• 430ddc4bcb Merge branch 'master' into siarheipuhach-feature/flake8 M.Ravi 2017-07-01 15:56:22 +02:00
• 8fb4607bdd Fixed issues reported by flake M.Ravi 2017-07-01 15:53:25 +02:00
• c8cf166571 Merged code from siarheipuhach/dynamicweb M.Ravi 2017-07-01 15:18:44 +02:00
• c8d0a2e91f Merge pull request #364 from pcoder/master Pcoder 2017-07-01 14:44:24 +02:00
• 0c969946f7 Added code for proper return when name/email are not good Mondi Geetha 2017-07-01 18:02:10 +05:30
• e4cfcbf618 Added some classes and divs for error msg alignment alongside the input field Mondi Geetha 2017-07-01 18:01:08 +05:30
• afcec7eb03 Removed unwanted code and add bootstrap-validator cdn js Mondi Geetha 2017-07-01 17:59:34 +05:30
• 36877d613d Added styles for proper positioning of error msgs Mondi Geetha 2017-07-01 17:58:42 +05:30
• f847302acd Fixed hosting template footer for unauthenticated case (direct payment + order confirmation) PCoder 2017-07-01 11:22:12 +05:30
• d8786c9a3c Merge pull request #363 from pcoder/new_flow_enhancement Pcoder 2017-07-01 01:16:11 +02:00
• b502cb5da8 Fixed logo in payment/order confirmation page not redirecting to index issue PCoder 2017-07-01 04:29:11 +05:30
• 3aa1357960 Merge pull request #362 from pcoder/new_flow_enhancement Pcoder 2017-07-01 00:32:36 +02:00
• 4857bc2cd8 Now fetching billing address data from session variable PCoder 2017-07-01 03:54:08 +05:30
• bd766e2073 Fixed filling up of users details while going back to payment page from order confirmation page PCoder 2017-07-01 03:11:16 +05:30
• 285ce2e710 Added OS configuration to the Order Confirmation page PCoder 2017-07-01 02:16:24 +05:30
• e286fc8aaf Added OS configuration to the payment page PCoder 2017-07-01 02:10:30 +05:30
• 0b0892a299 Added OS to the payment page PCoder 2017-07-01 01:59:24 +05:30
• dfd910465c Added dcl translations used in new flow PCoder 2017-07-01 01:40:17 +05:30
• adb792770e Fixed alignment for 100% SSD Mondi Geetha 2017-07-01 00:55:49 +05:30
• 05a23bb545 Left aligned We bring future to you section Mondi Geetha 2017-07-01 00:47:29 +05:30
• a936c6cb17 Deleted whydcl-pattren.jpg Mondi Geetha 2017-07-01 00:36:00 +05:30
• b4caccaec8 Fixed dropdown menu width for de Mondi Geetha 2017-07-01 00:35:17 +05:30
• 6247deb27c Changed img alt text Mondi Geetha 2017-06-30 23:22:34 +05:30