Commit graph

3702 commits

Author SHA1 Message Date
Arvind Tiwari
bf2797eccd
Merge pull request #607 from tiwariav/task/4378/navbar_logo_multisite
Task/4378 navbar content on non-cms pages
2018-04-04 18:27:18 +05:30
Arvind Tiwari
c5dba114df update changelog 2018-04-04 18:26:19 +05:30
Arvind Tiwari
7c13def3a2 header btn link fix 2018-04-04 17:55:19 +05:30
Arvind Tiwari
8a390d3661 Merge remote-tracking branch 'ungleich/master' 2018-04-04 17:48:18 +05:30
PCoder
1aa8319feb Change order of ungleich_page namespace 2018-04-04 01:05:05 +02:00
PCoder
035f5c39ae Format code 2018-04-04 00:35:25 +02:00
PCoder
ae4a83bdb8 Remove name for cms.urls 2018-04-04 00:35:12 +02:00
PCoder
9b45b758c4 Add ungleich_page urlconf namespace again 2018-04-04 00:34:29 +02:00
PCoder
0ec29be4ec Use /cms for redirection instead of incorrect namespaces 2018-04-03 23:28:47 +02:00
Arvind Tiwari
ae2dea993d remove whitespace 2018-04-04 02:27:30 +05:30
PCoder
69003c6913 Merge branch 'master' into task/4362/fix_need_of_cms_dummy_page 2018-04-03 22:51:07 +02:00
PCoder
e0df641dbd Merge master into task/4362/fix_need_of_cms_dummy_page 2018-04-03 22:50:00 +02:00
Arvind Tiwari
fe3fcb5100 flake8 fix 2018-04-03 22:51:04 +05:30
Arvind Tiwari
9fbdc56c41 Merge remote-tracking branch 'ungleich/master' into task/4378/navbar_logo_multisite 2018-04-03 22:45:03 +05:30
Arvind Tiwari
d843c34d68 modified cms integrate to support separate content for each domain 2018-04-03 22:41:29 +05:30
Arvind Tiwari
d3c7149098
Update Changelog 2018-04-01 19:11:51 +05:30
Arvind Tiwari
9511428c9d
Merge pull request #606 from tiwariav/task/4373/hosting_login_footer
Task/4373 hosting login footer links
2018-04-01 19:06:13 +05:30
Arvind Tiwari
a1ac65bdee
Update Changelog 2018-04-01 19:05:48 +05:30
Arvind Tiwari
1e6fb26051 hosting login footer fix 2018-04-01 18:45:36 +05:30
PCoder
73c49aa964 Merge branch 'task/4362/fix_need_of_cms_dummy_page' of github.com:pcoder/dynamicweb into task/4362/fix_need_of_cms_dummy_page 2018-04-01 08:16:29 +02:00
PCoder
41d073da3b Remove conflicting cms/ urlconf 2018-04-01 08:14:50 +02:00
PCoder
bf48dc33de Update Changelog 2018-03-31 01:46:40 +02:00
Pcoder
10f6000e9a
Merge pull request #605 from pcoder/bugfix/user_activation_email_style
Bugfix/user activation html email style + some add/correct some DE translations
2018-03-31 01:42:49 +02:00
PCoder
fb29bd0128 [DCL] Add DE translations by Sanghee 2018-03-31 01:28:56 +02:00
PCoder
aa9becdfe7 Reduce space between content and your dcl team 2018-03-31 00:09:49 +02:00
PCoder
bf4f2f0f87 Correct a translation and add new translation 2018-03-30 23:47:27 +02:00
PCoder
07d15a8144 Include password reset link in the text 2018-03-30 23:46:29 +02:00
PCoder
74e69ff313 Add some space between account details and activate email linkpacebetween account details and activate email link 2018-03-30 23:45:11 +02:00
PCoder
b64fe2cb1c Attempt to fix user activation html email template 2018-03-30 23:02:44 +02:00
Arvind Tiwari
e19844d9ac
Update Changelog 2018-03-29 01:42:22 +05:30
Arvind Tiwari
141c6a7c0f
Update common.css 2018-03-29 01:24:18 +05:30
Arvind Tiwari
8708b3a513
Merge pull request #597 from tiwariav/task/4313/hosting_footer_text
Task/4313/hosting_footer_style_fix
2018-03-29 01:20:11 +05:30
Arvind Tiwari
1402c7fde1 footer padding fix 2018-03-29 01:19:10 +05:30
Arvind Tiwari
368fe0d08f merge master 2018-03-29 01:04:26 +05:30
Arvind Tiwari
8b4e0d847d
Merge pull request #601 from tiwariav/task/4315/cms_navbar_to_static
bugfix/ placeholder fields migration
2018-03-29 01:00:52 +05:30
Arvind Tiwari
29a2ee098b fix related name for placeholder fields 2018-03-29 00:58:08 +05:30
Arvind Tiwari
033e542cbc
Merge pull request #599 from tiwariav/task/4315/cms_navbar_to_static
Task/4315/cms navbar and footer integration to application pages
2018-03-29 00:45:40 +05:30
Arvind Tiwari
2b27d56e54 cmsintegrate management command 2018-03-29 00:43:38 +05:30
PCoder
8f6bae6bd6 Remove conflicting cms/ urlconf 2018-03-28 08:53:49 +02:00
Arvind Tiwari
8fc605f5b5 merge 2018-03-27 21:10:21 +05:30
Arvind Tiwari
e7d7cf67b2 add footer and header placeholders 2018-03-27 21:04:44 +05:30
Arvind Tiwari
8beebbf487
Update Changelog 2018-03-27 20:57:46 +05:30
Arvind Tiwari
4de9272389
Merge pull request #598 from tiwariav/bugfix/remove_default_thousand_separator
bugfix/ remove default thousand seperator
2018-03-27 19:41:43 +05:30
Arvind Tiwari
d52c061709 use humanize to add comma to numbers 2018-03-27 19:38:09 +05:30
Arvind Tiwari
bc36849178 cms integration 2018-03-27 19:19:26 +05:30
Arvind Tiwari
52dafc99d3 ungleich gmbh -> ungleich glarus ag, settings page fix 2018-03-27 00:54:44 +05:30
Arvind Tiwari
251d4928e2
Update Changelog 2018-03-26 00:32:53 +05:30
Arvind Tiwari
ba8719269e
Merge pull request #580 from tiwariav/task/3842/de_number_formatting_2
task/3842 de number formatting
2018-03-25 23:10:43 +05:30
Arvind Tiwari
9846cac6da
Merge pull request #596 from tiwariav/task/4266/dcl_cms_promotion_section
Task/4266/dcl cms promotion section
2018-03-25 22:52:23 +05:30
Arvind Tiwari
880ee3af4a padding fix for mobile 2018-03-25 22:16:46 +05:30