Isaac Connor
|
f8f8dbe9fe
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-05-27 09:01:09 -04:00 |
|
Isaac Connor
|
1983f106f4
|
Add a missing sth->finish
|
2016-05-27 09:01:01 -04:00 |
|
Isaac Connor
|
b0116f25e9
|
put back in the lines that populate ZM_SERVER_ID. They got lost somehow in the perl db undo
|
2016-05-27 08:59:46 -04:00 |
|
Isaac Connor
|
419e67caa1
|
Put back the code that populates ZM_SERVER_ID
|
2016-05-26 12:42:22 -04:00 |
|
Isaac Connor
|
3058dd9463
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 12:19:33 -04:00 |
|
Isaac Connor
|
f461bc1e80
|
get rid of extra )
|
2016-05-26 12:18:58 -04:00 |
|
Isaac Connor
|
05709f3084
|
Merge branch 'id_on_console' into storageareas
|
2016-05-26 11:17:41 -04:00 |
|
Isaac Connor
|
f969186abb
|
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
|
2016-05-26 11:15:13 -04:00 |
Andrew Bauer
|
730abc9789
|
make zones unclickable when zm is not running
|
2016-05-26 09:35:36 -05:00 |
Andrew Bauer
|
1972c4116b
|
Merge pull request #1486 from connortechnology/update_image_view
Update image view
|
2016-05-26 09:05:14 -05:00 |
|
Isaac Connor
|
b9322a02e8
|
Merge branch 'get_rid_of_ConfigAdmin' into storageareas
|
2016-05-26 09:56:16 -04:00 |
|
Isaac Connor
|
e329bacb78
|
remove deprecated ConfigAdmin
|
2016-05-26 09:51:48 -04:00 |
Isaac Connor
|
f99f394a3d
|
hopefully fixup zm_av_packet_ref for libavtools
|
2016-05-25 21:05:08 -04:00 |
|
Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -04:00 |
|
Isaac Connor
|
abd43bdc9f
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-29 14:25:11 -04:00 |
|
Isaac Connor
|
f9fd715657
|
Merge branch 'master' into storageareas
|
2016-09-29 14:25:02 -04:00 |
|
Isaac Connor
|
eb30a9079e
|
code style, commenting
|
2016-09-29 14:04:32 -04:00 |
|
Isaac Connor
|
52df5174e7
|
fix zm_av_frame_alloc define for trusty
|
2016-09-29 13:21:24 -04:00 |
|
Isaac Connor
|
af0af70732
|
filter successful logins
|
2016-09-29 12:35:10 -04:00 |
|
Isaac Connor
|
f1012f60ec
|
add libswresample to build depends
|
2016-09-29 12:31:02 -04:00 |
|
Isaac Connor
|
0b5f597918
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-29 12:23:04 -04:00 |
|
Isaac Connor
|
07d8d008ba
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 12:22:56 -04:00 |
|
Isaac Connor
|
0d08c50199
|
change quotes
|
2016-09-29 12:22:01 -04:00 |
|
Isaac Connor
|
795665f8c7
|
Merge branch 'startup_time' into storageareas
|
2016-09-29 11:07:55 -04:00 |
|
Isaac Connor
|
29c015ecd3
|
need to put zmGetStartupTime in exports
|
2016-09-29 11:07:33 -04:00 |
|
Isaac Connor
|
441020e8b8
|
fix_type
|
2016-09-29 10:49:40 -04:00 |
|
Isaac Connor
|
ab8b58ba48
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:44:30 -04:00 |
|
Isaac Connor
|
d1facae287
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:12:05 -04:00 |
|
Isaac Connor
|
5c867aa5f5
|
Merge branch 'fix_auth_timeout' into storageareas
|
2016-09-29 10:10:38 -04:00 |
|
Isaac Connor
|
02ef99584c
|
Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78.
|
2016-09-29 09:30:12 -04:00 |
|
Isaac Connor
|
f5a29bb679
|
Revert "add recipes to detect libv4l2"
This reverts commit d67cb0d0df.
|
2016-09-29 09:29:57 -04:00 |
|
Andrew Bauer
|
ceaacf91bf
|
Merge pull request #1470 from connortechnology/api_improvements
Api improvements
|
2016-05-25 12:45:03 -05:00 |
|
Isaac Connor
|
b309837f02
|
put back zmDbRow use
|
2016-05-25 10:21:44 -04:00 |
|
Isaac Connor
|
7a08d4620f
|
Merge branch 'master' into storageareas
|
2016-05-25 10:17:46 -04:00 |
Isaac Connor
|
a0af99459a
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-25 10:12:22 -04:00 |
|
Andrew Bauer
|
575f8ec265
|
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
|
2016-05-25 08:44:17 -05:00 |
|
Isaac Connor
|
8f1596d683
|
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
|
2016-05-25 09:08:28 -04:00 |
|
Isaac Connor
|
aedba1bc7f
|
whitespace, google code style. Adds special cases for ServerId Attribute. ANd uses * to load all event fields instead of specifying each one.
|
2016-05-24 16:49:04 -04:00 |
|
Isaac Connor
|
7cfa2a5eaa
|
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
|
2016-05-24 16:46:34 -04:00 |
|
Isaac Connor
|
277fdafa85
|
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
|
2016-05-24 16:45:55 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Isaac Connor
|
ae1eb94f27
|
fix getStreamHTML when using helper
|
2016-05-24 15:10:37 -04:00 |
Isaac Connor
|
3f880fad3a
|
Merge pull request #1500 from knnniggett/zmdc_unlink
remove one unlink, add better error reporting to the rest
|
2016-05-24 14:35:39 -04:00 |
|
Andrew Bauer
|
0052bb080c
|
unlink only if file exists
|
2016-05-24 12:13:17 -05:00 |
|
Isaac Connor
|
00abd36af8
|
fix the other case of the wrong case of rtsp
|
2016-05-24 12:19:31 -04:00 |
|
Isaac Connor
|
056eed6df9
|
fix to show RTSP describe option when switching back to rtsp
|
2016-05-24 12:15:59 -04:00 |
|
Isaac Connor
|
0522b03364
|
Merge pull request #1499 from knnniggett/mserver_msg
move multiserver message to display once during startup only
|
2016-05-24 11:08:11 -04:00 |
|
Andy Bauer
|
d12b9dc16d
|
fix typo. needs }
|
2016-05-24 09:24:18 -05:00 |