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

• c50b2455c2 Separated email subject for translation M.Ravi 2017-06-20 23:45:25 +05:30
• b27342b493 Added dcl_text instead the hardcoded text M.Ravi 2017-06-20 23:44:10 +05:30
• 543a52baf9 Fixed some more translations M.Ravi 2017-06-20 01:00:48 +05:30
• b971751e2b Updated click here text in de M.Ravi 2017-06-20 00:22:12 +05:30
• ec761d9e5f Corrected with sanghee translations on github M.Ravi 2017-06-20 00:12:50 +05:30
• 8dca67e638 Increased top margin for email confirmation and validation forms M.Ravi 2017-06-19 23:53:25 +05:30
• 062416a280 Updated/corrected de translations for hosting M.Ravi 2017-06-19 23:39:19 +05:30
• 3cf7f8bd57 Updated css to center align text in registration success message M.Ravi 2017-06-19 12:55:14 +05:30
• ed26ac8b59 Updated dcl's django.po to resolve some conflict M.Ravi 2017-06-19 12:44:48 +05:30
• 0a6275bcef Merge branch 'master' into task/3379/text_style_activation M.Ravi 2017-06-19 12:37:09 +05:30
• 47632c6bd1 Updated the django.po for datacenterlight M.Ravi 2017-06-19 12:34:58 +05:30
• a7e9946a4f Refactored user activation html email template to use proper translation and parameters M.Ravi 2017-06-19 12:34:01 +05:30
• bf941539d7 Refactored user_activation.txt email template M.Ravi 2017-06-19 12:32:08 +05:30
• 17dd810945 Now we get dcl_text and dcl support email from settings M.Ravi 2017-06-19 12:30:37 +05:30
• 5e9330102e Added dcl email parameters to base.py M.Ravi 2017-06-19 12:29:22 +05:30
• 0cbd3aa666 Merge pull request #349 from pcoder/bug/3416/error_vm_id_change Pcoder 2017-06-18 17:12:52 +02:00
• 7296262fa3 Merge pull request #348 from pcoder/bug/responsive_issue_signup_validate Pcoder 2017-06-18 17:10:29 +02:00
• ab50e58a72 Updated signup and email confirmation views to work with translation M.Ravi 2017-06-17 19:38:22 +05:30
• e63e014588 Added Lato font for sign up success text M.Ravi 2017-06-17 17:34:30 +05:30
• bf99bd5edb Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him M.Ravi 2017-06-17 14:46:11 +05:30
• c2f8ae1eb3 Fixed a responsive issue in signup/email confirmation M.Ravi 2017-06-17 13:41:18 +05:30
• 2164db7d39 Staging fix text in highlights, added Font 'Lato', and outline none in all buttons Henry Bravo 2017-06-15 23:52:39 -05:00
• 10b0e06aa1 Merge pull request #347 from levivm/master 1.0.17 Levi Velázquez 2017-06-15 16:19:11 -05:00
• f9a0926043 added changelog Levi 2017-06-15 16:18:39 -05:00
• 7a4d3bb41f Merge branch 'master' of github.com:ungleich/dynamicweb Levi 2017-06-15 16:06:11 -05:00
• 13ddc8fc66 changed logo to datacenterlight Levi 2017-06-15 16:05:46 -05:00
• 5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails Levi Velázquez 2017-06-15 15:22:00 -05:00
• 8dfcca8264 Fixed name for dcl Pcoder 2017-06-16 00:47:09 +05:30
• ebaadb4d07 Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support Pcoder 2017-06-15 21:04:03 +02:00
• d4876cdecb Fixed the username for the from_email address Pcoder 2017-06-16 00:09:11 +05:30
• 3aa9b573cc Merge pull request #343 from ungleich/fix_translation Levi Velázquez 2017-06-15 13:38:16 -05:00
• 06af225c97 Updated proper translation corrections M.Ravi 2017-06-16 00:00:26 +05:30
• 93bc6ac458 Merge pull request #344 from pcoder/bug/3256/view_details_500_error Levi Velázquez 2017-06-15 13:25:49 -05:00
• 8f9971acf2 Merge pull request #346 from pcoder/task/3387/cleanup_order_page_new Levi Velázquez 2017-06-15 13:20:00 -05:00
• 36567071c0 Removed OrderView as we no longer use it M.Ravi 2017-06-15 23:36:58 +05:30
• e897bb9c22 Removed unused /order url M.Ravi 2017-06-15 23:32:20 +05:30
• 6c588e3531 Deleted the order.html M.Ravi 2017-06-15 23:31:19 +05:30
• 65cca56ab8 Merge pull request #341 from levivm/master Levi Velázquez 2017-06-15 11:33:27 -05:00
• cd0c4ff1f1 Merge pull request #345 from pcoder/bug/3237/GiB_to_GB Levi Velázquez 2017-06-15 11:08:09 -05:00
• 09601aefd9 Replaced all GiB to GB M.Ravi 2017-06-15 12:18:38 +05:30
• 657e93862d Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support Levi Velázquez 2017-06-15 01:17:14 -05:00
• 5b4e9b733d Tentative fix for error 500 on order details page M.Ravi 2017-06-15 07:30:47 +05:30
• e9643c4783 Deleted django.mo of hosting M.Ravi 2017-06-15 07:16:05 +05:30
• a56d08e729 Fixed translations of validation messages M.Ravi 2017-06-15 06:29:31 +05:30
• fcbeefb1d9 Updated the changelog 1.0.16 M.Ravi 2017-06-15 05:19:00 +05:30
• 910695777a Merge pull request #335 from pcoder/task/3377/navbar_rearrange Pcoder 2017-06-15 01:29:49 +02:00
• 6a6e5c2823 Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange M.Ravi 2017-06-15 04:37:40 +05:30
• 0b034ec2f8 Fixed typo 'Standort' instead of 'Strandort' M.Ravi 2017-06-15 04:29:57 +05:30
• dfd563259e Merge pull request #342 from HenryGBC/dcl#3364-3412 Pcoder 2017-06-15 00:43:48 +02:00
• 7992e39962 Generated .po Henry Bravo 2017-06-14 17:34:26 -05:00
• 739a92505d deleted home.htm Henry Bravo 2017-06-14 17:29:26 -05:00
• fb860b9a8d fixed typo and delete .mo Henry Bravo 2017-06-14 17:16:43 -05:00
• b2379f7a02 Fixed DE Typo, and added text in calculator box Henry Bravo 2017-06-14 16:51:42 -05:00
• 412236f6a1 Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange M.Ravi 2017-06-15 02:37:07 +05:30
• 3a1158cab0 cleaned up file createvm.js Levi 2017-06-14 13:05:39 -05:00
• 1a1b05f2f8 fixed credit card input issu Levi 2017-06-14 12:50:51 -05:00
• 2f7adf70f6 Merge pull request #340 from ungleich/develop 1.0.15 Levi Velázquez 2017-06-14 11:15:08 -05:00
• 7ac1306ff5 Merge pull request #339 from levivm/develop Levi Velázquez 2017-06-14 11:14:49 -05:00
• 642acfde75 added changelog Levi 2017-06-14 11:13:53 -05:00
• 4d0c1f9cdd Merge branch 'master' into develop Levi 2017-06-14 11:02:06 -05:00
• f40e2db58f Updated changelog 1.0.14 M.Ravi 2017-06-14 16:55:06 +05:30
• 6116c71709 Added *.mo to .gitignore M.Ravi 2017-06-14 16:22:40 +05:30
• 0499181b5f Removed all .mo files from git M.Ravi 2017-06-14 16:21:44 +05:30
• bbf6d52c7a Merge branch 'master' of https://github.com/ungleich/dynamicweb M.Ravi 2017-06-14 11:48:41 +05:30
• 85cffdde64 Added deploy.sh M.Ravi 2017-06-14 11:48:01 +05:30
• f6f3d0dd6a Merge pull request #338 from HenryGBC/develop Levi Velázquez 2017-06-13 23:40:56 -05:00
• 8acd249b4d Create Templatetag for change language whit the current path Henry Bravo 2017-06-13 22:35:15 -05:00
• 63c0c1ea5e Merge pull request #337 from levivm/develop Levi Velázquez 2017-06-13 14:11:40 -05:00
• 8ec290a59f cleaned up index.html Levi 2017-06-13 14:11:11 -05:00
• 68dbe1343b Merge pull request #336 from levivm/develop Levi Velázquez 2017-06-13 14:08:41 -05:00
• 9333532662 Merge branch 'master' into develop Levi 2017-06-13 14:07:52 -05:00
• 11e59c8ea3 added translations Levi 2017-06-13 13:47:55 -05:00
• 2d3e446568 fix locale Henry Bravo 2017-06-13 13:39:47 -05:00
• 3c5cf3f9ec Rearranged navbar menu items M.Ravi 2017-06-13 23:47:57 +05:30
• dc6f4098e0 Merge pull request #322 from HenryGBC/develop Levi Velázquez 2017-06-13 11:59:36 -05:00
• a03f2f8f89 Fix conflicts Henry Bravo 2017-06-13 10:36:39 -05:00
• b5bb26e445 added missing translations for datacenterlight 1.0.13 Levi 2017-06-13 01:48:36 -05:00
• 0588395226 Merge pull request #334 from levivm/develop Levi Velázquez 2017-06-13 01:13:31 -05:00
• 89dedab8ba resolved henry latest conflicts Levi 2017-06-13 01:12:51 -05:00
• 8481a4c7cc Merge pull request #333 from levivm/develop Levi Velázquez 2017-06-12 23:52:15 -05:00
• c7d29be24c Merge branch 'master' into develop Levi 2017-06-12 23:51:03 -05:00
• 1a37ce2817 Updated Changelog 1.0.12 M.Ravi 2017-06-13 05:10:12 +05:30
• 9354cad626 Updated Changelog M.Ravi 2017-06-13 05:09:01 +05:30
• 1a7615dc9a Fixed a typo M.Ravi 2017-06-13 05:03:46 +05:30
• 8f85a1b4bd Merge pull request #332 from pcoder/bug/email_from_address_missing Pcoder 2017-06-13 01:11:44 +02:00
• 83802a0a52 Added from_address to EmailMessage M.Ravi 2017-06-13 04:39:30 +05:30
• a60e799e08 Updated changelog 1.0.11 M.Ravi 2017-06-13 03:14:03 +05:30
• 364ba07b67 Merge pull request #331 from verysanghee/bugfix/add_month Pcoder 2017-06-12 23:38:49 +02:00
• a2a3cc1f5a Small code formatting M.Ravi 2017-06-12 20:51:48 +05:30
• d84496b0de Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset. M.Ravi 2017-06-12 20:42:17 +05:30
• be82a63b7a Reduce container in ssh_key and tetextarea Henry Bravo 2017-06-11 20:04:06 -05:00
• 38970e9353 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Henry Bravo 2017-06-11 19:46:26 -05:00
• 225f92caf5 Change To Font Lato in VM Pages and remove messages in login Henry Bravo 2017-06-11 19:46:07 -05:00
• f2aa5377d8 month added to landing calculator box Sanghee Kim 2017-06-11 23:32:37 +02:00
• ca2a10645d Merge pull request #328 from levivm/develop Levi Velázquez 2017-06-11 13:00:22 -05:00
• 993039c020 fixing 500 error Levi 2017-06-11 12:59:57 -05:00
• 2f0b38302a Merge pull request #316 from pcoder/bug/3328/dcl_email_headers Levi Velázquez 2017-06-11 12:30:29 -05:00
• d2a8c13b9e Merge branch 'master' into bug/3328/dcl_email_headers Levi Velázquez 2017-06-11 12:30:09 -05:00
• d2d62bf990 Merge pull request #327 from levivm/develop Levi Velázquez 2017-06-11 12:22:59 -05:00
• d7a38dffa2 added changelog Levi 2017-06-11 12:20:25 -05:00