Commit graph

3839 commits

Author SHA1 Message Date
Arvind Tiwari
a306f59327
Update mixins.py 2018-04-09 03:12:41 +05:30
Arvind Tiwari
d1347afaff update changelog 2018-04-09 03:10:32 +05:30
Arvind Tiwari
6e95e3d885 merge master 2018-04-09 03:09:05 +05:30
Arvind Tiwari
79b5ff6e2c
Merge pull request #616 from tiwariav/bugfix/4396/ungleich_favicon
Bugfix/4396 ungleich favicon
2018-04-09 03:08:03 +05:30
Arvind Tiwari
5dd29bb09e
Update mixins.py 2018-04-09 03:02:50 +05:30
Arvind Tiwari
4305c5cc41 fix logo link url to ungleich home 2018-04-09 02:46:09 +05:30
Arvind Tiwari
600cc7899a mobile visibility 2018-04-09 02:34:34 +05:30
Arvind Tiwari
f9ce871c5d update changelog 2018-04-09 02:18:34 +05:30
Arvind Tiwari
f4b6949d39 corrected favicon link on pages 2018-04-09 02:16:57 +05:30
Arvind Tiwari
e6629a1357 update changelog 2018-04-09 02:00:42 +05:30
Arvind Tiwari
774b13034d
Merge pull request #614 from tiwariav/bugfix/dcl_migration
bugfix/ dcl migrations
2018-04-09 01:54:37 +05:30
Arvind Tiwari
ff1908d2e6 added navbar-transparent styles to glasfaser.css 2018-04-09 01:52:49 +05:30
Arvind Tiwari
fb7ccff584 remove old migrations from squashed migration 2018-04-09 01:11:45 +05:30
PCoder
2a08c1efd3 Merge branch 'master' into task/4379/price_without_vat 2018-04-08 13:15:41 +02:00
PCoder
30d7785700 Redirect to DCL home on hosting footer for all domains 2018-04-08 08:36:00 +02:00
PCoder
c3dff3155e Redirect the contact link to dcl always 2018-04-08 00:29:39 +02:00
PCoder
698cf7f1ee Fix link in signup message 2018-04-07 13:16:36 +02:00
PCoder
7b1cb975df Fix Method Resolution Order 2018-04-07 13:15:44 +02:00
PCoder
178ff8da38 CMS home page can now be accessed at /cms/ for all sites 2018-04-07 13:13:55 +02:00
PCoder
c6e3963303 Update footer links in dcl _footer.html 2018-04-07 12:55:32 +02:00
PCoder
f911d6b403 Add HostingContextMixin to various hosting views 2018-04-07 12:53:53 +02:00
PCoder
399c91d636 Add HostingContextMixin that sets the REDIRECT_TO_CMS and
MULTISITE_CMS_FALLBACK urls
2018-04-07 12:51:49 +02:00
PCoder
ffe4eb4123 Use REDIRECT_TO_CMS and MULTISITE_CMS_FALLBACK to construct
/hosting footer urls
2018-04-07 10:25:27 +02:00
Pcoder
56f6c87fab
Merge pull request #612 from pcoder/bugifix/cms_redirect_for_multitenant_urls_also
bugfix/Redirect multi-tenant urls to /cms also
2018-04-07 00:13:14 +02:00
PCoder
24a9b8ab78 Redirect multi-tenant urls to /cms also 2018-04-07 00:13:24 +02:00
PCoder
c167e1ca94 Update Changelog for 1.6.4 2018-04-06 22:31:39 +02:00
PCoder
9fca25ec5a Update Changelog 2018-04-06 20:28:15 +02:00
Pcoder
dbc702ebcf
Merge pull request #600 from pcoder/task/4362/fix_need_of_cms_dummy_page
Task/4362/Remove conflicting cms/ urlconf
2018-04-06 20:13:25 +02:00
PCoder
2d5927bc31 Merge branch 'master' into task/4362/fix_need_of_cms_dummy_page 2018-04-06 08:13:47 +02:00
PCoder
7fe5c3f88c Merge branch 'master' into task/4379/price_without_vat 2018-04-06 00:53:29 +02:00
PCoder
28de423a14 Add VMPricing model 2018-04-06 00:51:44 +02:00
Arvind Tiwari
1e81587551
Update Changelog 2018-04-06 03:20:44 +05:30
PCoder
5cb51db6d7 Update .travis.yml
Add code to compile .po files before beginning tests
2018-04-05 23:31:50 +02:00
Arvind Tiwari
a00ce7605b
Merge pull request #608 from tiwariav/bugfix/4377/header_slider_btn_fix
Bugfix/4377 header slider btn fix
2018-04-04 18:43:46 +05:30
Arvind Tiwari
35decd208c merged master 2018-04-04 18:41:43 +05:30
Arvind Tiwari
cb4391b885 Merge remote-tracking branch 'ungleich/master' 2018-04-04 18:41:14 +05:30
Arvind Tiwari
80f4ac52e8 update changelog 2018-04-04 18:36:45 +05:30
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