Isaac Connor
|
f620781f7e
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-17 21:07:00 -04:00 |
Isaac Connor
|
aaa7844350
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-17 14:18:01 -07:00 |
Isaac Connor
|
10a191ae5b
|
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
|
2018-04-17 14:14:40 -07:00 |
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
Isaac Connor
|
c043a157ad
|
spacing and add Server function
|
2018-04-17 12:37:30 -04:00 |
Isaac Connor
|
92c8b9038c
|
fix to group caching and group deleting
|
2018-04-17 12:36:35 -04:00 |
Isaac Connor
|
196b8c52dc
|
Apply multiport to event viewing as well
|
2018-04-17 12:35:59 -04:00 |
Isaac Connor
|
ef70ff86e9
|
cleanup zmaControl
|
2018-04-17 11:36:14 -04:00 |
Isaac Connor
|
2860e067bc
|
Fix caching when an array is passed to new
|
2018-04-15 10:26:57 -04:00 |
Isaac Connor
|
bef7098cb4
|
Fix Event->Storage()
|
2018-04-15 10:26:38 -04:00 |
Isaac Connor
|
998d60a4b2
|
whitespace
|
2018-04-14 22:26:57 -04:00 |
Isaac Connor
|
ce5e484f2a
|
Work harder to ensure we return a Storage object
|
2018-04-14 21:50:27 -04:00 |
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
Isaac Connor
|
47b871ed9f
|
implement MIN_STREAMING_PORT for Multi-server
|
2018-04-11 13:50:35 -07:00 |
Isaac Connor
|
03ff2fcde4
|
add caching and find_one to Storage and Groups
|
2018-04-10 13:05:37 -07:00 |
Isaac Connor
|
74fb8db5e2
|
make configvals global
|
2018-04-06 14:52:39 -04:00 |
Isaac Connor
|
530ac15344
|
remove csrf_startup
|
2018-04-06 14:46:33 -04:00 |
Isaac Connor
|
7076ff1b1b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-06 14:42:30 -04:00 |
Isaac Connor
|
53ce8c008a
|
move auth functions into it's own file
|
2018-04-06 14:36:23 -04:00 |
Isaac Connor
|
7b23ef80a4
|
blah
|
2018-04-06 14:31:11 -04:00 |
Mike Brown
|
c4a00e0657
|
changing the querySep in Event.php to allow gapless playback
|
2018-04-05 20:42:15 -05:00 |
Isaac Connor
|
140f11fd58
|
fix clearing groups
|
2018-04-05 13:10:25 -04:00 |
Isaac Connor
|
2a000cb5f8
|
fix clearing groups
|
2018-04-05 13:09:14 -04:00 |
Isaac Connor
|
6faf9b5c35
|
fix including auth on remote restart
|
2018-04-05 11:24:47 -04:00 |
Isaac Connor
|
1033755dc8
|
add missing {
|
2018-04-04 16:46:38 -04:00 |
Isaac Connor
|
6ebedff2e1
|
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
|
2018-04-04 16:45:25 -04:00 |
Isaac Connor
|
48ff480907
|
whitespace
|
2018-04-03 10:36:14 -07:00 |
Isaac Connor
|
b26707b647
|
fix resetting DiskSpace
|
2018-04-03 09:57:14 -07:00 |
Isaac Connor
|
793f630ee0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-02 10:43:07 -07:00 |
Isaac Connor
|
df3a5b7d58
|
must reopen the session before destorying it
|
2018-03-29 19:19:08 -04:00 |
Isaac Connor
|
3fe5bb6fe2
|
open and close the session around user login
|
2018-03-29 11:30:20 -04:00 |
Isaac Connor
|
f8457e04e2
|
clean out commented out code
|
2018-03-29 11:30:09 -04:00 |
Isaac Connor
|
914de097db
|
Fix typo
|
2018-03-23 13:34:46 -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
|
f64ef370c9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-20 12:18:42 -07:00 |
Isaac Connor
|
eade5316b9
|
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
|
2018-03-20 12:18:07 -07:00 |
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -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 |
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
|
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
|
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
|
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
|
bfbefc4c32
|
Use our new Control object to do the saving instead of a generic function
|
2018-02-26 07:31:48 -08:00 |