Commit graph

1566 commits

Author SHA1 Message Date
M.Ravi
5e9330102e Added dcl email parameters to base.py 2017-06-19 12:29:22 +05:30
M.Ravi
ab50e58a72 Updated signup and email confirmation views to work with translation 2017-06-17 19:38:43 +05:30
M.Ravi
e63e014588 Added Lato font for sign up success text 2017-06-17 17:34:30 +05:30
Levi Velázquez
10b0e06aa1 Merge pull request #347 from levivm/master
Release 1.0.17
2017-06-15 16:19:11 -05:00
Levi
f9a0926043 added changelog 2017-06-15 16:18:39 -05:00
Levi
7a4d3bb41f Merge branch 'master' of github.com:ungleich/dynamicweb 2017-06-15 16:06:11 -05:00
Levi
13ddc8fc66 changed logo to datacenterlight 2017-06-15 16:05:46 -05:00
Levi Velázquez
5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
2017-06-15 15:22:00 -05:00
Pcoder
8dfcca8264 Fixed name for dcl 2017-06-16 00:47:09 +05:30
Pcoder
ebaadb4d07 Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support
Bug/3313/pwd reset email from dcl support
2017-06-15 21:04:03 +02:00
Pcoder
d4876cdecb Fixed the username for the from_email address 2017-06-16 00:09:11 +05:30
Levi Velázquez
3aa9b573cc Merge pull request #343 from ungleich/fix_translation
Fixed translations of validation messages
2017-06-15 13:38:16 -05:00
M.Ravi
06af225c97 Updated proper translation corrections 2017-06-16 00:00:26 +05:30
Levi Velázquez
93bc6ac458 Merge pull request #344 from pcoder/bug/3256/view_details_500_error
Bug/3256/view details 500 error
2017-06-15 13:25:49 -05:00
Levi Velázquez
8f9971acf2 Merge pull request #346 from pcoder/task/3387/cleanup_order_page_new
Task/3387/cleanup order page new
2017-06-15 13:20:00 -05:00
M.Ravi
36567071c0 Removed OrderView as we no longer use it 2017-06-15 23:36:58 +05:30
M.Ravi
e897bb9c22 Removed unused /order url 2017-06-15 23:32:20 +05:30
M.Ravi
6c588e3531 Deleted the order.html 2017-06-15 23:31:19 +05:30
Levi Velázquez
65cca56ab8 Merge pull request #341 from levivm/master
fixed credit card input issue
2017-06-15 11:33:27 -05:00
Levi Velázquez
cd0c4ff1f1 Merge pull request #345 from pcoder/bug/3237/GiB_to_GB
Replaced all GiB to GB
2017-06-15 11:08:09 -05:00
M.Ravi
09601aefd9 Replaced all GiB to GB 2017-06-15 12:18:38 +05:30
Levi Velázquez
657e93862d Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support 2017-06-15 01:17:14 -05:00
M.Ravi
5b4e9b733d Tentative fix for error 500 on order details page 2017-06-15 07:30:47 +05:30
M.Ravi
e9643c4783 Deleted django.mo of hosting 2017-06-15 07:16:17 +05:30
M.Ravi
a56d08e729 Fixed translations of validation messages 2017-06-15 06:29:31 +05:30
M.Ravi
fcbeefb1d9 Updated the changelog 2017-06-15 05:19:00 +05:30
Pcoder
910695777a Merge pull request #335 from pcoder/task/3377/navbar_rearrange
Rearranged navbar menu items
2017-06-15 01:29:49 +02:00
M.Ravi
6a6e5c2823 Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange 2017-06-15 04:37:40 +05:30
M.Ravi
0b034ec2f8 Fixed typo 'Standort' instead of 'Strandort' 2017-06-15 04:29:57 +05:30
Pcoder
dfd563259e Merge pull request #342 from HenryGBC/dcl#3364-3412
Fixed DE Typo, and added text in calculator box
2017-06-15 00:43:48 +02:00
Henry Bravo
7992e39962 Generated .po 2017-06-14 17:34:26 -05:00
Henry Bravo
739a92505d deleted home.htm 2017-06-14 17:29:26 -05:00
Henry Bravo
fb860b9a8d fixed typo and delete .mo 2017-06-14 17:16:43 -05:00
Henry Bravo
b2379f7a02 Fixed DE Typo, and added text in calculator box 2017-06-14 16:51:42 -05:00
M.Ravi
412236f6a1 Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange 2017-06-15 02:37:07 +05:30
Levi
3a1158cab0 cleaned up file createvm.js 2017-06-14 13:05:39 -05:00
Levi
1a1b05f2f8 fixed credit card input issu 2017-06-14 12:50:51 -05:00
Levi Velázquez
2f7adf70f6 Merge pull request #340 from ungleich/develop
Develop
2017-06-14 11:15:08 -05:00
Levi Velázquez
7ac1306ff5 Merge pull request #339 from levivm/develop
Develop
2017-06-14 11:14:49 -05:00
Levi
642acfde75 added changelog 2017-06-14 11:13:53 -05:00
Levi
4d0c1f9cdd Merge branch 'master' into develop 2017-06-14 11:02:06 -05:00
M.Ravi
f40e2db58f Updated changelog 2017-06-14 16:55:06 +05:30
M.Ravi
6116c71709 Added *.mo to .gitignore 2017-06-14 16:22:40 +05:30
M.Ravi
0499181b5f Removed all .mo files from git 2017-06-14 16:21:44 +05:30
M.Ravi
bbf6d52c7a Merge branch 'master' of https://github.com/ungleich/dynamicweb 2017-06-14 11:48:41 +05:30
M.Ravi
85cffdde64 Added deploy.sh 2017-06-14 11:48:01 +05:30
Levi Velázquez
f6f3d0dd6a Merge pull request #338 from HenryGBC/develop
Create Templatetag
2017-06-13 23:40:56 -05:00
Henry Bravo
8acd249b4d Create Templatetag for change language whit the current path 2017-06-13 22:35:15 -05:00
Levi Velázquez
63c0c1ea5e Merge pull request #337 from levivm/develop
cleaned up index.html
2017-06-13 14:11:40 -05:00
Levi
8ec290a59f cleaned up index.html 2017-06-13 14:11:11 -05:00