Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• eb067f5708 Refactor code and log messages for possible errors PCoder 2017-12-24 14:38:32 +01:00
• 29c24574aa Cancel subscription on membership deactivation + some more reorganizes + import logger PCoder 2017-12-24 14:25:04 +01:00
• 707e1897b3 Reorganize imports PCoder 2017-12-24 14:23:33 +01:00
• 63215b1c42 Organize imports PCoder 2017-12-24 13:35:53 +01:00
• b19c3bdcde Reformat code PCoder 2017-12-24 13:15:48 +01:00
• b4421bc9b2 Reformat code PCoder 2017-12-24 13:06:23 +01:00
• f6d0b6ce9c Add stripe_subscription_id to MembershipOrder data PCoder 2017-12-24 12:54:59 +01:00
• 3ed6119dc9 Check if DG subscription created was under trial; if not show error PCoder 2017-12-24 12:53:23 +01:00
• f5170cce5f Call DG subscribe_customer_to_plan with trial period until first of next month PCoder 2017-12-24 12:51:16 +01:00
• 3826ca207a Reformat code PCoder 2017-12-24 12:48:03 +01:00
• 11b8ebe401 Import time PCoder 2017-12-24 12:46:36 +01:00
• 0091281357 Add next_month_in_sec_since_epoch MembershipType function PCoder 2017-12-24 12:45:59 +01:00
• 6fa8dbb5cb Add trial_end parameter to subscribe_customer_to_plan PCoder 2017-12-24 12:32:08 +01:00
• b2d0fd45ad Fix PEP8 error PCoder 2017-12-24 00:21:25 +01:00
• 872582f45f Add tentative code to subscribe customer to Stripe plan (wip) PCoder 2017-12-24 00:08:17 +01:00
• f226c551a8 Add stripe_subscription_id field to MembershipOrder PCoder 2017-12-24 00:06:21 +01:00
• 10bc05f700 User customer's name instead of email for cardholder_name if not provided PCoder 2017-12-23 23:07:53 +01:00
• 1f85273fd0 Set cardholder_name field for UserBillingAddressForm in digital glarus membership payment post PCoder 2017-12-23 22:59:16 +01:00
• 5662cc44c8 Update Changelog PCoder 2017-12-23 18:19:10 +01:00
• a7bd6560d1
  Merge pull request #550 from pcoder/task/3973/change_dcl_contact_info Pcoder 2017-12-23 18:15:38 +01:00
• 959e624de8 Fix opening for p tag PCoder 2017-12-23 18:08:57 +01:00
• 94b1051e85 Update glasfaser contact address too PCoder 2017-12-23 18:06:37 +01:00
• 815b5392ac Merge branch 'master' into task/3973/change_dcl_contact_info PCoder 2017-12-23 07:38:28 +01:00
• 9df6bd354d Update Changelog PCoder 2017-12-23 07:12:07 +01:00
• f7f8a1e1d7
  Merge pull request #548 from pcoder/task/3601/reduce_min_ram_to_1G Pcoder 2017-12-23 07:07:07 +01:00
• a753c8d582 Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G PCoder 2017-12-23 06:59:31 +01:00
• f013ac3db4
  Update Changelog Arvind Tiwari 2017-12-23 05:38:24 +05:30
• 41a45f32bb
  Merge pull request #551 from tiwariav/bugfix/ungleich_landing Arvind Tiwari 2017-12-23 05:28:50 +05:30
• 810a540d08 punctuation fix Arvind Tiwari 2017-12-23 05:22:21 +05:30
• 4870649e93 Update datacenterlight contact address PCoder 2017-12-23 00:49:50 +01:00
• 6ea012571a
  reduce section padding Arvind Tiwari 2017-12-23 04:56:45 +05:30
• b91260bf26 Merge remote-tracking branch 'mainRepo/master' into task/3601/reduce_min_ram_to_1G PCoder 2017-12-23 00:16:05 +01:00
• f26f43e391
  Merge pull request #549 from tiwariav/bugfix/ungleich_landing Arvind Tiwari 2017-12-23 04:44:01 +05:30
