Commit graph

1749 commits

Author SHA1 Message Date
Pcoder
545834d3d0 Merge pull request #377 from karthikvrao/refactor/dcl_better_indent_html
Task #3547: Correct the indentation in the html template files of dcl.
2017-07-07 22:33:33 +02:00
Pcoder
81404715d8 Merge pull request #381 from pcoder/task/3562/remove_btn_outline
Removed button outline when inactive
2017-07-07 21:17:29 +02:00
PCoder
e298f86290 Removed button outline when inactive 2017-07-08 00:12:10 +05:30
Pcoder
eec8caf5ad Merge pull request #378 from ungleich/pcoder-set_debug_false
On prodcution we should always have Debug = False
Please refer to redmine bug report #3538 for details.
2017-07-07 02:20:50 +02:00
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
Pcoder
a31cead827 Merge pull request #368 from ungleich/siarheipuhach-feature/flake8
Introducing flake8 for maintaing good code standards
2017-07-06 23:16:07 +02:00
PCoder
67da139106 Fixed one more flake warning 2017-07-07 01:23:56 +05:30
PCoder
ddacfeacf3 Fixed some flake8 errors 2017-07-07 01:20:16 +05:30
PCoder
1a20507c02 Merged master into siarheipuhach-feature/flake8 2017-07-07 00:53:58 +05:30
PCoder
cfc1210a9a We probably need creating HostingBill 2017-07-07 00:12:29 +05:30
Karthik Rao
fd0e689562 Correct the indentation in the html template files of dcl. 2017-07-06 20:38:22 +05:30
M.Ravi
44d1a4aaed Merge branch 'master' into set_debug_false 2017-07-05 00:57:51 +02:00
M.Ravi
3304d862cb Moved static images urlpattern out of DEBUG case 2017-07-05 00:07:06 +02:00
M.Ravi
4bdae326f7 Refactored the call to import local and prod files 2017-07-04 23:16:27 +02:00
Pcoder
dafd11c592 Merge pull request #370 from ungleich/geethamondi-task/3488/create_whydcl_page
Geethamondi task/3488/create whydcl page
2017-07-04 22:28:29 +02:00
M.Ravi
d12687015b opensource -> open source and some text adjustment 2017-07-04 22:18:23 +02:00
M.Ravi
6496b5202d Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3488/create_whydcl_page 2017-07-04 22:14:30 +02:00
M.Ravi
6d7a1d4e4a Added memcached cache 2017-07-04 21:00:00 +02:00
M.Ravi
41220ef172 Added bool_env function to retrieve env variable and convert to python boolean 2017-07-04 20:46:42 +02:00
M.Ravi
ceb10d116e Added python-memcached to requirements.txt 2017-07-04 20:44:59 +02:00
M.Ravi
8bb7eee418 Corrected some mistakes 2017-07-04 08:48:04 +02:00
M.Ravi
f419ce784f Fixed some flake8 warnings 2017-07-03 23:53:37 +02:00
M.Ravi
f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +02:00
Pcoder
b6b218a401 Merge pull request #367 from amarynets/bugfix/fix_404_favicon.ico_on_digitalglarus.ch
Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch
2017-07-03 23:15:16 +02:00
Andrii Marynets
bc73ad3c4c Ticket #3539. Fix issues: not loading favicon.ico on digitalglarus.ch 2017-07-03 22:32:32 +03:00
Mondi Geetha
cac84f5433 Changed some text 2017-07-04 00:10:23 +05:30
Mondi Geetha
e19d2e3c13 Updated Pricing Form with updated error messages 2017-07-03 23:31:35 +05:30
Mondi Geetha
36976d923e Merged master into whydcl 2017-07-03 23:03:51 +05:30
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
M.Ravi
430ddc4bcb Merge branch 'master' into siarheipuhach-feature/flake8 2017-07-01 15:56:22 +02:00
M.Ravi
8fb4607bdd Fixed issues reported by flake 2017-07-01 15:53:25 +02:00
M.Ravi
c8cf166571 Merged code from siarheipuhach/dynamicweb 2017-07-01 15:18:44 +02:00
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