Pliable Pixels
|
1179b6ddc4
|
rounded top for tables and highlights
|
2018-03-25 11:43:34 -04:00 |
|
Pliable Pixels
|
bf57b65ebb
|
reduced 2nd row of navbar text
|
2018-03-25 09:56:41 -04:00 |
|
Pliable Pixels
|
809e58fae6
|
acct icon to material
|
2018-03-25 09:44:30 -04:00 |
|
Pliable Pixels
|
14f638e009
|
replaced ionic fonts with material design icons
|
2018-03-25 09:28:00 -04:00 |
|
Pliable Pixels
|
acdc076b84
|
padding to navbutton
|
2018-03-24 18:36:10 -04:00 |
|
Pliable Pixels
|
10aedb51a6
|
reduced size of totals 2nd row
|
2018-03-24 18:30:50 -04:00 |
|
Pliable Pixels
|
a68cc79437
|
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
|
2018-03-24 18:25:39 -04:00 |
|
Pliable Pixels
|
0b31cc4d3d
|
2nd level header tweak
|
2018-03-24 17:34:46 -04:00 |
|
Pliable Pixels
|
b8f6c2277f
|
clone icons
|
2018-03-24 10:21:59 -04:00 |
|
Pliable Pixels
|
140217bef6
|
icons, muted colors, text tightening
|
2018-03-24 09:59:39 -04:00 |
|
Pliable Pixels
|
a9d6bd22bc
|
shortened monitor add
|
2018-03-24 09:59:08 -04:00 |
Isaac Connor
|
c83e259160
|
revert to v3.1.0 of CRud
|
2018-03-22 12:01:38 -04:00 |
|
Isaac Connor
|
a4fee5c91c
|
further merges from cakephp 2.10.8
|
2018-03-21 13:09:55 -04:00 |
|
Isaac Connor
|
1346558d59
|
Merge branch 'cake-2.10.8' of https://github.com/knnniggett/ZoneMinder into cake-2.10.8
|
2018-03-21 11:15:11 -04:00 |
|
Isaac Connor
|
f682e1da9e
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2018-03-21 10:40:32 -04:00 |
sgunji
|
b6c0e1b834
|
update japanese php
added header
|
2018-03-19 21:37:17 +09:00 |
Andy Bauer
|
0afe1e0971
|
recreate bootstrap.php.in
|
2018-03-17 21:16:17 -05:00 |
|
Andy Bauer
|
f9b7f931c9
|
upgrade lib folder to cakephp 2.10.8
|
2018-03-17 20:24:15 -05:00 |
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
mcdamo
|
aa0a831223
|
Update Host.php (#2062)
Remove whitespace causing problems with session authentication
|
2018-03-13 22:28:38 -04:00 |
Andrew Bauer
|
16a2c173cb
|
fix Column 'Method' cannot be null
|
2018-03-10 20:29:25 -06:00 |
|
Andrew Bauer
|
0df59c26b8
|
fix typo
Fix unable to enable camera
|
2018-03-10 19:48:53 -06:00 |
|
Isaac Connor
|
d1837a96b4
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-09 07:25:28 -05:00 |
|
Isaac Connor
|
b4c13d56d6
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-06 12:29:59 -05:00 |
tim
|
0654c7e3b2
|
Adding group handling in API
|
2018-03-04 23:01:52 -08:00 |
Steve Gilvarry
|
1c740de5dc
|
Add Return False to Event Back
|
2018-03-04 13:37:30 +11:00 |
|
Steve Gilvarry
|
db8ab28845
|
Add return false to window.history.back
Adding this makes it work in Safari
|
2018-03-04 08:37:21 +11:00 |
|
Andrew Bauer
|
ed4dac761a
|
Merge pull request #2049 from ZoneMinder/fix_2044
Fix 2044
|
2018-03-03 12:49:57 -06:00 |
|
Isaac Connor
|
3fc7ebee6c
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-03 09:32:23 -08:00 |
|
Isaac Connor
|
2864876d28
|
fix spacing, add code comment
|
2018-03-03 09:25:04 -08:00 |
Isaac Connor
|
c53b6ffbb0
|
rework montagereview to load data faster and leave event and frame data in json objects
|
2018-03-02 18:26:50 -08:00 |
|
Andrew Bauer
|
3e77a85549
|
url to css/spinner.css should be relative
fixes http 404 not found errors for this css file
|
2018-03-02 17:19:10 -06:00 |
|
Isaac Connor
|
7e628bc3fd
|
add showing groups under Monitor Name on console
|
2018-03-01 19:23:46 -08:00 |
|
Isaac Connor
|
9a157bf4ca
|
add Type, MaxFPS, AlarmMaxFPS to field defaults
|
2018-03-01 19:23:27 -08:00 |
|
Isaac Connor
|
debe4607bc
|
add Parent and Parents functions
|
2018-03-01 19:23:03 -08:00 |
|
Isaac Connor
|
c5eec7e2fd
|
hide save button on successful form completion so we don't get a duplicate submit
|
2018-02-27 15:10:45 -08:00 |
|
Isaac Connor
|
83fad681b3
|
use button tags and hide the button content after click
|
2018-02-27 11:49:13 -08:00 |
|
Isaac Connor
|
c50627fd88
|
GroupIds needs to be an array
|
2018-02-27 11:21:04 -08:00 |
|
Isaac Connor
|
0312dc3c2d
|
Add Group saving to Monitor saving
|
2018-02-27 11:20:52 -08:00 |
|
Isaac Connor
|
67cc7dcf7c
|
Add a GroupIds function to return the groups
|
2018-02-27 11:20:41 -08:00 |
|
Isaac Connor
|
6a6eb87686
|
fix defaults
|
2018-02-26 18:00:02 -08:00 |
|
Isaac Connor
|
793e87c26d
|
Apply chosen style to group and linked monitors dropdown
|
2018-02-26 17:58:20 -08:00 |
|
Isaac Connor
|
735e36c2a8
|
split htmlSelect into htmlOptions
|
2018-02-26 17:08:30 -08:00 |
|
Isaac Connor
|
944298428a
|
break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options
|
2018-02-26 16:10:10 -08:00 |
|
Isaac Connor
|
92c34f6043
|
add Groups to monitor edit
|
2018-02-26 16:09:36 -08:00 |
|
Isaac Connor
|
9d1a8b1e18
|
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
|
2018-02-26 10:39:45 -08:00 |
|
Isaac Connor
|
bfbefc4c32
|
Use our new Control object to do the saving instead of a generic function
|
2018-02-26 07:31:48 -08:00 |
|
Isaac Connor
|
c6f632325e
|
create an object for Controls entries, with appropriate defaults
|
2018-02-26 07:31:22 -08:00 |
|
Isaac Connor
|
464b588f08
|
add a case for toggle, which are booleans and default them to false
|
2018-02-26 07:29:49 -08:00 |
|
Isaac Connor
|
9480adcc31
|
include authentication info when building the link to mp4
|
2018-02-22 13:05:53 -05:00 |