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

• 564f47cf8a Handle login and billing address forms together in PaymentOrderView M.Ravi 2017-10-08 13:50:43 +02:00
• 6cdca621b2 original pattern.jpg added Arvind Tiwari 2017-10-07 23:35:13 +05:30
• 25e3980b20 pattern.jpg compressed Arvind Tiwari 2017-10-07 23:33:08 +05:30
• c400fdb02e width adjusted Arvind Tiwari 2017-10-07 23:17:57 +05:30
• 2dd2945ee9 wider auth box Arvind Tiwari 2017-10-07 17:51:18 +05:30
• d0003ce9f3 style fixes Arvind Tiwari 2017-10-07 17:35:10 +05:30
• f3832c1db9 content-dashboard removed for unregistered pages Arvind Tiwari 2017-10-07 17:06:55 +05:30
• 02d144fbf9 Add form name and error fields to payment login form M.Ravi 2017-10-07 12:59:40 +02:00
• 1dc374e09d footer links color changed Arvind Tiwari 2017-10-07 16:23:04 +05:30
• 7d7b8661ea translations Arvind Tiwari 2017-10-07 16:19:53 +05:30
• 769396d95e login pages restyled and footer included Arvind Tiwari 2017-10-07 14:38:48 +05:30
• 88781e992c 24 hr fix Arvind Tiwari 2017-10-06 04:20:38 +05:30
• d3d57ade37 formats fixed Arvind Tiwari 2017-10-06 04:16:58 +05:30
• 8e5654bdb5 date time converted to locale Arvind Tiwari 2017-10-06 04:11:40 +05:30
• 4dbf08f995 Merge branch 'master' into task/3828/invoice_period Arvind Tiwari 2017-10-06 02:39:07 +05:30
• 05b7b43064 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-10-06 02:06:03 +05:30
• cc2e08aff5 translations Arvind Tiwari 2017-10-06 02:02:22 +05:30
• ba8eaa2937 new card details option added Arvind Tiwari 2017-10-06 01:59:18 +05:30
• bd3c59eb3e card_input template Arvind Tiwari 2017-10-06 01:17:50 +05:30
• 6536991209 list all cards, card_input template Arvind Tiwari 2017-10-06 01:17:35 +05:30
• 5e8b34d39c Update hosting favicon to dcl favicon Arvind Tiwari 2017-10-06 01:02:14 +05:30
• f0be6d6d7f Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete M.Ravi 2017-10-04 19:32:02 +02:00
• e8625d7602 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-10-04 22:55:25 +05:30
• fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text Arvind Tiwari 2017-10-04 01:00:03 +05:30
• 242f4edf8c Merge pull request #513 from tiwariav/bugfix/stripe_customer_id Arvind Tiwari 2017-10-04 00:05:27 +05:30
• 1990c4758e merged master Arvind Tiwari 2017-10-03 23:49:26 +05:30
• e7545247c9 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-10-03 23:46:43 +05:30
• 7362a2f14e Update Changelog Arvind Tiwari 2017-10-03 23:43:30 +05:30
• 0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon Arvind Tiwari 2017-10-03 23:42:57 +05:30
• 4c8be518a9 Update Changelog Arvind Tiwari 2017-10-03 23:42:15 +05:30
• 618a82fc66 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-10-03 21:51:28 +05:30
• 7e380267b7 Update payment.css Arvind Tiwari 2017-10-03 21:49:51 +05:30
• eb7b1a4ea0 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2017-10-03 21:46:23 +05:30
• 96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input Arvind Tiwari 2017-10-03 21:39:44 +05:30
• c410e2cbc5 stripe_customer_id retrieved from request.user relation Arvind Tiwari 2017-10-03 21:35:08 +05:30
• bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page Arvind Tiwari 2017-10-03 21:31:27 +05:30
• 315ce92a78 post request attributes changed Arvind Tiwari 2017-10-03 21:24:35 +05:30
• 0263964705 stripe_id used instead of id Arvind Tiwari 2017-10-03 21:04:25 +05:30
• 6802e2fdbc merged master Arvind Tiwari 2017-10-03 18:54:47 +05:30
• 734a41a371 merged master Arvind Tiwari 2017-10-03 18:42:00 +05:30
• 2e34d404ea translation Arvind Tiwari 2017-10-03 18:25:32 +05:30
• e4837b063c alignment fix Arvind Tiwari 2017-10-03 18:18:18 +05:30
• 777aab7115 Add cancel subscription code on VM cancel M.Ravi 2017-10-03 13:07:41 +02:00
• f044b83b8f Add Stripe unsubscribe_customer method M.Ravi 2017-10-03 13:06:26 +02:00
• 65745b5098 Update Changelog for 1.2.4 1.2.4 M.Ravi 2017-10-03 00:36:49 +02:00
• a79efa4db6 Update Changelog M.Ravi 2017-10-03 00:27:05 +02:00
• 60b233f082 Fix flake8 warnings M.Ravi 2017-10-03 00:26:50 +02:00
• c63e3cb0ff Update Changelog M.Ravi 2017-10-02 23:43:25 +02:00
• 97ed965b8b Merge pull request #510 from ungleich/tiwariav-task/3808/dcl_order_confirm Pcoder 2017-10-02 23:39:58 +02:00
• 44b5d9bb3a hosting order: Add price to vm context M.Ravi 2017-10-02 23:17:37 +02:00
• e2188cc166 Added some skipIf conditions M.Ravi 2017-10-02 17:19:51 +02:00
• b848841337 Add logger error messages for Stripe errors M.Ravi 2017-10-02 01:35:28 +02:00
• 42224a5d38 Add missing form ids M.Ravi 2017-10-02 01:34:32 +02:00
• a605901850 Update datacenterlight django.po M.Ravi 2017-10-02 00:15:13 +02:00
• 7680e5aa25 Update hosting django.po M.Ravi 2017-10-02 00:13:28 +02:00
• 22af001489 Merge upstream master M.Ravi 2017-10-02 00:09:38 +02:00
• 7aa50dcfa7 Update Changelog M.Ravi 2017-10-01 23:31:26 +02:00
• 350a52c657 Merge pull request #506 from ungleich/bugfix/stripe_error Pcoder 2017-10-01 23:24:06 +02:00
• 68cbfdd393 Update translation and fix loginmixin required for dashboard view M.Ravi 2017-10-01 23:06:51 +02:00
• cf45a9ac75 Add messages to some hosting templates M.Ravi 2017-10-01 20:39:40 +02:00
• 06b1ce9e72 Update error message M.Ravi 2017-10-01 20:32:51 +02:00
• 167eaf2a0c Add forbidden_view method adds the message and redirects to the same path M.Ravi 2017-10-01 20:17:03 +02:00
• 9e8d930a3b Refactor messages to includes/_messages.html M.Ravi 2017-10-01 20:16:05 +02:00
• 3a33dd2035 Add CSRF_FAILURE_VIEW M.Ravi 2017-10-01 20:14:46 +02:00
• df93dfe047 day set to one before Arvind Tiwari 2017-09-30 18:10:34 +05:30
• 1f09bab3e4 minimum month diff set to 1 Arvind Tiwari 2017-09-30 18:08:02 +05:30
• 3701899304 timezone aware Arvind Tiwari 2017-09-30 18:06:50 +05:30
• f1790445cd timezone aware Arvind Tiwari 2017-09-30 18:05:02 +05:30
• bd91883369 end_date added Arvind Tiwari 2017-09-30 17:55:49 +05:30
• 1fb7511292 favicon link changed Arvind Tiwari 2017-09-30 17:08:40 +05:30
• c6173ed2e6 lead text added Arvind Tiwari 2017-09-30 16:53:44 +05:30
• 6ef8a03de7 Respond with JSON M.Ravi 2017-09-30 01:02:59 +02:00
• 4334dfaa44 Update utils django.po M.Ravi 2017-09-29 22:36:38 +02:00
• 43e6fc45e2 Add de translations M.Ravi 2017-09-29 22:19:26 +02:00
• b04f9ea1ec Update hosting django.po M.Ravi 2017-09-29 22:12:02 +02:00
• 00341e014c Update hosting django.po M.Ravi 2017-09-29 22:02:53 +02:00
• 4bf73db14f Update datacenterlight django.po M.Ravi 2017-09-29 22:01:28 +02:00
• 5bbfb54b79 Revert back to simple error message M.Ravi 2017-09-29 21:54:31 +02:00
• 1dfe1d7cf8 Redirect to my virtual machines page if any error M.Ravi 2017-09-29 21:53:02 +02:00
• e6869612d8 Update resend activation link email text M.Ravi 2017-09-29 21:45:30 +02:00
• 4b8d68fc8e Reuse price parameter M.Ravi 2017-09-29 09:35:45 +02:00
• 5393ffa10d Small code reorganizing M.Ravi 2017-09-29 09:16:00 +02:00
• 5c99dd4da7 hosting/views: remove billing_address_id in call to create_vm_task M.Ravi 2017-09-29 09:07:38 +02:00
• d06f5ffb00 datacenterlight/views: remove billing_address_id in call to create_vm_task M.Ravi 2017-09-29 08:58:45 +02:00
• 61a4060e10 datacenterlight/tests: remove billing_address_id in call to create_vm_task M.Ravi 2017-09-29 08:55:30 +02:00
• 483aa493bb Remove billing_address_id as it is no more used M.Ravi 2017-09-29 08:51:58 +02:00
• ac37349aef Refactor code and pass subscription_id instead of obj M.Ravi 2017-09-29 08:50:03 +02:00
• 313ba9d502 Refactor set_subscription_id - use stripe subscription id instead of obj M.Ravi 2017-09-29 08:42:17 +02:00
• caad79304b Pass subscription_id instead of subscription object M.Ravi 2017-09-29 08:40:43 +02:00
• f29a3ad0e6 Pass subscription_id to create_vm_task instead of the object M.Ravi 2017-09-29 08:39:20 +02:00
• 5783e42171 Refactor code and add following fixes M.Ravi 2017-09-29 08:37:25 +02:00
• 4ce1ff073a Some more modal styles M.Ravi 2017-09-28 23:31:29 +02:00
• f60a2c3482 Make correct icons load on dcl createvm error modal M.Ravi 2017-09-28 23:20:43 +02:00
• 9cab43f051 Update modal with html from server M.Ravi 2017-09-28 23:03:22 +02:00
• 0202d5ba93 Add initial values for dcl billing form M.Ravi 2017-09-28 22:56:33 +02:00
• fcda0b5637 DCL payment page: Get form data from session on error PCoder 2017-09-29 01:25:22 +05:30
• 4efc1b4943 Merge branch 'master' into bugfix/stripe_error PCoder 2017-09-28 23:43:21 +05:30
• 03442398c2 Handle message create vm request in js M.Ravi 2017-09-28 17:31:29 +02:00
• c13015eabd Refactor and correct some logic M.Ravi 2017-09-28 15:56:09 +02:00
• 9c69c4cb25 Update landing-page.css Arvind Tiwari 2017-09-28 19:14:13 +05:30