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

• 70d5efb21a Update hosting django.po with a de translation PCoder 2017-09-25 02:09:49 +05:30
• 46d82268f4 Show terminated in invoice for VM that has been terminated PCoder 2017-09-25 02:04:40 +05:30
• 7fcece40c1 Using VMDetail model to show order details PCoder 2017-09-25 01:49:00 +05:30
• f2213305f6 Reformatted hosting views.py PCoder 2017-09-25 00:46:39 +05:30
• 83ccb9cffa Added vmdetail migration file PCoder 2017-09-25 00:36:33 +05:30
• 114511e924 Fixed some flake8 warnings PCoder 2017-09-25 00:34:18 +05:30
• f2f2fc22df Update VMDetail's terminated_at on delete of a vm PCoder 2017-09-25 00:30:28 +05:30
• 7278a20135 Added get_or_create_vm_detail function PCoder 2017-09-25 00:02:36 +05:30
• f4899ffc18 Added missing get_language import PCoder 2017-09-25 00:01:48 +05:30
• a45679d89a Added VMDetail model PCoder 2017-09-25 00:00:45 +05:30
• cd5607b44e Updated hosting django.po PCoder 2017-09-24 19:04:18 +05:30
• 84db1606a3 Added resend_activation_link.html template file PCoder 2017-09-24 18:04:11 +05:30
• 24522908e0 Added resend activation link to login page PCoder 2017-09-24 16:02:06 +05:30
• 3e32e5127b Added ResendActivationLinkViewMixin PCoder 2017-09-24 15:55:52 +05:30
• af426c5b7a Added ResendActivationEmailForm and translation function to untranslated texts PCoder 2017-09-24 15:54:38 +05:30
• 3247616137 Added resend activation link url PCoder 2017-09-24 15:53:08 +05:30
• afc368e9dd Added ResendActivationEmailView PCoder 2017-09-24 15:49:40 +05:30
• 0974376e9f Reformatted code M.Ravi 2017-09-24 09:34:30 +02:00
• 03a565b4d0 Corrected a small de text füll->fülle PCoder 2017-09-24 04:44:07 +05:30
• 09dc0cde13 Removed unwanted js code that was causing error PCoder 2017-09-24 04:38:54 +05:30
• 39a2455817 Merged upstream master into task/3730/refactor_price_parameter PCoder 2017-09-24 04:20:41 +05:30
• c6c5a20a17 Updated datacenterlight django.po PCoder 2017-09-24 03:06:05 +05:30
• 9491bb81a2 Added missing import after merge PCoder 2017-09-24 02:03:48 +05:30
• 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page PCoder 2017-09-24 01:31:57 +05:30
• 300997699a Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm PCoder 2017-09-24 01:08:15 +05:30
• 537e350c8c Redirecting users on creation of accounts to my virtual machines page PCoder 2017-09-24 00:22:18 +05:30
• 313b2b2f57 fixed vreate vm error Arvind Tiwari 2017-09-23 23:47:25 +05:30
• cd3fdcf935 Updated pre-changelog 1.2.3 Arvind Tiwari 2017-09-23 23:33:48 +05:30
• ae1a317bf9 Merge pull request #486 from tiwariav/task/3728/vm_teminate_animation Arvind Tiwari 2017-09-23 23:26:00 +05:30
• 7456baac16 merged master Arvind Tiwari 2017-09-23 23:05:10 +05:30
• eca7ba01c5 fixed duplicate translation Arvind Tiwari 2017-09-23 22:54:17 +05:30
• 363017d85f Merge pull request #488 from tiwariav/task/3777/hosting_calculator Arvind Tiwari 2017-09-23 22:50:25 +05:30
• 8781905fc6 Removed DataCenterLight PricingView PCoder 2017-09-23 21:24:42 +05:30
• b428a0933e Deleted datacenterlight pricing.html PCoder 2017-09-23 21:23:48 +05:30
• 83b52d95ae Merge branch 'master' into task/3730/refactor_price_parameter PCoder 2017-09-23 21:18:54 +05:30
• 487af6e1c8 Update Changelog Arvind Tiwari 2017-09-23 20:44:53 +05:30
• 61a1486ea4 Merge pull request #497 from tiwariav/bugfix/hosting_invoice_page Arvind Tiwari 2017-09-23 20:33:05 +05:30
• e9721705ca margin fix Arvind Tiwari 2017-09-23 20:30:53 +05:30
• 2385c108e1 Merge pull request #491 from tiwariav/task/3786/hosting_invoice_page Arvind Tiwari 2017-09-23 20:07:05 +05:30
• 3685bf591d error msgs translation Arvind Tiwari 2017-09-23 19:02:23 +05:30
• be0c50aa2f error msgs translation Arvind Tiwari 2017-09-23 19:01:22 +05:30
• ec2413d3dc removed extra quote Arvind Tiwari 2017-09-23 18:57:35 +05:30
• dec1f34250 Updated Changelog with pre-1.2.3 text PCoder 2017-09-23 17:17:24 +05:30
• 1b7da239e1 Merge pull request #492 from pcoder/feature/cms_prefix Pcoder 2017-09-23 11:40:39 +00:00
• 93d36306fb Removed total and price fields used in dcl flow PCoder 2017-09-23 13:21:01 +05:30
• 0bc2b22f62 Reformatted datacenterlight/tasks.py PCoder 2017-09-23 13:09:14 +05:30
• b17af3bb09 Merge branch 'task/3736/refactor_compute_vm_price' into task/3730/refactor_price_parameter PCoder 2017-09-23 12:48:31 +05:30
• 8de4a75107 Removed some occurrences of price PCoder 2017-09-23 12:48:21 +05:30
• 9ab7622a9c Reformatted stripe_utils.py PCoder 2017-09-23 03:25:48 +05:30
• 99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions PCoder 2017-09-23 03:18:05 +05:30
• 285d664660 Refactored obtaining stripe plan name to utils.stripe_utils.get_stripe_plan_name PCoder 2017-09-23 03:17:21 +05:30
• 3bb7f09d41 Refactored obtaining vm price to utils.hosting_utils.get_vm_price PCoder 2017-09-23 03:16:18 +05:30
• ad66b16fd3 other app translation files change undo Arvind Tiwari 2017-09-23 02:31:23 +05:30
• 6983b6f72e all emails redesigned Arvind Tiwari 2017-09-23 02:27:19 +05:30
• 057a2c77a6 password reset email, user activation email redesigned Arvind Tiwari 2017-09-23 01:57:40 +05:30
• ea9e62db37 Reverted back django cms ckeditor migration module code PCoder 2017-09-23 01:55:21 +05:30
• 29fb7224a6 new translations Arvind Tiwari 2017-09-23 01:08:09 +05:30
• 6004a7ede4 new welcome email Arvind Tiwari 2017-09-23 01:03:43 +05:30
• c362dccd0f Handling payment error response by json M.Ravi 2017-09-22 21:30:42 +02:00
• a48188a190 datacenterlight: Added create vm modal and responding with json M.Ravi 2017-09-22 21:20:00 +02:00
• ab66d25abe Removed some commented code M.Ravi 2017-09-22 13:54:20 +02:00
• 0e5a27862a Added base_url and fixed new account emails M.Ravi 2017-09-22 13:46:22 +02:00
• ca73e1bb33 Fixed a logger message M.Ravi 2017-09-22 13:45:15 +02:00
• 4c0c1ffb27 Do a user login after creation M.Ravi 2017-09-22 12:46:33 +02:00
• 31f7c4a51a Simplified code M.Ravi 2017-09-22 12:38:05 +02:00
• 994ffaf117 Send account details in email M.Ravi 2017-09-22 12:01:09 +02:00
• f67b69d490 Formatted code and added condition to create user only if an email does not exist M.Ravi 2017-09-22 11:45:21 +02:00
• faa26a05dd Reverted back some lines for preserving format M.Ravi 2017-09-22 08:51:35 +02:00
• 2b0dbfa1e5 Added /cms prefix to django-cms urls M.Ravi 2017-09-22 08:47:42 +02:00
• 0993f2cab1 merged master Arvind Tiwari 2017-09-21 19:43:20 +05:30
• 4a1596b093 merged master Arvind Tiwari 2017-09-21 19:41:45 +05:30
• 6be245a811 merged master Arvind Tiwari 2017-09-21 19:38:47 +05:30
• 1c0f0da96e conditional texts Arvind Tiwari 2017-09-21 19:32:22 +05:30
• a16dbb50d8 design fixes Arvind Tiwari 2017-09-21 19:17:10 +05:30
• e5ad57d3f1 Resolved some issues M.Ravi 2017-09-21 14:29:49 +02:00
• db3955ab94 error 500 fixed Arvind Tiwari 2017-09-21 17:45:12 +05:30
• a792911dea hosting view fix Arvind Tiwari 2017-09-21 17:22:02 +05:30
• 5d8fb71215 removed redirects form get_context() to get() Arvind Tiwari 2017-09-21 16:38:54 +05:30
• 2c4390767d minor fixes Arvind Tiwari 2017-09-21 15:14:15 +05:30
• 6c381dd3fb invoice page redesigned Arvind Tiwari 2017-09-21 15:03:00 +05:30
• e2cb70a697 first attempt at refatoring the user creating to order confirmaton page PCoder 2017-09-21 06:41:09 +05:30
• 6dfbf67d7d rearranging text Arvind Tiwari 2017-09-21 02:50:07 +05:30
• 143f40bd2d Merge branch 'task/3756/landing_billing_page' of https://github.com/tiwariav/dynamicweb into tiwariav-task/3756/landing_billing_page PCoder 2017-09-21 02:41:26 +05:30
• 1eff51099c exception handling fix Arvind Tiwari 2017-09-21 02:26:42 +05:30
• dd77f40707 top options added Arvind Tiwari 2017-09-21 02:23:08 +05:30
• dd3c967500 Merge pull request #490 from pcoder/fix_digitalglarus_subdomain Pcoder 2017-09-20 20:52:37 +00:00
• 2c2ee0f4a4 Some more translations PCoder 2017-09-21 02:18:39 +05:30
• 3eeaba8715 Added some translations hosting_translations PCoder 2017-09-21 02:06:50 +05:30
• f0e50a4e94 removed commented code Arvind Tiwari 2017-09-21 01:20:51 +05:30
• 98eb2f85d8 printing pdf Arvind Tiwari 2017-09-21 01:19:38 +05:30
• 0f5bf606da minor fixes Arvind Tiwari 2017-09-20 23:32:48 +05:30
• ec354332f8 translation fix Arvind Tiwari 2017-09-20 23:28:36 +05:30
• 65618bb2aa merged master Arvind Tiwari 2017-09-20 23:24:20 +05:30
• fc03df4652 merged master Arvind Tiwari 2017-09-20 23:21:24 +05:30
• f4766c7d7c merged master Arvind Tiwari 2017-09-20 23:19:32 +05:30
• 37017dd31a minor mods Arvind Tiwari 2017-09-20 23:06:51 +05:30
• 636ccd4b9d Merge branch 'master' into task/3786/hosting_invoice_page Arvind Tiwari 2017-09-19 15:03:36 +05:30
• 98f094e5b8 initial changes Arvind Tiwari 2017-09-19 15:03:06 +05:30
• 2223bffa04 Merge pull request #489 from pcoder/task/3772/hosting_billing_monthly_subscription Arvind Tiwari 2017-09-19 15:01:42 +05:30
• 04126c69ee vm name added Arvind Tiwari 2017-09-19 14:34:53 +05:30