moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Commit graph

  • d54bf84b1e Format code PCoder 2018-09-25 02:20:57 +0200
  • 50e5fea339 Add GenericProduct model and associate it to HostingOrder PCoder 2018-09-25 02:20:31 +0200
  • 67231275c7 Modify migration PCoder 2018-09-25 02:19:28 +0200
  • 1228d3dbc6 Add product_name to GenericPaymentForm PCoder 2018-09-25 02:18:31 +0200
  • 69a1d2df71 Add ajax call to fetch price/recurring PCoder 2018-09-25 02:16:22 +0200
  • b63a572231 Register GenericProduct to adminsite PCoder 2018-09-25 02:14:37 +0200
  • 51c5fa98dd Save description and product_id PCoder 2018-09-25 02:14:11 +0200
  • ed7ffb355f Server side validation of the POSTed product PCoder 2018-09-25 02:13:39 +0200
  • 1988020006 Handle generic-payment-form POST PCoder 2018-09-25 02:12:38 +0200
  • b348c93fee Add product hidden input type PCoder 2018-09-25 01:56:06 +0200
  • 481f13d20c Check key existence PCoder 2018-09-24 22:27:25 +0200
  • 114dbd8242 Make recurring monthly and amount in chf explicit PCoder 2018-09-24 08:32:33 +0200
  • a90bec98ec Make invoice for generic payment showable PCoder 2018-09-24 08:22:46 +0200
  • d99271f71d Redirect users to orders after generic payment is successful PCoder 2018-09-23 17:19:24 +0200
  • ff993e32db Revert back to POST parameters for billing-form method PCoder 2018-09-23 17:01:29 +0200
  • 2a694295ad Refactor payment.js PCoder 2018-09-23 17:00:48 +0200
  • fcfc56e132 Move csrf_token out of the form loop PCoder 2018-09-23 16:15:48 +0200
  • d6e4a86724 Append One time charge/Recurring only for generic payments PCoder 2018-09-23 13:34:26 +0200
  • dd82bdc9da Fix a flake8 error PCoder 2018-09-23 13:27:33 +0200
  • 7f3b916c58 Reformat code PCoder 2018-09-23 13:26:48 +0200
  • d23624c525 Modify datacenterlight/views.py to includes various cases of generic payment PCoder 2018-09-23 13:15:26 +0200
  • 9ec05e7df4 Merge billing and generic-payment forms and post values as get parameters PCoder 2018-09-23 13:13:29 +0200
  • bc3eaaa7eb Move csrf_token out of form loop PCoder 2018-09-23 13:10:26 +0200
  • bce47032ab Handle generic payment separately in order_detail.html PCoder 2018-09-23 13:03:47 +0200
  • e94ecfe52c Change recurring and description to non-required fields + Change amount to Floatfield PCoder 2018-09-23 12:49:52 +0200
  • 332e7d6624 Add generic_payment_id field to HostingOrder migration and reflect generic payments in adminsite PCoder 2018-09-23 12:34:13 +0200
  • c7edcdc8b1 Change description to CharField and set its height PCoder 2018-09-22 23:51:39 +0200
  • 730492089b Modify PaymentOrderView to accomodate the new generic payment case (WIP) PCoder 2018-09-22 08:20:49 +0200
  • 429dd10b75 Modify dcl landing_payment.html to accomodate the new generic payment form PCoder 2018-09-22 08:17:43 +0200
  • a7fa52490c Create GenericPaymentForm PCoder 2018-09-22 08:16:26 +0200
  • 76efc35324 Add enable_512mb_ram option in model/plugin PCoder 2018-09-22 06:44:37 +0200
  • d7be223fcb Change margin bottom for vm terminate error PCoder 2018-09-08 12:39:08 +0200
  • 304feb4f7b Update text PCoder 2018-09-08 10:46:07 +0200
  • e376f38baa Correct text PCoder 2018-09-08 10:33:00 +0200
  • 84dae63968 Fix: ugettext_lazy doesn't like string format PCoder 2018-09-08 10:29:47 +0200
  • 4914280868 Set text for vm terminate timeout PCoder 2018-09-08 10:14:57 +0200
  • ce2d34350f Update Changelog PCoder 2018-09-08 00:15:44 +0200
  • 743ce4ed70
         Merge pull request #648 from pcoder/bugfix/log_vm_terminate_errors Pcoder 2018-09-08 00:09:59 +0200
  • a7afbec5b4 Fix flake8 error PCoder 2018-09-07 23:14:57 +0200
  • ff6df8cd58 Simplify logic PCoder 2018-09-07 23:11:46 +0200
  • 7d4cf5c3c2 Fix flake8 error PCoder 2018-09-07 22:46:18 +0200
  • 8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors PCoder 2018-09-07 22:43:29 +0200
  • d601b987d2 Update Changelog 2.2 PCoder 2018-09-06 01:15:21 +0200
  • c6ec2c062c Update Changelog for 2.2 PCoder 2018-09-06 01:11:27 +0200
  • c6612153e8
         Merge pull request #663 from pcoder/bugfix/plan-with-price Pcoder 2018-09-06 01:04:47 +0200
  • fc8f9993af Remove whitespace in Stripe plan PCoder 2018-09-06 00:52:55 +0200
  • b03cb073c2 Replace @ with a comma PCoder 2018-09-06 00:44:47 +0200
  • fdffe2389b Round price PCoder 2018-09-06 00:31:17 +0200
  • d8a532e7b0 Round discount to 2 decimal points also PCoder 2018-09-06 00:26:08 +0200
  • 642153345c Round price, vat and discount to 2 decimal places PCoder 2018-09-06 00:18:04 +0200
  • 8a30100488 Use price in stripe plan name too PCoder 2018-09-05 23:26:51 +0200
  • 5f19a85a28 Update Changelog for 2.1.2 2.1.2 PCoder 2018-08-30 10:10:31 +0200
  • 362a93a97f
         Merge pull request #662 from pcoder/use_blog_feed Pcoder 2018-08-30 09:57:36 +0200
  • 4d4472f0d3 Set blog rss feed for all blog template PCoder 2018-08-30 09:47:29 +0200
  • c891694dc0 Update Bugfix Malcolm Anyakee 2018-08-25 23:13:16 +0200
  • 23eb054422 Update Changelog for release 2.1.1 2.1.1 PCoder 2018-08-24 12:23:01 +0200
  • 144a780105 Change text: 'Terminated VM can not ...' -> 'Terminated VMs can not ...' PCoder 2018-08-24 11:57:54 +0200
  • 3796dabe11 Update Changelog PCoder 2018-08-24 11:30:49 +0200
  • 3de172adf2
         Merge pull request #656 from pcoder/task/5487/warn_users_before_terminating_vm Pcoder 2018-08-24 11:25:15 +0200
  • 06d849c5ce Merge branch 'master' into 5151/gdpr_modal PCoder 2018-08-24 11:10:59 +0200
  • d7f171d710 Change DE translation (beenden instead of terminieren) PCoder 2018-08-24 11:07:50 +0200
  • 4f745b607d Merge branch 'master' into task/5487/warn_users_before_terminating_vm PCoder 2018-08-24 10:58:24 +0200
  • 9a5b9c7af5 Update Changelog PCoder 2018-08-24 10:05:37 +0200
  • 4a16251a69 Update Changelog PCoder 2018-08-24 10:00:17 +0200
  • fbfa6c8d21
         Merge pull request #652 from pcoder/bugfix/send_email_on_dg_subscription Pcoder 2018-08-24 09:54:54 +0200
  • c458b56f71 Add migration file PCoder 2018-08-24 09:40:15 +0200
  • a45eef0409 Change cc_brand field to 128 chars PCoder 2018-08-24 09:37:56 +0200
  • 83a6e53fae Merge branch 'master' into bugfix/send_email_on_dg_subscription PCoder 2018-08-24 08:42:25 +0200
  • feceb14aec Update Changelog PCoder 2018-08-23 19:55:30 +0200
  • f1cc3c5892
         Merge pull request #657 from pcoder/5458/make_hostingorder_readable Pcoder 2018-08-23 19:50:17 +0200
  • e1263ce9b3 Add DE translation fo #5487 PCoder 2018-08-23 19:40:16 +0200
  • 4baa3a7095 Improve HostingOrder str representation PCoder 2018-08-23 09:18:55 +0200
  • 4a1434c514 Make string representation of HostingOrder more readable PCoder 2018-08-23 09:07:07 +0200
  • f9584b4c82 Fix a bug when vm_template is None PCoder 2018-08-23 09:06:31 +0200
  • e230f2ac8c Merge master into 5151/gdpr_modal PCoder 2018-08-22 23:25:11 +0200
  • 78e44332b5 Remove an unnecessary question mark PCoder 2018-08-22 23:16:26 +0200
  • af78631ec8 Update hosting's django.po PCoder 2018-08-22 23:13:49 +0200
  • 29172a9df7 Use a separate class for warning block PCoder 2018-08-22 23:06:20 +0200
  • 4425aa7c88 Change modal text PCoder 2018-08-22 22:57:32 +0200
  • b7ff519624 Reduce bottom padding further by 2px PCoder 2018-08-22 22:54:49 +0200
  • 07837c8752 Reduce bottom padding PCoder 2018-08-22 22:51:22 +0200
  • 1e5cf08273 Move the warning to the bottom PCoder 2018-08-22 22:47:49 +0200
  • 7e790e7027 Add warning div PCoder 2018-08-22 22:36:29 +0200
  • 929e7ead1c Add vm-terminate-warning style PCoder 2018-08-22 22:36:17 +0200
  • ab074d9bc2 Update Changelog PCoder 2018-08-22 22:00:43 +0200
  • 05d48ec4ff
         Merge pull request #653 from pcoder/bugfix/show_meta_description_in_cms_page Pcoder 2018-08-22 21:54:12 +0200
  • 9c5363ef55 Merge branch 'master' into bugfix/show_meta_description_in_cms_page PCoder 2018-08-22 21:42:37 +0200
  • fb4591ef6a Update Changelog PCoder 2018-08-22 20:51:32 +0200
  • 438a6ab4e4
         Merge pull request #655 from pcoder/task/5473/ping_before_cdist Pcoder 2018-08-22 20:45:00 +0200
  • 432b54a86d Remove timeout parameter in ping6 request PCoder 2018-08-22 20:27:19 +0200
  • e66e8202db Remove unused variable PCoder 2018-08-22 19:56:56 +0200
  • 13876c24c1 Update doc PCoder 2018-08-22 00:42:50 +0200
  • f56933021f Also send an email if manage_ssh_key does not complete in time PCoder 2018-08-22 00:37:40 +0200
  • 2ff7eaea65 Sleep additional 10 seconds before running manage_public_key PCoder 2018-08-22 00:25:59 +0200
  • 893c8ed08b Fix imports PCoder 2018-08-22 00:14:17 +0200
  • 3b07687d3e Refactor ping_ok from datacenterlight.utils to utils.hosting_utils PCoder 2018-08-22 00:12:14 +0200
  • a55587dbf3 Wait for VM to be pingable before doing a manage_public_key PCoder 2018-08-21 23:49:47 +0200
  • 91021d7612 Add ping_ok utility method PCoder 2018-08-21 23:24:40 +0200
  • cda6c60e02 Update Changelog for 2.1 2.1 PCoder 2018-08-21 15:09:02 +0200
  • 873f44c6e5
         Merge pull request #654 from pcoder/bugfix/long_cc_brand Pcoder 2018-08-21 14:57:33 +0200