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
|
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
|
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
|
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 |
|
Isaac Connor
|
f682e1da9e
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2018-03-21 10:40:32 -04:00 |
|
Isaac Connor
|
c34ab7c172
|
fix merge and sleep for interval instead of 1 hour
|
2018-03-21 09:28:39 -04:00 |
|
Isaac Connor
|
0d3957611a
|
Merge branch 'zmtelemetry_improvements' of github.com:ConnorTechnology/ZoneMinder into zmtelemetry_improvements
|
2018-03-21 09:26:54 -04:00 |
|
Isaac Connor
|
b50fd690dc
|
exit if not enabled, hence reducing code nesting. Must update lastCheck
|
2018-03-21 09:22:29 -04:00 |
Isaac Connor
|
ba7b2447a2
|
Merge branch 'master' into zmtelemetry_improvements
|
2018-03-21 09:07:43 -04:00 |
Andrew Bauer
|
f60a6c4b4f
|
Roll packpack back to 7cf23ee
fix broken rpm builds
|
2018-03-20 19:34:27 -05:00 |
|
Isaac Connor
|
6cfb550cf4
|
add cast to remove compile warning
|
2018-03-20 14:49:01 -04:00 |
|
Andrew Bauer
|
7c7002f5de
|
Merge pull request #2069 from sgunji/update-ja-php
update japanese php
|
2018-03-19 08:02:08 -05: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
|
4bb26519f6
|
allow errors, and add a missing fi
|
2018-03-16 11:59:29 -04:00 |
|
Isaac Connor
|
ea38f7cca4
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-15 11:43:15 -04:00 |
|
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
|
Isaac Connor
|
d82d2e7765
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-03-14 10:44:57 -04:00 |
|
Isaac Connor
|
a73a7b438c
|
whitespace to google code style specs. 2 spaces
|
2018-03-14 10:44:43 -04:00 |
|
Andrew Bauer
|
280dd8b04c
|
Merge pull request #2063 from ZoneMinder/fix_2061
Use Event.Width and Event.Height instead of Monitor.Width and Monitor…
|
2018-03-14 09:37:34 -05:00 |
|
Isaac Connor
|
79b10b0166
|
Use Event.Width and Event.Height instead of Monitor.Width and Monitor.Height when generating video of an event.
|
2018-03-14 10:09:31 -04:00 |
mcdamo
|
aa0a831223
|
Update Host.php (#2062)
Remove whitespace causing problems with session authentication
|
2018-03-13 22:28:38 -04:00 |
Isaac Connor
|
6f3d16fe10
|
label_format can be null
|
2018-03-13 12:06:03 -07:00 |