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
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
b4e26ac51f
Add delete_vm_task (wip)
2017-12-12 23:56:39 +01:00
PCoder
a04aa8542d
Add some logger debug messages
2017-12-12 22:55:30 +01:00
PCoder
ef202833b2
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
2017-12-12 21:40:53 +01:00
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
PCoder
1306dbe46a
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
2017-12-12 20:23:25 +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
