Commit graph

4346 commits

Author SHA1 Message Date
PCoder
85b251d2e6 Check if the template VM serializer object has template attr 2019-04-09 07:40:06 +02:00
PCoder
9f58fdd456 Wrong multiplication to string instead of number 2019-04-09 00:26:59 +02:00
PCoder
316496b969 More fix for vcpu 2019-04-09 00:22:39 +02:00
PCoder
78738e8175 Change cores to SerializerMethodField and obtain it from cpu 2019-04-09 00:16:28 +02:00
PCoder
46c3bb1ce4 Update Changelog for 2.4.10 2019-02-14 20:56:12 +01:00
437dfb1ce2 Merge branch 'task/6451/change_phone_number' into 'master'
Change phone numbers on DG, gdpr and others

See merge request ungleich-public/dynamicweb!688
2019-02-14 20:49:16 +01:00
PCoder
a00c4a1e44 Change phone numbers on DG, gdpr and others
(044) 534-66-22 -> +41 55 505 6266
2019-02-14 20:33:31 +01:00
PCoder
52deeb1180 Update Changelog for 2.4.9 2019-02-01 23:34:53 +01:00
cc0eb9a741 Merge branch 'fix_blog_gdpr_styles' into 'master'
Fix blog gdpr styles

See merge request ungleich-public/dynamicweb!687
2019-02-01 23:28:53 +01:00
PCoder
93a86a3c48 Add GDPR banner to digitalglarus 2019-02-01 09:04:18 +01:00
PCoder
3f4a209661 Apply style to paragraph 2019-02-01 08:58:17 +01:00
PCoder
a44ff74dc6 Override default styles 2019-02-01 08:53:48 +01:00
PCoder
6421552673 Change modal button style 2019-02-01 08:42:45 +01:00
PCoder
dbe362e22b Add paragraph styling 2019-02-01 08:31:57 +01:00
PCoder
9f7ccd7170 Modify modal button styles 2019-02-01 08:29:20 +01:00
PCoder
6164b80e3d ++ styles 2019-02-01 08:24:14 +01:00
PCoder
205dde453a More style fixes 2019-02-01 08:19:07 +01:00
PCoder
bb2f3e6a6f Fix translation error 2019-02-01 00:59:54 +01:00
PCoder
5c4af17b45 Change translations 2019-02-01 00:57:20 +01:00
PCoder
9277208b16 More styles 2019-02-01 00:48:52 +01:00
PCoder
596bddb323 Add styles by Sanghee 2019-01-31 23:23:51 +01:00
PCoder
8ec32e4a5e Add missing styles 2019-01-31 22:58:23 +01:00
PCoder
2ae3e695e8 Add styles 2019-01-31 22:43:56 +01:00
PCoder
541b08584c Update Changelog for 2.4.8 2019-01-31 21:24:36 +01:00
PCoder
842766d0e2 Merge branch 'sanghee/dynamicweb-task/6059' 2019-01-31 21:21:49 +01:00
PCoder
f730f4c00d Update Changelog 2019-01-31 21:14:31 +01:00
PCoder
681b1a1d93 Remove some more 2019-01-30 23:08:43 +01:00
PCoder
4c77678a36 Remove unnecessary brs from DE translation 2019-01-30 23:04:08 +01:00
PCoder
10137d8675 Fix button letter spacing style 2019-01-30 22:16:07 +01:00
PCoder
13a606aac0 Add translation for 'accept' and fix styles 2019-01-30 22:11:16 +01:00
PCoder
c1ecef9b76 GDPR: Add/update DE translations 2019-01-30 22:03:23 +01:00
PCoder
e2c8ab084f Change chief information officer name, email
Malcolm -> Sanghee
2019-01-30 22:02:12 +01:00
PCoder
2d4d174c24 Apply letter-spacing to gdpr text and translate 2019-01-30 22:01:18 +01:00
PCoder
16b5f1e5a4 Merge branch 'master' into 5151/gdpr_modal 2019-01-30 21:05:34 +01:00
PCoder
9a6351ddbe Update Changelog for 2.4.7 2019-01-30 20:49:31 +01:00
PCoder
3f15675977 Merge branch 'master' into aatish/dynamicweb-6213_alignment_fixes 2019-01-30 20:08:33 +01:00
PCoder
ef0e3b76fa Update Changelog for 2.4.6 2019-01-09 22:32:15 +01:00
42f01b37d8 Merge branch 'task/6261/add_mobile_black_logo' into 'master'
6261: Add mobile black logo

See merge request ungleich-public/dynamicweb!685
2019-01-09 22:26:20 +01:00
PCoder
b027093efd Add mobile black logo 2019-01-09 21:31:39 +01:00
PCoder
6cd1e53ea2 Update Changelog for 2.4.5 2019-01-07 22:42:44 +01:00
17a0f1b841 Merge branch '4465/fix-missing-language-option' into 'master'
4465/fix missing language option

See merge request ungleich-public/dynamicweb!684
2019-01-07 22:35:36 +01:00
PCoder
27f58e4296 Revert back blog feed url 2019-01-07 22:33:03 +01:00
PCoder
d80b6cf490 Introduce UNGLEICH_BLOG_SITE_ID
- It should be initialized with the SITE_ID of the site that
hosts the blog
- Without this, django_parler is unhappy to show EN/DE options
when creating blog articles

See redmine issue #4465
2019-01-07 22:30:55 +01:00
PCoder
087e03315d Use correct blog config for RSS url
ungleich-blog -> blog app created for ungleich.ch
blog -> blog app created for blog.ungleich.ch
2019-01-03 08:15:37 +01:00
PCoder
f2f549a498 [blog] Create blog config for ungleich.ch and change RSS URL accordingly 2019-01-02 20:19:38 +01:00
PCoder
260aba5a13 Update Changelog for 2.4.3 2018-12-25 13:58:41 +01:00
ba7d246ace Merge branch 'task/6260/fix-mobile-view-issues' into 'master'
#6260: Add viewport and other missing meta tags in blog template

See merge request ungleich-public/dynamicweb!683
2018-12-25 13:51:57 +01:00
PCoder
c7acb59f0d Add viewport and other missing meta tags 2018-12-25 13:44:52 +01:00
PCoder
c6d6def06a Update Changelog for 2.4.2 2018-12-23 17:15:02 +01:00
PCoder
0ac2d1ff3f Update djangcocms-blog version (0.7.0 -> 0.9.0) 2018-12-23 14:31:55 +01:00