• 6c017d1581 Remove commented translation PCoder 2017-12-22 23:59:51 +01:00
• 4c73dddb6d text fix for landing Arvind Tiwari 2017-12-23 04:29:31 +05:30
• 57c5255708 Update translation in DE : 200 to 2000 PCoder 2017-12-22 23:37:49 +01:00
• 3a558c86a6 Merge branch 'master' into task/3601/reduce_min_ram_to_1G PCoder 2017-12-22 23:27:32 +01:00
• 3e48b936f4 Update Changelog PCoder 2017-12-22 23:03:58 +01:00
• bbd02687c9
  Merge pull request #511 from pcoder/task/3774/update_stripe_subscription_on_vm_delete Pcoder 2017-12-22 22:46:02 +01:00
• 485a7e1897 Merge mainRepo/master into task/3601/reduce_min_ram_to_1G PCoder 2017-12-22 22:10:08 +01:00
• a0774ca0d4 Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete PCoder 2017-12-22 22:06:38 +01:00
• 8fad2ef09d
  Merge pull request #542 from tiwariav/task/video_cover Arvind Tiwari 2017-12-23 02:18:31 +05:30
• fc9b901f9a translations added Arvind Tiwari 2017-12-22 01:06:55 +05:30
• 48eacef8ef typographical fixes Arvind Tiwari 2017-12-22 00:59:53 +05:30
• 3852ce04de Set default RAM value to 2G in landing and hosting VM calculators PCoder 2017-12-21 08:41:26 +01:00
• 979a62f120 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete PCoder 2017-12-21 02:04:17 +01:00
• 4dff4e07cb Change minimum required RAM from 2GB to 1GB PCoder 2017-12-21 01:25:52 +01:00
• 02bb3305a1
  Merge pull request #547 from ungleich/update_psycopg2 Pcoder 2017-12-21 00:10:19 +01:00
• 9194e64cc6 Merge branch 'master' into update_psycopg2 PCoder 2017-12-21 00:03:32 +01:00
• 2308726aaa Add DE translation for 404 page text PCoder 2017-12-20 23:44:30 +01:00
• 39c4338b46 Update Changelog PCoder 2017-12-20 23:06:30 +01:00
• 5572a3199b
  Merge pull request #544 from pcoder/task/3974/improve_invoice_number Pcoder 2017-12-20 23:02:44 +01:00
• 4ee2ab8c45 Merge branch 'master' into task/3974/improve_invoice_number PCoder 2017-12-20 22:52:51 +01:00
• 2628312bb9 Fix a bug and update delete vm email subject PCoder 2017-12-20 22:26:36 +01:00
• 77002a1c9e Revert back celery task for delete_vm. Better to do it in another PR. PCoder 2017-12-20 21:32:02 +01:00
• 0634a1a41f Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete PCoder 2017-12-20 21:28:55 +01:00
• f61abf44c8 Remove unused import PCoder 2017-12-20 21:28:07 +01:00
• 96de92d312 Reorganize code PCoder 2017-12-20 20:59:46 +01:00
• 88369d55a5 using new header slider Arvind Tiwari 2017-12-20 02:53:26 +05:30
• 39d2697e30 merge master and fixed migration conflict Arvind Tiwari 2017-12-20 01:36:38 +05:30
• 78ad99f757 fix migration Arvind Tiwari 2017-12-20 01:05:40 +05:30
• 80e08c1b40 video cms plugin Arvind Tiwari 2017-12-19 22:25:27 +05:30
• 66d1e4e046 padding fix for text Arvind Tiwari 2017-12-19 19:53:06 +05:30
• 7d683e1257 Move Stripe subscription cancelation before deleting vm PCoder 2017-12-17 20:20:42 +01:00
• 78fa06aa94 Log exception details PCoder 2017-12-17 19:35:38 +01:00
• 8356c3bf95 Refactor some code PCoder 2017-12-17 19:27:45 +01:00
• f611e25538 Update psycopg2 from 2.6.1 to 2.7.1 PCoder 2017-12-15 08:46:49 +01:00
• 955331f64b carousel height changed to min height, other style fixes Arvind Tiwari 2017-12-15 01:34:07 +05:30
• f4fb2e5d13
  Update Changelog Arvind Tiwari 2017-12-13 23:42:17 +05:30
