Commit graph

3089 commits

Author SHA1 Message Date
PCoder
76b3785adc Merge branch 'master' into task/3747/multiple_cards_support 2017-10-21 12:04:15 +02:00
PCoder
7359431b9c Update Changelog 2017-10-21 11:44:55 +02:00
PCoder
12278fc5af Fetch page_title and meta_description dynamically in glasfaser CMS template 2017-10-21 11:42:56 +02:00
Nico Schottelius
ed87762ff0 Update changelog as well 2017-10-21 08:36:17 +02:00
Nico Schottelius
3d192ed59f Replace alplora.ch with .hack4glarus.ch 2017-10-21 08:33:37 +02:00
PCoder
c664b44f2c Add functionality to delete user card 2017-10-21 00:02:35 +02:00
PCoder
255c8a1d80 Add UserCardDetail create method that assigns appropriate object permission 2017-10-21 00:00:21 +02:00
PCoder
51039a5cb3 Merge branch 'master' into task/3747/multiple_cards_support 2017-10-20 21:45:39 +02:00
M.Ravi
725606ff98 Use correct glasfaser template name 2017-10-20 12:31:12 +02:00
M.Ravi
e807ad7834 Bugfix: Limit glasfaser menu to Glasfaser template only 2017-10-20 12:12:13 +02:00
pcoder
cfc289d09d Update Changelog for 1.2.7 2017-10-20 09:49:38 +02:00
pcoder
e282b2ae01 Update Changelog 2017-10-20 09:07:53 +02:00
Pcoder
333b7a99fb Merge pull request #525 from pcoder/feature/glasfaser_cms_template
Feature/glasfaser cms template
2017-10-20 09:05:19 +02:00
pcoder
c4975f0f9b Add link url to AboutItem 2017-10-20 08:50:30 +02:00
pcoder
c20e9372f9 SectionWithImage: Open link in a new window 2017-10-20 08:49:21 +02:00
M.Ravi
60cfc24319 Merge branch task/3766/credit_card_options from tiwariav into task/3747/multiple_cards_support 2017-10-19 20:24:28 +02:00
M.Ravi
68a34762b9 Merge branch 'master' into task/3747/multiple_cards_support 2017-10-19 20:17:39 +02:00
M.Ravi
824e0758e2 Rename TestMenu to GlasfaserMenu 2017-10-19 19:47:53 +02:00
M.Ravi
39ca45cfb9 Make fields of contact section customizable 2017-10-19 17:23:19 +02:00
M.Ravi
e7c7f6f73a Show background image and link only if specified 2017-10-19 16:23:28 +02:00
M.Ravi
c448562384 Remove empty items from menu 2017-10-19 16:04:18 +02:00
M.Ravi
55dd96570c Add custom padding bottom for services section 2017-10-19 15:24:00 +02:00
M.Ravi
6322140813 Add section id from cms for about 2017-10-19 14:22:02 +02:00
M.Ravi
46baaaf621 Add section id from cms for services 2017-10-19 14:14:29 +02:00
M.Ravi
502d822a02 Add section id from cms in the contact us section 2017-10-19 14:05:17 +02:00
M.Ravi
428d329d99 Add migrations 2017-10-19 13:49:30 +02:00
M.Ravi
ac5c43822f Add menus template for glasfaser template 2017-10-19 13:48:13 +02:00
M.Ravi
24fe8c4c6e Load section ids from cms 2017-10-19 13:46:20 +02:00
M.Ravi
0935877a4f Add get_section_id 2017-10-19 13:45:28 +02:00
M.Ravi
b21a533aeb Show menu using cms 2017-10-19 13:44:21 +02:00
M.Ravi
73818fd5b9 Add menu_text fields for various plugins 2017-10-19 13:40:48 +02:00
M.Ravi
c147b48af7 Add first version of cms_menus.py 2017-10-19 13:39:56 +02:00
M.Ravi
878a823e20 Use SectionWithImage 2017-10-19 00:30:07 +02:00
M.Ravi
bf044a4bf3 Improve section_with_image.html to include price_tag image and url 2017-10-19 00:29:34 +02:00
M.Ravi
8ce273ea1f Add SectionWithImage model and its migration 2017-10-19 00:28:34 +02:00
M.Ravi
38330d562c Remove unused cms config from base.py 2017-10-18 23:29:57 +02:00
M.Ravi
db45597e4e Remove foreign keys between nested plugins 2017-10-18 20:24:50 +02:00
M.Ravi
e563ae642f Merge branch 'master' into feature/glasfaser_cms_template 2017-10-18 18:24:53 +02:00
M.Ravi
c753d3061d Refactor glasfaser_cms_page.html template 2017-10-18 16:57:15 +02:00
M.Ravi
609501f987 Add GlasfaserAboutPlugin and GlasfaserAboutItemPlugin 2017-10-18 16:56:41 +02:00
M.Ravi
621424f182 Add updated migration file 2017-10-18 16:56:00 +02:00
M.Ravi
04e72696f1 Add About and AboutItem models 2017-10-18 16:53:32 +02:00
M.Ravi
5e2d1966f8 Add section_about and _about_item templates 2017-10-18 16:53:05 +02:00
M.Ravi
9ff5b4015f Rename section_services_item.html to _services_item.html 2017-10-18 15:58:50 +02:00
M.Ravi
cfcc3e0eb1 Add GlasfaserServicesPlugin and GlasfaserServicesItemPlugin 2017-10-18 15:51:47 +02:00
M.Ravi
f3e4ede52e Add section_services_item.html 2017-10-18 15:48:01 +02:00
M.Ravi
9c07565b73 Add section_services.html and section_services_item.html 2017-10-18 15:46:57 +02:00
M.Ravi
a8c49b7fde Delete 0002_ungleichtextsectionwithimage.py 2017-10-18 15:44:18 +02:00
M.Ravi
d05ef79ecc Add Service and ServiceItem models and corresponding migration 2017-10-18 15:43:12 +02:00
M.Ravi
ef0ab2d24a Add missing styles to intro section 2017-10-18 11:05:47 +02:00