PCoder
ce56463f30
Delete ungleich_page/migrations/0017_auto_20171222_1136.py
2017-12-22 22:35:07 +01:00
PCoder
c08a899413
Merge remote-tracking branch 'mainRepo/master' into task/3530/upgrade_to_django_1.11
2017-12-22 22:19:22 +01:00
Arvind Tiwari
8fad2ef09d
Merge pull request #542 from tiwariav/task/video_cover
...
video slider cms plugin
2017-12-23 02:18:31 +05:30
PCoder
9395e5bc1a
Use ungleich's fork of aldryn-newsblog
2017-12-22 20:32:05 +01:00
PCoder
183a35a105
Change SERVER_NAME from ungleich.com to ungleich.ch
2017-12-22 20:03:44 +01:00
PCoder
753f779e7e
Use ungleich's django-cms fork that has temporary fix for django-cms issue #6035
2017-12-22 19:14:31 +01:00
M.Ravi
bcf687d271
Use aldryn-newsblog module directly from master
...
The version available in pypi contains the bug https://github.com/aldryn/aldryn-newsblog/issues/440 and this has been fixed in master
2017-12-22 15:33:30 +01:00
M.Ravi
755baaf809
Add GOOGLE_ANALYTICS_PROPERTY_ID for dev2
2017-12-22 14:36:02 +01:00
M.Ravi
f7aff641c8
Add new ungleich_page migration created after update of djangocms_blog
...
Note: It adds cmsplugin_ptr fields to various plugins that we created for ungleich_page
2017-12-22 12:44:55 +01:00
M.Ravi
a067ee778f
Update djangocms-blog from 0.7.0 to 0.8.12
2017-12-22 12:15:05 +01:00
M.Ravi
7e7589defc
Remove olefile and update oca requirement
2017-12-22 11:14:23 +01:00
Arvind Tiwari
fc9b901f9a
translations added
2017-12-22 01:06:55 +05:30
Arvind Tiwari
48eacef8ef
typographical fixes
2017-12-22 00:59:53 +05:30
M.Ravi
eb6604e9ee
Remove conflicting migration ungleich_page/migrations/0016_auto_20171207_2054.py
2017-12-21 17:17:54 +01:00
M.Ravi
9eb85c8aff
Update psycopg2
2017-12-21 16:59:09 +01:00
M.Ravi
e0a432b3ad
Update requirements.txt
2017-12-21 16:38:53 +01:00
M.Ravi
17d95609c6
Merge master into task/3530/upgrade_to_django_1.11
2017-12-21 15:33:48 +01:00
Pcoder
02bb3305a1
Merge pull request #547 from ungleich/update_psycopg2
...
Update psycopg2 from 2.6.1 to 2.7.1
2017-12-21 00:10:19 +01:00
PCoder
9194e64cc6
Merge branch 'master' into update_psycopg2
2017-12-21 00:03:32 +01:00
PCoder
2308726aaa
Add DE translation for 404 page text
2017-12-20 23:44:30 +01:00
PCoder
39c4338b46
Update Changelog
2017-12-20 23:06:30 +01:00
Pcoder
5572a3199b
Merge pull request #544 from pcoder/task/3974/improve_invoice_number
...
Task/3974/improve invoice number
2017-12-20 23:02:44 +01:00
PCoder
4ee2ab8c45
Merge branch 'master' into task/3974/improve_invoice_number
2017-12-20 22:52:51 +01:00
Arvind Tiwari
88369d55a5
using new header slider
2017-12-20 02:53:26 +05:30
Arvind Tiwari
39d2697e30
merge master and fixed migration conflict
2017-12-20 01:36:38 +05:30
Arvind Tiwari
78ad99f757
fix migration
2017-12-20 01:05:40 +05:30
Arvind Tiwari
80e08c1b40
video cms plugin
2017-12-19 22:25:27 +05:30
Arvind Tiwari
66d1e4e046
padding fix for text
2017-12-19 19:53:06 +05:30
PCoder
f611e25538
Update psycopg2 from 2.6.1 to 2.7.1
...
psycopg2-2.6.1 was throwing this error while running automated tests:
Error: could not determine PostgreSQL version from '10.1'
2017-12-15 08:48:53 +01:00
Arvind Tiwari
955331f64b
carousel height changed to min height, other style fixes
2017-12-15 01:34:07 +05:30
Arvind Tiwari
f4fb2e5d13
Update Changelog
2017-12-13 23:42:17 +05:30
Arvind Tiwari
db408e5916
Merge pull request #543 from tiwariav/task/3972/ungleich_info_invoice_page
...
Task/3972/invoice page footer
2017-12-13 23:40:37 +05:30
PCoder
546d7fe5eb
Update Changelog
2017-12-12 21:31:13 +01:00
Pcoder
769d2df585
Merge pull request #546 from pcoder/task/3911/integrate_resend_activation_link
...
This PR proposes two minor changes.
1. Add "resend activation link" to landing payment page
2. Use target = _blank for the links, so that they open corresponding pages in a new window
2017-12-12 21:26:55 +01:00
PCoder
a339f65170
Correct _target to target and blank to _blank
2017-12-12 21:02:18 +01:00
PCoder
56962d5fdf
Use target=_blank for links in landing payment page
2017-12-12 20:58:07 +01:00
PCoder
54185792cf
Add resend activation link in the landing payment page
2017-12-12 20:48:47 +01:00
M.Ravi
88afdc1dd1
Removed unwanted logger debug msg
2017-12-12 16:49:50 +01:00
M.Ravi
24d85d5086
Check has_perm only for invoices
2017-12-12 15:43:25 +01:00
M.Ravi
091b277f7d
Correct call to has_perm
2017-12-12 12:42:40 +01:00
M.Ravi
57311eda73
Improve debug logs
2017-12-12 12:14:39 +01:00
PCoder
79b4b449d1
Add some logger messages
2017-12-12 09:53:19 +01:00
PCoder
beefeb62cb
Raise 404 for HostingOrder not belonging to user
2017-12-12 09:38:08 +01:00
PCoder
30a914d8ee
Update for getting form_class
2017-12-10 23:56:38 +01:00
Arvind Tiwari
8d64915d71
invoice footer added
2017-12-11 00:47:55 +05:30
PCoder
6c81ffbdda
Update Changelog for 1.2.13
2017-12-09 18:54:28 +01:00
PCoder
2fcb96b209
Remove <p> tag for ungleich cms customer item template
2017-12-09 18:30:39 +01:00
PCoder
8fac9758b1
Update Changelog
2017-12-09 17:28:39 +01:00
Pcoder
8f89363126
Merge pull request #541 from pcoder/ungleich_cms_update_background_slider
...
Ungleich cms update background slider
2017-12-09 17:22:04 +01:00
PCoder
180539df9a
Update Changelog for 1.2.12
2017-12-09 16:37:10 +01:00
