Commit graph

3077 commits

Author SHA1 Message Date
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
M.Ravi
a9e97a8bc6 Add UngelichTextSectionWithImage migration 2017-10-18 09:14:05 +02:00
M.Ravi
977966f3ba Add glasfaser_services.html 2017-10-18 09:11:31 +02:00
M.Ravi
f6468a7c8c First attempt to services section
- base.py: add settings to load GlasfaserServicesPlugin by default
    - glasfaser_cms_page.html: create a placeholder for services
    - cms_plugins.py: add the plugin code
    - models.py: add UngelichTextSectionWithImage model
2017-10-18 09:10:50 +02:00
M.Ravi
97ba0bafd3 Define various sections in glasfaser cms template 2017-10-18 00:12:48 +02:00
M.Ravi
4fcc24d8b7 Delete unnecessary migration files 2017-10-17 23:57:12 +02:00
M.Ravi
d42e2d6e39 Make all migrations into one file 2017-10-17 23:56:38 +02:00
M.Ravi
f610a18691 Add glasfaser cms.css 2017-10-17 23:40:58 +02:00
M.Ravi
77d92719d3 Add glasfaser cms.css 2017-10-17 23:39:41 +02:00
M.Ravi
4cba13a509 Add div space for price tag container 2017-10-17 23:31:57 +02:00
M.Ravi
36a9c386cb Add migrations 2017-10-17 17:52:01 +02:00
M.Ravi
e9142b17ae Add UngleichTextSection 2017-10-17 17:51:01 +02:00
M.Ravi
14bbfe901d Add SectionTextParagraphDCL and SectionTextParagraphGlasfaser 2017-10-17 17:47:40 +02:00
M.Ravi
27766329c9 Add dcl glasfaser text section templates 2017-10-17 17:46:22 +02:00
M.Ravi
ef47e999f1 Create SectionContact CMSPlugin 2017-10-17 16:25:01 +02:00
M.Ravi
92086ad2ea Obtain email dynamically 2017-10-17 16:24:19 +02:00
M.Ravi
98a9a35b4f Add 0002_ungleichcontactussection.py migration file 2017-10-17 16:23:37 +02:00
M.Ravi
a709485e77 Add missing ids 2017-10-17 16:02:04 +02:00
M.Ravi
4d485ef178 Add initial ungleich_page migration 2017-10-17 15:58:27 +02:00
M.Ravi
8e76a1c671 Set image and title dynamically 2017-10-17 15:52:30 +02:00
M.Ravi
a5dea2b399 Add ungleich_page cms_plugins and section templates 2017-10-17 09:30:52 +02:00
M.Ravi
b6f1309735 Add glasfaser_cms_page.html 2017-10-17 09:06:45 +02:00
M.Ravi
daaf55b343 Update Changelog 2017-10-16 21:18:03 +02:00
Pcoder
0c519de3f4 Merge pull request #524 from ungleich/bugfix/digitalglarus_registration_link
bugfix/remove DG email registration validate link
2017-10-16 21:07:28 +02:00
M.Ravi
24cce4eed7 - Remove registration link from DG registration email
- Remove multiple declared settings
2017-10-16 20:53:51 +02:00
Arvind Tiwari
387cad476f Update translations for user activation email 2017-10-17 00:19:03 +05:30
Arvind Tiwari
220a85b4a4 Merge pull request #523 from tiwariav/bugfix/account_activation_email
bugfix user account details added and translation fix
2017-10-16 01:08:54 +05:30
Arvind Tiwari
88be7be180 translation fix 2017-10-16 01:07:54 +05:30
Arvind Tiwari
9bc86255c4 user account details added and translation fix 2017-10-16 01:04:49 +05:30
Arvind Tiwari
839b7acd74 Update Changelog 2017-10-15 02:31:19 +05:30
Arvind Tiwari
5d35cb02ad Merge pull request #516 from tiwariav/task/3838/restyle_login_pages
Task/3838 restyle login pages
2017-10-15 02:31:09 +05:30
Arvind Tiwari
3370f06bff msg fix 2017-10-15 02:30:42 +05:30
Arvind Tiwari
c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari
1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
2017-10-15 01:27:02 +05:30
Arvind Tiwari
6fe0e27e04 Merge pull request #494 from tiwariav/task/3794/update_email_styles
Task/3794 update email styles
2017-10-15 00:47:14 +05:30
Arvind Tiwari
ed1f1451ce [] removed around the vm name 2017-10-15 00:41:31 +05:30
Arvind Tiwari
2cd1850f02 password reset email fix 2017-10-15 00:30:52 +05:30