Commit graph

3463 commits

Author SHA1 Message Date
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
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
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
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
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
PCoder
2628312bb9 Fix a bug and update delete vm email subject 2017-12-20 22:26:36 +01:00
PCoder
77002a1c9e Revert back celery task for delete_vm. Better to do it in another PR. 2017-12-20 21:32:10 +01:00
PCoder
0634a1a41f Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-20 21:28:55 +01:00
PCoder
f61abf44c8 Remove unused import 2017-12-20 21:28:07 +01:00
PCoder
96de92d312 Reorganize code 2017-12-20 20:59:46 +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
7d683e1257 Move Stripe subscription cancelation before deleting vm 2017-12-17 20:20:42 +01:00
PCoder
78fa06aa94 Log exception details 2017-12-17 19:35:38 +01:00
PCoder
8356c3bf95 Refactor some code 2017-12-17 19:27:45 +01:00
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