PCoder
|
4069199252
|
Merge branch 'master' into task/3530/upgrade_to_django_1.11
|
2017-12-24 20:19:05 +01:00 |
|
PCoder
|
fe6bd2a807
|
Update Changelog
|
2017-12-24 19:37:29 +01:00 |
|
Pcoder
|
ed6e39d955
|
Merge pull request #552 from pcoder/bug/3993/dg_new_user_membership_payment
Set cardholder_name field for UserBillingAddressForm
|
2017-12-24 19:33:12 +01:00 |
|
PCoder
|
10bc05f700
|
User customer's name instead of email for cardholder_name if not provided
|
2017-12-23 23:07:53 +01:00 |
|
PCoder
|
1f85273fd0
|
Set cardholder_name field for UserBillingAddressForm in digital glarus membership payment post
|
2017-12-23 22:59:16 +01:00 |
|
PCoder
|
5662cc44c8
|
Update Changelog
|
2017-12-23 18:19:10 +01:00 |
|
Pcoder
|
a7bd6560d1
|
Merge pull request #550 from pcoder/task/3973/change_dcl_contact_info
Update datacenterlight and glasfaser contact address
|
2017-12-23 18:15:38 +01:00 |
|
PCoder
|
959e624de8
|
Fix opening for p tag
|
2017-12-23 18:08:57 +01:00 |
|
PCoder
|
94b1051e85
|
Update glasfaser contact address too
|
2017-12-23 18:06:37 +01:00 |
|
PCoder
|
815b5392ac
|
Merge branch 'master' into task/3973/change_dcl_contact_info
|
2017-12-23 07:38:28 +01:00 |
|
PCoder
|
9df6bd354d
|
Update Changelog
|
2017-12-23 07:12:07 +01:00 |
|
Pcoder
|
f7f8a1e1d7
|
Merge pull request #548 from pcoder/task/3601/reduce_min_ram_to_1G
Change minimum required RAM from 2GB to 1GB
|
2017-12-23 07:07:07 +01:00 |
|
PCoder
|
a753c8d582
|
Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G
|
2017-12-23 06:59:31 +01:00 |
|
Arvind Tiwari
|
f013ac3db4
|
Update Changelog
|
2017-12-23 05:38:24 +05:30 |
|
Arvind Tiwari
|
41a45f32bb
|
Merge pull request #551 from tiwariav/bugfix/ungleich_landing
bugfix/punctuation fix
|
2017-12-23 05:28:50 +05:30 |
|
Arvind Tiwari
|
810a540d08
|
punctuation fix
|
2017-12-23 05:22:21 +05:30 |
|
PCoder
|
4870649e93
|
Update datacenterlight contact address
|
2017-12-23 00:49:50 +01:00 |
|
Arvind Tiwari
|
6ea012571a
|
reduce section padding
|
2017-12-23 04:56:45 +05:30 |
|
PCoder
|
b91260bf26
|
Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G
|
2017-12-23 00:16:05 +01:00 |
|
Arvind Tiwari
|
f26f43e391
|
Merge pull request #549 from tiwariav/bugfix/ungleich_landing
bugfix/text fix for ungleich landing page
|
2017-12-23 04:44:01 +05:30 |
|
PCoder
|
6c017d1581
|
Remove commented translation
|
2017-12-22 23:59:51 +01:00 |
|
Arvind Tiwari
|
4c73dddb6d
|
text fix for landing
|
2017-12-23 04:29:31 +05:30 |
|
PCoder
|
57c5255708
|
Update translation in DE : 200 to 2000
|
2017-12-22 23:37:49 +01:00 |
|
PCoder
|
3a558c86a6
|
Merge branch 'master' into task/3601/reduce_min_ram_to_1G
|
2017-12-22 23:27:32 +01:00 |
|
PCoder
|
3e48b936f4
|
Update Changelog
|
2017-12-22 23:03:58 +01:00 |
|
Pcoder
|
bbd02687c9
|
Merge pull request #511 from pcoder/task/3774/update_stripe_subscription_on_vm_delete
Task/3774/update stripe subscription on vm delete
|
2017-12-22 22:46:02 +01:00 |
|
PCoder
|
88f504511b
|
Add ungleich_page/migrations/0018_auto_20171222_2134.py
|
2017-12-22 22:36:17 +01:00 |
|
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 |
|
PCoder
|
485a7e1897
|
Merge mainRepo/master into task/3601/reduce_min_ram_to_1G
|
2017-12-22 22:10:08 +01:00 |
|
PCoder
|
a0774ca0d4
|
Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-22 22:06:38 +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
|
3852ce04de
|
Set default RAM value to 2G in landing and hosting VM calculators
|
2017-12-21 08:41:29 +01:00 |
|
PCoder
|
979a62f120
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-21 02:04:17 +01:00 |
|
PCoder
|
4dff4e07cb
|
Change minimum required RAM from 2GB to 1GB
|
2017-12-21 01:25:52 +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 |
|