Commit graph

2425 commits

Author SHA1 Message Date
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
Levi Velázquez
68dbe1343b Merge pull request #336 from levivm/develop
Develop
2017-06-13 14:08:41 -05:00
Levi
9333532662 Merge branch 'master' into develop 2017-06-13 14:07:52 -05:00
Levi
11e59c8ea3 added translations 2017-06-13 13:47:55 -05:00
Henry Bravo
2d3e446568 fix locale 2017-06-13 13:39:47 -05:00
M.Ravi
3c5cf3f9ec Rearranged navbar menu items 2017-06-13 23:47:57 +05:30
Levi Velázquez
dc6f4098e0 Merge pull request #322 from HenryGBC/develop
Fixed Staging, Clean code an resolve conflicts
2017-06-13 11:59:36 -05:00
Henry Bravo
a03f2f8f89 Fix conflicts 2017-06-13 10:36:39 -05:00
Levi
b5bb26e445 added missing translations for datacenterlight 2017-06-13 01:48:36 -05:00
Levi Velázquez
0588395226 Merge pull request #334 from levivm/develop
resolved henry latest conflicts
2017-06-13 01:13:31 -05:00
Levi
89dedab8ba resolved henry latest conflicts 2017-06-13 01:12:51 -05:00
Levi Velázquez
8481a4c7cc Merge pull request #333 from levivm/develop
Develop
2017-06-12 23:52:15 -05:00
Levi
c7d29be24c Merge branch 'master' into develop 2017-06-12 23:51:03 -05:00
M.Ravi
1a37ce2817 Updated Changelog 2017-06-13 05:10:12 +05:30
M.Ravi
9354cad626 Updated Changelog 2017-06-13 05:09:01 +05:30
M.Ravi
1a7615dc9a Fixed a typo 2017-06-13 05:03:46 +05:30
Pcoder
8f85a1b4bd Merge pull request #332 from pcoder/bug/email_from_address_missing
Added from_address to EmailMessage
2017-06-13 01:11:44 +02:00
M.Ravi
83802a0a52 Added from_address to EmailMessage 2017-06-13 04:39:30 +05:30
M.Ravi
a60e799e08 Updated changelog 2017-06-13 03:14:03 +05:30
Pcoder
364ba07b67 Merge pull request #331 from verysanghee/bugfix/add_month
month added to landing calculator box
2017-06-12 23:38:49 +02:00
M.Ravi
a2a3cc1f5a Small code formatting 2017-06-12 20:51:48 +05:30
M.Ravi
d84496b0de Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset. 2017-06-12 20:42:17 +05:30
Henry Bravo
be82a63b7a Reduce container in ssh_key and tetextarea 2017-06-11 20:04:06 -05:00
Henry Bravo
38970e9353 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-06-11 19:46:26 -05:00
Henry Bravo
225f92caf5 Change To Font Lato in VM Pages and remove messages in login 2017-06-11 19:46:07 -05:00
f2aa5377d8 month added to landing calculator box 2017-06-11 23:32:37 +02:00
Levi Velázquez
ca2a10645d Merge pull request #328 from levivm/develop
fixing 500 error
2017-06-11 13:00:22 -05:00
Levi
993039c020 fixing 500 error 2017-06-11 12:59:57 -05:00
Levi Velázquez
2f0b38302a Merge pull request #316 from pcoder/bug/3328/dcl_email_headers
Changed BaseEmail to accept from_address to modify the from header ac…
2017-06-11 12:30:29 -05:00
Levi Velázquez
d2a8c13b9e Merge branch 'master' into bug/3328/dcl_email_headers 2017-06-11 12:30:09 -05:00
Levi Velázquez
d2d62bf990 Merge pull request #327 from levivm/develop
Develop
2017-06-11 12:22:59 -05:00
Levi
d7a38dffa2 added changelog 2017-06-11 12:20:25 -05:00
Levi
817f800fbd fixed #3350 2017-06-11 11:44:14 -05:00
M.Ravi
98b9e2ee92 Updated Changelog 2017-06-11 20:19:49 +05:30
M.Ravi
792280f112 Updated changelog 2017-06-11 20:12:46 +05:30
M.Ravi
620e93bb9f Merge branch 'telmich-feature/nonhtml-email' 2017-06-11 20:07:54 +05:30
M.Ravi
943fc741bf Modified the IndexView to send text email on receiving new order 2017-06-11 20:06:54 +05:30
M.Ravi
d7a2335cf4 Merge branch 'master' into telmich-feature/nonhtml-email 2017-06-11 19:56:35 +05:30
M.Ravi
c5fdb3da5a Updated change log 2017-06-11 19:51:54 +05:30
Nico Schottelius
1d1743828b Merge pull request #325 from pcoder/feature/3371/calc_in_landing
Feature/3371/calculator in landing page
2017-06-11 16:15:42 +02:00
M.Ravi
a29ceb765f Updated the translation for the modified text 2017-06-11 17:46:42 +05:30
M.Ravi
8e95ed304b Updated the text in dcl index.html template 2017-06-11 16:57:20 +05:30