Commit Graph

1984 Commits

Author SHA1 Message Date
Squidly271
9bc57e69d1 Merge pull request #2 from limetech/master
LT Catchup
2018-06-23 13:45:20 -04:00
Eric Schultz
e6ea50aa9a Merge pull request #344 from bergware/master
Docker enhancements
2018-06-17 14:16:26 -05:00
bergware
ee032dc29b Merge remote-tracking branch 'upstream/master' 2018-06-08 07:57:22 +02:00
Eric Schultz
58751dc56c Merge pull request #346 from roninkenji/fix_dockerman_icon_extraction
Correct docker container icon name generation
2018-06-07 21:34:07 -05:00
Kenneth Tan
0c508f7890 Correct docker container icon name generation 2018-06-08 08:35:24 +08:00
bergware
b3791ccbd1 Merge remote-tracking branch 'upstream/master' 2018-06-05 08:33:52 +02:00
bergware
594f6682e0 Docker: added cpu load and memory load display 2018-06-03 11:01:33 +02:00
bergware
e90ba2d00f Docker: added cpu load and memory load display 2018-06-03 09:12:22 +02:00
Eric Schultz
08fe01332a make entire menu items clickable for gray and azure themes 6.5.3 2018-06-02 11:50:36 -05:00
bergware
b98935813a Show accumulated encryption status 2018-06-02 09:30:55 +02:00
bergware
cfcd6bcf6e Docker: added shell/bash selection for console 2018-06-02 09:30:31 +02:00
bergware
40b0c4ea6e Prevent openbox from clipping 2018-06-02 08:03:57 +02:00
Eric Schultz
4353f0bbfb Merge pull request #345 from realies/patch-5
Strip HTML from back-end
2018-06-01 02:02:43 -05:00
realies
0b0d69d0aa Strip HTML from back-end
HTML tags are converted to HTML entities somewhere along the chain and `CreateDocker.php` generates:

`addLog('<b>Error: Image can not be deleted&lt;br&gt;&lt;i&gt;In use by other container(s)&lt;/i&gt;</b>');` 

![screen shot 2018-06-01 at 02 27 32](https://user-images.githubusercontent.com/5107843/40816307-277e4bc6-6544-11e8-95ac-f207b5c61076.png)
2018-06-01 02:45:09 +01:00
bergware
16330a358e Minor code adjustment 2018-05-30 07:12:22 +02:00
bergware
f751950e1c Make cpu-load and mem-load only visible in advanced mode 2018-05-29 22:20:06 +02:00
bergware
ddc8e59d23 Change file permission 2018-05-29 15:13:33 +02:00
bergware
6377e8bf86 Change file permission 2018-05-29 15:11:54 +02:00
bergware
7ac37e493f Make docker_load script start/stop event driven 2018-05-29 14:49:47 +02:00
bergware
14e69b877e Docker: added shell/bash selection for console 2018-05-29 14:03:27 +02:00
bergware
17088573e7 Docker: added cpu load and memory load display 2018-05-29 14:02:30 +02:00
Eric Schultz
a81508cffe bug fix: prevent deleting user template when (letter case) renaming a docker container 2018-05-26 12:15:36 -05:00
Eric Schultz
46cfa87791 apcups: ensure numeric fields are 0 if the values are empty 2018-05-26 10:35:16 -05:00
Eric Schultz
902fcd4dcf Merge pull request #343 from Squidly271/master
Remove unused tags from docker templates
2018-05-24 13:34:00 -05:00
Squidly271
789470f0e5 Remove MinVer & DonateImg from templates
MinVer I though would be far more used, but thus far it doesn't appear to be used at all, and the donation image has been deprecated from the next release of CA
2018-05-18 16:15:24 -04:00
Squidly271
e2f9cb956e Merge pull request #1 from limetech/master
LT catchup
2018-05-18 15:58:55 -04:00
tom mortensen
03a973f540 Merge pull request #342 from bergware/master
Minor style adjustment for Docker containers
6.5.2
2018-05-14 07:40:18 -07:00
bergware
b8730e0c65 Minor style adjustment for VMs 2018-05-13 10:53:49 +02:00
bergware
0b5d3f1b51 Minor style adjustment for VMs 2018-05-13 10:51:52 +02:00
bergware
5b9725830f Minor style adjustment for paused VMs 2018-05-13 10:48:49 +02:00
bergware
22e444a5f2 Minor style adjustment for Docker containers 2018-05-13 10:28:25 +02:00
tom mortensen
54efa5b1df Merge pull request #341 from bergware/master
Add release notes (if existing) to version string in header
2018-05-12 18:10:03 -07:00
bergware
a56c3b806b Add release notes to version string in header 2018-05-12 13:27:44 +02:00
bergware
578d011b43 Fixed regression error in docker_cfg file 2018-05-12 12:39:41 +02:00
bergware
b6bb0435d4 Merge remote-tracking branch 'limetech/master' 2018-05-11 00:44:26 +02:00
bergware
1c36dbe818 Add release notes to version string in header 2018-05-11 00:43:51 +02:00
bergware
82e8c98de6 Fixed incorrect display of memory size on dashboard
Memory size is incorrectly displayed when a parity check is running
2018-05-10 20:13:31 +02:00
bergware
5df3285b81 Add release notes to version string in header 2018-05-10 18:57:16 +02:00
bergware
04a48a9ffa Add release notes to version string in header 2018-05-10 18:54:01 +02:00
bergware
856d9bbf57 Add release notes to version string in header 2018-05-10 18:44:55 +02:00
bergware
43ee5e09f7 Add release notes to version string in header 2018-05-10 18:12:27 +02:00
bergware
56653f9262 Add release notes (if existing) to version string in header 2018-05-10 08:05:02 +02:00
tom mortensen
6cd36ca71d Merge pull request #340 from bergware/master
Syslinux config: basic and advanced mode
2018-05-09 08:22:47 -07:00
bergware
ca94bbf55a Syslinux config: basic and advanced mode 2018-05-09 09:11:20 +02:00
tom mortensen
7c9031cf26 Merge pull request #339 from shayne/master
Add support for Docker Labels to Docker plugin
2018-05-07 12:05:47 -07:00
Shayne Sweeney
c1c99f69e1 Add additional %s 2018-05-07 08:53:13 -07:00
tom mortensen
5148a598a6 Merge pull request #338 from bergware/master
Docker: support custom bridge networks without port bindings
2018-05-07 07:39:19 -07:00
bergware
6dd74781c7 Syslinux config: basic and advanced mode 2018-05-07 08:24:24 +02:00
bergware
c6bb9fdc01 Syslinux config: basic and advanced mode 2018-05-07 08:23:46 +02:00
bergware
74a47e4087 Make SMB extra auto sizeable 2018-05-07 08:15:58 +02:00