moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4460 commits 11 branches 113 tags 314 MiB
Commit graph

4460 commits

This branch
This branch
All branches
Author SHA1 Message Date
PCoder
ef0e3b76fa Update Changelog for 2.4.6 2019-01-09 22:32:15 +01:00
Mondi Ravi
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
Mondi Ravi
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
Mondi Ravi
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
Aatish Neupane
ddb9c5d901 add equalizer for images on product plugin, allow animate option to be dynamically set 2018-12-09 21:21:41 +05:45
sanghee
df368c715f changed topnav font into 400 by default 2018-11-13 21:21:46 +01:00
Nico Schottelius
66538f7335 Merge branch 'master' into 'master' 
Task #6038: Change datacenterlight.ch message form to send email to support@ungleich.ch

See merge request ungleich-public/dynamicweb!679
 2018-11-11 18:49:55 +01:00
Aatish Neupane
1bfb710ee6 Change datacenterlight.ch message form to send email to support@ungleich.ch 2018-11-11 17:01:19 +01:00
PCoder
66d21e0e9d Add missing sites in DE translation 2018-10-25 23:52:30 +02:00
PCoder
6fb157b40d Fix errors in DE text 2018-10-25 23:45:23 +02:00
PCoder
7eb532a7df Add DE translations 2018-10-25 23:22:35 +02:00
PCoder
f6a7659756 Replace some special chars 2018-10-25 23:20:17 +02:00
PCoder
58fe28f334 Add privacy policy text EN 2018-10-25 23:11:09 +02:00
PCoder
61206d4998 Load i18n module 2018-10-25 23:10:35 +02:00
PCoder
1feacc1770 Merge branch 'master' into 5151/gdpr_modal 2018-10-25 22:05:24 +02:00
PCoder
2c674572c9 Update Changelog 2018-10-22 23:25:05 +02:00
Mondi Ravi
b1a4ba6f0e Merge branch 'bugfix/use-correct-django-multisite-version' into 'master' 
Use correct django-multisite version

See merge request ungleich-public/dynamicweb!676
 2018-10-22 23:13:00 +02:00
PCoder
e9cb303b09 Use correct django-multisite version 
We had multiple versions of django-multisite in the
requirements.txt. This commit removes the wrong version that
caused server not to start with an error

File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in get_current
  65.             return self._get_site_by_id(site_id)

File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in _get_site_by_id
  37.         return SITE_CACHE[site_id]

File "/usr/local/lib/python3.5/site-packages/multisite/hacks.py" in __getitem__
  124.             raise KeyError(key)
 2018-10-22 22:39:22 +02:00
PCoder
bdf9f53648 Update Changelog for 2.4.1 2018-10-18 09:21:16 +02:00
Pcoder
8d6f2ed4ae
Merge pull request #674 from pcoder/bugfix/update-pycryptodome 
Update pycryptodome
 2018-10-18 09:15:14 +02:00
PCoder
062e81408d Update pycryptodome 
From 3.4 to 3.6.6
 2018-10-18 09:03:08 +02:00
PCoder
3a489f5be0 Update Changelog for 2.4 2018-10-18 07:44:07 +02:00
Pcoder
961bf2e46f
Merge pull request #672 from pcoder/task/5681/offer-512mb-ram 
Allow admin to lower the minimum RAM for a calculator instance to 512 MB
 2018-10-18 07:21:40 +02:00
PCoder
c36554b4d1 Round total_price also to 2 decimal places 2018-10-18 06:58:18 +02:00
PCoder
270c610111 Correct the min value of RAM 
Based on what is set by the admin in the backend
 2018-10-17 09:56:42 +02:00
PCoder
3ebf932422 Adjust hosting calculator form validation 
For 512 MB RAM offer
 2018-10-17 09:29:08 +02:00
PCoder
814163e58e Add minRAM js code for hosting also 2018-10-17 09:11:37 +02:00
PCoder
0d767e74a9 Merge branch 'master' into task/5681/offer-512mb-ram 2018-10-17 07:57:07 +02:00
PCoder
5a52ae1a1d Update Changelog for 2.3.1 2018-10-17 07:47:34 +02:00
Pcoder
6612a7debd
Merge pull request #673 from pcoder/bugfix/show_correct_vat 
Round VAT percent to 2 decimal places
 2018-10-17 07:40:22 +02:00
PCoder
8929a26714 Round VAT percent to 2 decimal places 2018-10-17 07:27:28 +02:00
PCoder
0e9f8ce906 Cleanup unnecessary code 2018-10-16 09:01:00 +02:00
PCoder
b7cc7b08ce Update calculator min RAM input js validation 2018-10-16 08:58:12 +02:00
PCoder
26970ece92 Set default RAM step to 1 
We later change this according to minRam set in the backend
 2018-10-16 08:55:08 +02:00
PCoder
42d6f38f0c Merge branch 'master' into task/5681/offer-512mb-ram 2018-10-08 07:56:57 +02:00
PCoder
27ee5ca5ac Update Changelog for 2.3 2018-10-08 07:28:04 +02:00
Pcoder
733fb9fc43
Merge pull request #670 from pcoder/task/5690/redirect-on-payment-error 
Task/5690/redirect on payment error
 2018-10-06 07:59:40 +02:00
PCoder
5770c231ee Fix flake8 warnings 2018-10-06 07:47:40 +02:00
PCoder
5985ded36f Obtain product_slug from session 
Obtaining slug from kwargs won't work in OrderConfirmation page
because we do not set the kwargs for that page. To resolve this,
I add the product_slug to the generic_payment_details dict in the
session
 2018-10-06 07:31:41 +02:00
PCoder
2b7d4bbef5 Redirect to product page on error 2018-10-05 11:10:10 +02:00