aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,170 Commits 11 Branches 82 Tags 313 MiB
Commit Graph

4170 Commits

Author SHA1 Message Date
PCoder a93c900109 Pass 512 MB to memory parameter 2018-10-01 08:54:22 +02:00
PCoder c2dbbf0424 Update views.py to include 512mb ram case 
RAM server side validation is as follows:
- pid is a mandatory parameter for a valid RAM, otherwise a
 validation error is raised
- check if enable_512mb_ram is enabled. In this case, validate
if the input ram is either a whole number or 0.5 and in the range
0.5 <= value <= 200
- otherwise check ram is a whole number in the range
1 <= value <= 200
 2018-10-01 07:52:28 +02:00
PCoder f85ef714ab Pass instance context 
Also POST plugin_id as a form parameter to check enable_512mb_ram
case
 2018-10-01 07:50:18 +02:00
PCoder 24d719e4f1 Update migration 2018-09-29 07:37:23 +02:00
PCoder 5452c1c478 Merge master into task/5681/offer-512mb-ram 2018-09-28 08:36:35 +02:00
PCoder 8743853a7b Update Changelog 2018-09-28 08:13:37 +02:00
PCoder 737d890a7c Update Changelog for 2.2.2 2018-09-28 08:11:36 +02:00
PCoder db20e3cbe7 Add plus minus ram handler for 512MB option 2018-09-28 08:07:12 +02:00
Pcoder 32767fed68
Merge pull request #668 from pcoder/task/5721/set_calculator_OS_order 
Task/5721/set calculator OS order
 2018-09-28 07:32:55 +02:00
PCoder e1ce017ec8 Add migration 2018-09-27 22:48:23 +02:00
PCoder b047ccdef1 Fix flake8 error 2018-09-27 22:33:24 +02:00
PCoder 56460ac8f0 Update migration 2018-09-27 22:16:05 +02:00
PCoder d93861ca32 Set Devuan Ascii as default template 2018-09-27 22:14:42 +02:00
PCoder a02c3c6973 Sort templates alphabetically 
And also select the chosen template as the default one
 2018-09-27 22:12:13 +02:00
PCoder 768f3532f7 Add default_selected_template field to DCLCalculatorPluginModel 2018-09-27 22:09:11 +02:00
PCoder 21084cdc9f Initialize minRam js variable from what is passed from backend 2018-09-27 09:07:28 +02:00
PCoder 12f139976d Simplify logic to set min_ram in the calculator form 2018-09-27 09:06:39 +02:00
PCoder da21699212 Merge branch 'master' into task/5681/offer-512mb-ram 2018-09-26 23:10:17 +02:00
PCoder efae2b1d9a Update Changelog 2018-09-26 21:17:35 +02:00
Pcoder 31e8467f20
Merge pull request #667 from pcoder/bugfix/corrections_by_malcolm 
Bugfix/corrections by malcolm

- virutal -> virtual
- some DE corrections
 2018-09-26 21:11:13 +02:00
PCoder 4feeec23d4 Correct spelling: virutal -> virtual 2018-09-26 20:50:19 +02:00
PCoder ca578ecf56 Merge branch 'master' of https://github.com/MalcolmA/dynamicweb into MalcolmA-master 2018-09-26 20:46:54 +02:00
PCoder ce2ac4524c Update Changelog for release 2.2.1 2018-09-25 22:49:31 +02:00
Pcoder 5d5408eb8c
Merge pull request #665 from pcoder/manage_navbar_login 
Change DCLNavbarPlugin to show login option only if set
 2018-09-25 22:43:10 +02:00
PCoder c9ac959ff6 Change DCLNavbarPlugin to show login option only if set 2018-09-25 22:29:58 +02:00
PCoder 76efc35324 Add enable_512mb_ram option in model/plugin 2018-09-22 06:44:37 +02:00
PCoder d7be223fcb Change margin bottom for vm terminate error 2018-09-08 12:39:12 +02:00
PCoder 304feb4f7b Update text 2018-09-08 10:46:07 +02:00
PCoder e376f38baa Correct text 2018-09-08 10:33:00 +02:00
PCoder 84dae63968 Fix: ugettext_lazy doesn't like string format 2018-09-08 10:29:47 +02:00
PCoder 4914280868 Set text for vm terminate timeout 2018-09-08 10:14:57 +02:00
PCoder ce2d34350f Update Changelog 2018-09-08 00:15:44 +02:00
Pcoder 743ce4ed70
Merge pull request #648 from pcoder/bugfix/log_vm_terminate_errors 
Bugfix/log vm terminate errors
 2018-09-08 00:09:59 +02:00
PCoder a7afbec5b4 Fix flake8 error 2018-09-07 23:14:57 +02:00
PCoder ff6df8cd58 Simplify logic 2018-09-07 23:11:46 +02:00
PCoder 7d4cf5c3c2 Fix flake8 error 2018-09-07 22:46:18 +02:00
PCoder 8e7789462e Merge branch 'master' into bugfix/log_vm_terminate_errors 2018-09-07 22:43:29 +02:00
PCoder d601b987d2 Update Changelog 2018-09-06 01:15:21 +02:00
PCoder c6ec2c062c Update Changelog for 2.2 2018-09-06 01:11:27 +02:00
Pcoder c6612153e8
Merge pull request #663 from pcoder/bugfix/plan-with-price 
Use price in stripe plan name too
 2018-09-06 01:04:47 +02:00
PCoder fc8f9993af Remove whitespace in Stripe plan 2018-09-06 00:52:55 +02:00
PCoder b03cb073c2 Replace @ with a comma 2018-09-06 00:44:47 +02:00
PCoder fdffe2389b Round price 2018-09-06 00:31:17 +02:00
PCoder d8a532e7b0 Round discount to 2 decimal points also 2018-09-06 00:26:08 +02:00
PCoder 642153345c Round price, vat and discount to 2 decimal places 2018-09-06 00:18:04 +02:00
PCoder 8a30100488 Use price in stripe plan name too 2018-09-05 23:26:51 +02:00
PCoder 5f19a85a28 Update Changelog for 2.1.2 2018-08-30 10:10:31 +02:00
Pcoder 362a93a97f
Merge pull request #662 from pcoder/use_blog_feed 
Set blog rss feed for all blog template
 2018-08-30 09:57:36 +02:00
PCoder 4d4472f0d3 Set blog rss feed for all blog template 2018-08-30 09:47:29 +02:00
Malcolm Anyakee c891694dc0 Update Bugfix 
Fixed bugs and fixed typo
 2018-08-25 23:13:16 +02:00