Isaac Connor
|
f1e22f9265
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:32:57 -04:00 |
|
Isaac Connor
|
7acf6cb694
|
fix colon to semi colon
|
2016-05-06 14:32:52 -04:00 |
|
Isaac Connor
|
01397b6695
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 14:31:27 -04:00 |
|
Isaac Connor
|
83795805f2
|
Move state getting into index.php
|
2016-05-06 14:30:50 -04:00 |
|
Isaac Connor
|
1d673a0b8c
|
move header into a function in functions.php. Move event population into console.php
|
2016-05-06 14:30:32 -04:00 |
|
Isaac Connor
|
7df2685223
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 12:51:40 -04:00 |
|
Isaac Connor
|
e87a35b04d
|
Merge branch 'always_show_ptz' into storageareas
|
2016-05-06 12:51:15 -04:00 |
|
Isaac Connor
|
c9f1614e32
|
If the camera has no centering control, don't make it look like it does. This also removes a logged error
|
2016-05-06 12:51:03 -04:00 |
|
Isaac Connor
|
d5f1519829
|
Can't externally reference .js.php, they have to be inline js
|
2016-05-06 12:40:23 -04:00 |
Isaac Connor
|
18461b0c64
|
Add some debugging
|
2016-05-06 12:39:10 -04:00 |
|
Isaac Connor
|
b333b8ebee
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 12:06:47 -04:00 |
|
Isaac Connor
|
ee015ee674
|
whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup
|
2016-05-06 12:06:13 -04:00 |
|
Isaac Connor
|
44e5b566b8
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:56:24 -04:00 |
|
Isaac Connor
|
8405db4750
|
Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere
|
2016-05-06 11:56:03 -04:00 |
|
Isaac Connor
|
b3b9eaa7d5
|
better code for deprecate sequpdownarrays
|
2016-05-06 11:44:13 -04:00 |
|
Isaac Connor
|
be4f155160
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:42:46 -04:00 |
|
Isaac Connor
|
4784f8b630
|
deprecate the seqUp and seqDown arrays
|
2016-05-06 11:36:11 -04:00 |
|
Isaac Connor
|
4b838dc66c
|
deprecate minSequence and maxSequence
|
2016-05-06 11:29:49 -04:00 |
|
Isaac Connor
|
b0e977f8ed
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 11:26:53 -04:00 |
|
Isaac Connor
|
55567b66e9
|
deprecate minSequence and maxSequence use
|
2016-05-06 11:04:35 -04:00 |
|
Isaac Connor
|
b0a057724a
|
document minSequence use
|
2016-05-06 11:04:22 -04:00 |
|
Isaac Connor
|
0bf54fc266
|
Merge branch 'schrorg-RTSP-IPv6'
|
2016-05-06 08:32:39 -04:00 |
|
Isaac Connor
|
fd896acd50
|
Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6
|
2016-05-06 08:32:21 -04:00 |
|
Isaac Connor
|
c050969141
|
Merge object model classes from storageareas
|
2016-05-05 15:33:28 -04:00 |
|
Isaac Connor
|
4b782efd54
|
Whitespace fixes
|
2016-05-05 15:30:24 -04:00 |
|
Isaac Connor
|
49dc917b2e
|
Merge isaac:ZoneMinder.p1 into storageareas
|
2016-05-05 15:24:14 -04:00 |
|
Isaac Connor
|
e101aed2d5
|
Remove IGNORE keyword, it is invalid
|
2016-05-05 15:10:30 -04:00 |
|
Isaac Connor
|
27b928839c
|
deprecate view=image-ffmpeg
|
2016-05-05 15:04:11 -04:00 |
|
Isaac Connor
|
f9a24d7171
|
bump today's release
|
2016-05-05 14:51:57 -04:00 |
|
Isaac Connor
|
e64376ed02
|
increase debug level for Zone motion detection
|
2016-05-05 14:51:41 -04:00 |
|
Isaac Connor
|
88a0bdc026
|
Add some code comments. Make mocord always honour section_length
|
2016-05-05 14:51:26 -04:00 |
|
Isaac Connor
|
e8cbb90125
|
increase log debug level for blend routing reporting
|
2016-05-05 14:50:50 -04:00 |
|
Isaac Connor
|
1f6425b1b7
|
Fix for SQL to load next and previous event
|
2016-05-05 14:50:15 -04:00 |
|
Isaac Connor
|
0e74778dda
|
add find and find_all functions
|
2016-05-05 14:49:57 -04:00 |
|
Isaac Connor
|
df960bb1ea
|
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
|
2016-05-05 14:49:40 -04:00 |
|
Isaac Connor
|
d342b11e64
|
remove servers references from header, they go in console
|
2016-05-04 09:07:29 -04:00 |
|
Isaac Connor
|
36f94dddec
|
cleanup merge problems
|
2016-05-03 14:46:22 -04:00 |
|
Isaac Connor
|
d25e75f485
|
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
|
2016-05-03 14:39:59 -04:00 |
|
Isaac Connor
|
c3628a8dfd
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 14:34:58 -04:00 |
|
Isaac Connor
|
4defe92911
|
Merge branch 'master' into updated-console
|
2016-05-03 14:22:37 -04:00 |
|
Isaac Connor
|
18442be77f
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 14:09:18 -04:00 |
Kyle Johnson
|
59d0de4313
|
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
|
2016-05-03 13:56:57 -04:00 |
|
Kyle Johnson
|
36da4aed88
|
Push monitor view back to before I messed with it
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
59af3913e7
|
Add additional post-compiliation files to .gitignore
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
b92c9f9be4
|
Add state modal to options view
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
3271d17a3a
|
Remove header from log view
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
bfda50b693
|
Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
dcd6449a9b
|
Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
464db86c53
|
Revert "Add sidebar and top nav to Monitors popup view"
This reverts commit 315fb3e857.
|
2016-05-03 13:55:38 -04:00 |
|
Kyle Johnson
|
237f1c3a9c
|
Change sidebar to lighter colors
|
2016-05-03 13:53:30 -04:00 |