• db408e5916
  Merge pull request #543 from tiwariav/task/3972/ungleich_info_invoice_page Arvind Tiwari 2017-12-13 23:40:37 +05:30
• b4e26ac51f Add delete_vm_task (wip) PCoder 2017-12-12 23:56:39 +01:00
• a04aa8542d Add some logger debug messages PCoder 2017-12-12 22:55:30 +01:00
• ef202833b2 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete PCoder 2017-12-12 21:40:53 +01:00
• 546d7fe5eb Update Changelog PCoder 2017-12-12 21:31:13 +01:00
• 769d2df585
  Merge pull request #546 from pcoder/task/3911/integrate_resend_activation_link Pcoder 2017-12-12 21:26:55 +01:00
• a339f65170 Correct _target to target and blank to _blank PCoder 2017-12-12 21:02:18 +01:00
• 56962d5fdf Use target=_blank for links in landing payment page PCoder 2017-12-12 20:58:02 +01:00
• 54185792cf Add resend activation link in the landing payment page PCoder 2017-12-12 20:48:47 +01:00
• 1306dbe46a Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete PCoder 2017-12-12 20:23:25 +01:00
• 88afdc1dd1 Removed unwanted logger debug msg M.Ravi 2017-12-12 16:49:50 +01:00
• 24d85d5086 Check has_perm only for invoices M.Ravi 2017-12-12 15:43:25 +01:00
• 091b277f7d Correct call to has_perm M.Ravi 2017-12-12 12:42:40 +01:00
• 57311eda73 Improve debug logs M.Ravi 2017-12-12 12:14:39 +01:00
• 79b4b449d1 Add some logger messages PCoder 2017-12-12 09:53:14 +01:00
• beefeb62cb Raise 404 for HostingOrder not belonging to user PCoder 2017-12-12 09:38:08 +01:00
• 8d64915d71 invoice footer added Arvind Tiwari 2017-12-11 00:47:55 +05:30
• 6c81ffbdda Update Changelog for 1.2.13 1.2.13 PCoder 2017-12-09 18:54:28 +01:00
• 2fcb96b209 Remove <p> tag for ungleich cms customer item template PCoder 2017-12-09 18:30:39 +01:00
• 8fac9758b1 Update Changelog PCoder 2017-12-09 17:28:32 +01:00
• 8f89363126
  Merge pull request #541 from pcoder/ungleich_cms_update_background_slider Pcoder 2017-12-09 17:22:04 +01:00
• 180539df9a Update Changelog for 1.2.12 1.2.12 PCoder 2017-12-09 16:37:10 +01:00
• ef7352a891 Add width: 100% to #portfolio .portfolio-item .portfolio-caption PCoder 2017-12-09 16:31:34 +01:00
• 4fd3be2776 Update Changelog PCoder 2017-12-09 07:21:35 +01:00
• 6515195af5 digitalglarus logo alignment fix Arvind Tiwari 2017-12-09 05:19:07 +05:30
• b9f232ac0a unlgiech logo alignment fix Arvind Tiwari 2017-12-09 05:17:27 +05:30
• 2747460184 auto slide carousel Arvind Tiwari 2017-12-09 05:03:46 +05:30
• 288416ede9 header text background options Arvind Tiwari 2017-12-09 04:37:37 +05:30
• 8af5e2d0af overlay Arvind Tiwari 2017-12-08 03:26:11 +05:30
• 207064ed64 text shadow added Arvind Tiwari 2017-12-08 03:19:20 +05:30
• d723e4b1e4 video for 3rd slide Arvind Tiwari 2017-12-08 02:03:33 +05:30