Isaac Connor
|
62a0890383
|
Merge pull request #89 from pliablepixels/ui-tweaks
Ui tweaks for storage areas
|
2018-03-27 11:00:25 -04:00 |
Isaac Connor
|
d5319dd046
|
Merge pull request #91 from pliablepixels/90-group-incomplete
Fix for Event details apis (anything that needs groups to be loaded)
|
2018-03-27 11:00:03 -04:00 |
Pliable Pixels
|
d3350919de
|
Reintroduced empty check rule, closed paranthesis
|
2018-03-27 10:55:36 -04:00 |
Isaac Connor
|
3a5ff289d0
|
perfect the whitespace
|
2018-03-27 10:04:32 -04:00 |
Isaac Connor
|
bcc7011871
|
update sql loading code in Reload, which will automatically do the db locking
|
2018-03-27 10:04:19 -04:00 |
Pliable Pixels
|
caffe5f7c9
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:55:15 -04:00 |
Pliable Pixels
|
1b5d802890
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:43:58 -04:00 |
Pliable Pixels
|
5b7011c61b
|
commented out incomplete definition - please complete it if you need it
|
2018-03-27 03:58:28 -04:00 |
Pliable Pixels
|
b077cc8900
|
table header - keep consistent
|
2018-03-26 11:50:14 -04:00 |
Pliable Pixels
|
dfcee7c6c1
|
table header - keep consistent
|
2018-03-26 11:14:46 -04:00 |
Pliable Pixels
|
411e1d05f2
|
used chosen for log filters
|
2018-03-26 11:09:35 -04:00 |
Pliable Pixels
|
f790306990
|
added account icon
|
2018-03-25 16:18:50 -04:00 |
Pliable Pixels
|
980684a2f0
|
adjusted h1 size
|
2018-03-25 16:09:31 -04:00 |
Pliable Pixels
|
cc2f285408
|
log view tweaks, cleaned up header issues
|
2018-03-25 16:01:04 -04:00 |
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
|
0bb1c5ce71
|
load groups when duping a monitor
|
2018-03-23 13:35:45 -07:00 |
Isaac Connor
|
85c757d2b1
|
Include group in parents list display
|
2018-03-23 13:35:02 -07:00 |
Isaac Connor
|
914de097db
|
Fix typo
|
2018-03-23 13:34:46 -07:00 |
Isaac Connor
|
4b72d4771e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-23 13:11:14 -07:00 |
Isaac Connor
|
161a0c81f3
|
pull
add mutex around log to db
|
2018-03-23 14:34:50 -04:00 |
Isaac Connor
|
fd9c93d3e2
|
add a mutex around logging to db
|
2018-03-23 14:18:41 -04:00 |
Isaac Connor
|
01f159c20e
|
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
|
2018-03-23 13:37:43 -04:00 |
Isaac Connor
|
2107e5b223
|
whitespace
|
2018-03-23 12:50:53 -04:00 |
Isaac Connor
|
c83e259160
|
revert to v3.1.0 of CRud
|
2018-03-22 12:01:38 -04:00 |
Isaac Connor
|
11cf3ce482
|
whitespace
|
2018-03-22 11:33:24 -04:00 |
Isaac Connor
|
43bdaff0a3
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-22 11:32:22 -04:00 |
Isaac Connor
|
36ca1d417d
|
code document
|
2018-03-22 10:26:05 -04:00 |
Isaac Connor
|
ccf0336c9d
|
whitespace
|
2018-03-22 10:25:56 -04:00 |
Isaac Connor
|
b220b8f588
|
mostly white space fixes, but also, unlock on error condition
|
2018-03-22 10:25:47 -04:00 |
Isaac Connor
|
06f10e0ed3
|
fix double free of mysql_result
|
2018-03-22 10:04:41 -04:00 |
Isaac Connor
|
50696319cc
|
Always error out when stream fails, even on EOF. Just don't log EOF as an error.
|
2018-03-22 09:25:35 -04:00 |
Isaac Connor
|
7d4652e37b
|
make group and function popups bigger
|
2018-03-21 11:33:10 -07:00 |
Isaac Connor
|
61d438511f
|
Fixes to delete
|
2018-03-21 11:32:54 -07:00 |
Isaac Connor
|
a037974e26
|
Fix automatic server selection
|
2018-03-21 11:25:42 -07:00 |
Isaac Connor
|
e0b73e9794
|
Merge branch 'cake-2.10.8' into storageareas
|
2018-03-21 13:11:33 -04:00 |
Isaac Connor
|
eddc03db14
|
custom version of crud 3.0.10 with Object to CakeObject fix
|
2018-03-21 13:10:51 -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 |
Matthew Trescott
|
afc3e160a7
|
Fix the second part of #2064 (#2066)
* Fix postinst with mysql. See bug #2064
* Fix mistake
|
2018-03-21 11:05:48 -04:00 |
Isaac Connor
|
124d2b20eb
|
remove version control marker
|
2018-03-21 10:51:47 -04:00 |