Commit graph

2090 commits

Author SHA1 Message Date
PCoder
bc43d9225a Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-20 01:37:54 +05:30
Arvind Tiwari
6764e1ccee Merge pull request #441 from tiwariav/task/3565/warning-color
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
2017-08-20 00:29:21 +05:30
PCoder
9c8bddb200 requirements.txt: Added celery, redis, django-celery-results 2017-08-19 08:41:36 +05:30
PCoder
f28f55c775 faq.html now referred as DCL.Faq 2017-08-19 06:41:29 +05:30
PCoder
687cf96287 Added cms_tags, sekizai_tags and cms_toolbar 2017-08-19 06:39:56 +05:30
PCoder
17fbaa59be Added faq.html cms template 2017-08-19 06:37:40 +05:30
Arvind Tiwari
8868aabf59 added .log to .gitignore 2017-08-19 02:42:50 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
PCoder
94004a5443 Changed 1.0.23.1 to 1.0.24 in the Changelog 2017-08-16 03:30:21 +05:30
PCoder
270e70580f Updated Changelog for 1.0.24 2017-08-16 03:27:37 +05:30
Pcoder
2d7231caa0 Merge pull request #449 from pcoder/task/3687/stripe_customer_description
Added code to store customer's name in Stripe's description field.
2017-08-15 22:16:07 +02:00
Pcoder
c053c76186 Merge pull request #448 from pcoder/task/3699/add_oneadmin_ssh_key
Task/3699/Added oneadmin ssh key by default to the created VM via DCL flow
2017-08-15 20:08:52 +02:00
PCoder
999f5d8e2d Cleaned up a comment 2017-08-15 18:48:29 +05:30
PCoder
492f7553d8 Added test TestStripeCustomerDescription 2017-08-15 16:12:08 +05:30
PCoder
3be7fbe2ee Added name parameter for creating StripeCustomer and set description to this 2017-08-15 16:05:52 +05:30
PCoder
73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
Pcoder
3b1cd200d6 Merge pull request #430 from amarynets/bugfix/add_customuser_parameter
Fixed `TypeError: get_anonymous_user_instance() takes 0 positional arguments but 1 was given`
2017-08-12 19:26:02 +02:00
Arvind Tiwari
dbb4c7b3f3 Update Changelog 2017-08-12 02:44:40 +05:30
Arvind Tiwari
f618ce8bdf fixes in changelog 2017-08-12 02:42:52 +05:30
Arvind Tiwari
3f37fdd77a Update Changelog 2017-08-12 02:42:11 +05:30
Arvind Tiwari
26903015fe corrected format for changelog 2017-08-12 02:39:04 +05:30
Arvind Tiwari
01156a335d update changelog 1.0.23 2017-08-12 02:33:37 +05:30
Arvind Tiwari
0efd844603 Update Changelog 2017-08-12 02:25:07 +05:30
Arvind Tiwari
dde18cc485 Merge pull request #443 from ungleich/task/3676/missing_card_holder_name_migration
Task/3676/Added migration file for missing card holder's name in utils_billing_…
2017-08-12 02:21:19 +05:30
Arvind Tiwari
2f832e6409 Update Changelog 2017-08-12 02:17:07 +05:30
Arvind Tiwari
7825114f5e Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer
bugfix/3683 footer fix on hosting
2017-08-12 01:28:31 +05:30
ARvind Tiwari
07f92e754e fix for mobile 2017-08-12 01:18:14 +05:30
ARvind Tiwari
f8ce8f975f footer fix on hosting 2017-08-12 00:49:20 +05:30
Arvind Tiwari
fcc8c4718c Merge pull request #444 from tiwariav/bug/3677/ssh-key-modal
bugfix/3677 ssh modal key wrapping
2017-08-12 00:42:59 +05:30
Arvind Tiwari
4ab26b4bbd Merge pull request #440 from tiwariav/task/3619/lato-font
Task/3619 Lato font used in all stylesheets
2017-08-12 00:42:37 +05:30
Arvind Tiwari
415c914982 Merge pull request #439 from pcoder/task/3655/check_authorization_delete_ssh_keys
Task/3655/Check authorization for delete ssh keys
2017-08-12 00:42:08 +05:30
ARvind Tiwari
3ccbf3a3ac ssh modal key word-break fixed so that it wraps 2017-08-11 01:49:41 +05:30
PCoder
debfafaf26 Added migration file for missing card holder's name in utils_billing_address 2017-08-10 23:14:51 +05:30
ARvind Tiwari
7cf46ad8b8 override bootstrap default danger color #a94442 -> #eb4d5c 2017-08-09 00:21:25 +05:30
ARvind Tiwari
ac0787bdd5 modal title font-weight and capitalization fix 2017-08-08 23:01:19 +05:30
Pcoder
34a95f5a05 Merge pull request #433 from pcoder/bug/3638/ssh_key_without_download_option
Bug/3638/ssh key without download option
2017-08-08 00:20:47 +02:00
ARvind Tiwari
cc58c49457 font-weight fix in hosting app 2017-08-08 00:51:54 +05:30
ARvind Tiwari
6c4e0067ba font-family changed to 'Lato' in all css files 2017-08-08 00:35:58 +05:30
Siarhei Puhach
72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00
Siarhei Puhach
4cd3d6a4aa Added stripe make_charge error handler 2017-08-07 13:36:21 +03:00
Siarhei Puhach
4fea099b5d Changed invalid credit card error style 2017-08-07 10:05:12 +03:00
Siarhei Puhach
4de04b2663 Changed visa card error placement 2017-08-07 09:56:57 +03:00
Pcoder
90f01c277b Merge pull request #436 from tiwariav/task/3660/webringfuture
task #3660 whydatacenterlight 'we bring future' section
2017-08-04 21:02:53 +02:00
Pcoder
2ae0d3186c Merge pull request #437 from ungleich/tiwariav-bugfix/modal_icons
Tiwariav bugfix/modal icons

Added missing modal icons
2017-08-04 20:42:51 +02:00
PCoder
1d4f86da14 Added translation for Delete SSH Key 2017-08-05 00:01:19 +05:30
PCoder
7d334fddb0 Merge branch 'bugfix/modal_icons' of https://github.com/tiwariav/dynamicweb into tiwariav-bugfix/modal_icons 2017-08-04 23:53:47 +05:30
Pcoder
c1ad5e0b30 Merge pull request #422 from tiwariav/bugfix/3621/mobile_signup
bugfix #3621 signup page layout fix mobile, confirm-reset-page layout fix
2017-08-04 19:59:00 +02:00
Pcoder
5f71b19fb1 Merge pull request #429 from amarynets/bugfix/add_vmtemplate_mig_file
Add file with VMTemplate hosting migrations
2017-08-04 19:44:34 +02:00
M.Ravi
d85afd56e0 Fixed an issue
- Changed owner -> user
   - Reformatted code
2017-08-04 17:49:55 +02:00