Andrew Bauer
|
c3fa7ea940
|
Merge pull request #867 from ZoneMinder/analysis_image_optimisation
analysis optimisations
|
2015-06-23 08:13:34 -05:00 |
Isaac Connor
|
e4106e34a1
|
put back build replacements, don't know how I lost those
|
2015-06-22 13:56:27 -04:00 |
|
Andrew Bauer
|
91e7281695
|
Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
reverse the if statement to reduce indenting
|
2015-06-22 12:53:06 -05:00 |
|
Isaac Connor
|
612e96bbfe
|
fix problem causing processes to not be restarted. Also, tabs to spaces
|
2015-06-22 13:37:26 -04:00 |
Isaac Connor
|
4be341986f
|
Merge pull request #897 from pliablepixels/881-api-branch
Fixed events API to remove thumbnail code
|
2015-06-22 13:01:15 -04:00 |
|
Isaac Connor
|
ec6c6b3ace
|
typo fix
|
2015-06-22 09:26:17 -04:00 |
Pliable Pixels
|
1a0d4d2221
|
Console now shows custom run state in header (if applicable)
|
2015-06-21 09:31:21 -04:00 |
|
Pliable Pixels
|
e758d9bf7c
|
Modified to handle setting isActive for custom states
|
2015-06-21 09:30:46 -04:00 |
|
Pliable Pixels
|
754091b55d
|
Added isRunning column
|
2015-06-21 09:30:23 -04:00 |
|
Pliable Pixels
|
d2472f177d
|
Added isRunning column
|
2015-06-21 09:30:14 -04:00 |
|
Pliable Pixels
|
719a903d43
|
Fixed events API to remove thumbnail code
|
2015-06-20 20:08:10 -04:00 |
|
Pliable Pixels
|
138e931e24
|
Fixed events API to remove thumbnail code
|
2015-06-20 19:57:55 -04:00 |
Andrew Bauer
|
d03469125a
|
Add perl-podlators build dependency to redhat distros
|
2015-06-20 18:07:29 -05:00 |
|
Andrew Bauer
|
fa835359a1
|
Add install target for C binary man pages
|
2015-06-20 17:33:13 -05:00 |
|
Andrew Bauer
|
4deb0d53c8
|
Add pod documentation to C binaries
|
2015-06-20 17:11:20 -05:00 |
|
Andrew Bauer
|
13b9921680
|
Modify zmsystemctl pod documentation
|
2015-06-20 16:13:40 -05:00 |
|
Andrew Bauer
|
fd239f6545
|
Generate man pages for perl scripts in the bin folder
|
2015-06-20 15:22:11 -05:00 |
|
Andrew Bauer
|
1acc1f4fd8
|
Merge pull request #895 from pliablepixels/893-foscam-9831W-and-other-foscams
893 foscam 9831 w and other foscams
|
2015-06-19 22:18:21 +02:00 |
|
Pliable Pixels
|
b41538fe65
|
Added definition for Foscam FI8918W
|
2015-06-19 15:51:07 -04:00 |
|
Pliable Pixels
|
67f1914e26
|
Added definition for Foscam FI8918W
|
2015-06-19 15:48:03 -04:00 |
|
Pliable Pixels
|
f8cc27e224
|
Protocol for 8918W
|
2015-06-19 15:45:50 -04:00 |
|
Pliable Pixels
|
991291ce67
|
declared so perl does not complain of globals
|
2015-06-19 14:12:08 -04:00 |
|
Andrew Bauer
|
07bd7de82f
|
Merge pull request #894 from pliablepixels/893-foscam-9831W-and-other-foscams
893 foscam 9831 w and other foscams
|
2015-06-19 20:11:03 +02:00 |
|
Pliable Pixels
|
be4a434dbd
|
Added 9831W to update script
|
2015-06-19 13:57:19 -04:00 |
|
Pliable Pixels
|
35e8a9d89b
|
Added 9831W to PTZ protocol DB
|
2015-06-19 13:06:00 -04:00 |
|
Pliable Pixels
|
39ee845ff0
|
Updated 9831W foscam script
|
2015-06-19 12:58:40 -04:00 |
|
Isaac Connor
|
69cdce22e1
|
cleanout build files
|
2015-06-19 12:04:09 -04:00 |
|
Isaac Connor
|
1f87a696cf
|
improve debugging for analysis check and restart if can't read shared data
|
2015-06-19 11:07:20 -04:00 |
|
Isaac Connor
|
3be4a0aa11
|
re-enable restarting capture process if mem invalid
|
2015-06-19 09:04:19 -04:00 |
|
Isaac Connor
|
a9175705c1
|
reverse the if statement to reduce indenting
|
2015-06-19 08:59:49 -04:00 |
|
Andrew Bauer
|
8d309fbd6e
|
Merge pull request #874 from seeebek/master
German translation update
|
2015-06-19 13:50:55 +02:00 |
|
Isaac Connor
|
5dd1c6cf38
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-06-18 13:09:56 -04:00 |
|
Isaac Connor
|
99384983a5
|
merge from recent ubuntu1504 switch to ffmpeg version of av libs
|
2015-06-18 13:09:42 -04:00 |
|
Isaac Connor
|
dcb7b1d259
|
Merge pull request #883 from pliablepixels/881-bootstrap-loading-config
881 bootstrap loading config
|
2015-06-14 14:43:01 -04:00 |
|
Isaac Connor
|
5b9a74ce1f
|
Merge pull request #884 from SteveGilvarry/MergeDebianPatches
Use avconv as alternative to ffmpeg executable
|
2015-06-14 14:42:10 -04:00 |
|
Isaac Connor
|
21b6bc76c9
|
Merge pull request #886 from pliablepixels/pliablepixels-api-documentation
Updated API document
|
2015-06-14 14:41:55 -04:00 |
Pliable Pixels
|
71665a3315
|
Added updated API information
Reflected new APIs, corrected and updated examples
|
2015-06-14 11:21:00 -04:00 |
|
Pliable Pixels
|
3ef916f49c
|
Update api.rst
|
2015-06-14 10:51:28 -04:00 |
SteveGilvarry
|
22ec67dd3f
|
Find avconv as alternative to ffmpeg
|
2015-06-14 16:51:31 +10:00 |
|
pliablepixels
|
7112001b64
|
getVersion.json now returns both ZM version and API version
|
2015-06-13 16:33:15 +00:00 |
|
pliablepixels
|
12ba217de0
|
Added API version in addition to ZM version, also added loadConfig code that was there in the angular-ui branch but not merged to master
|
2015-06-13 16:32:37 +00:00 |
|
pliablepixels
|
11bd2139f4
|
Added API version in addition to ZM version
|
2015-06-13 16:30:28 +00:00 |
|
Isaac Connor
|
03de98980f
|
cleanup log
|
2015-06-12 11:53:08 -04:00 |
|
Isaac Connor
|
18674b7973
|
cleanup
|
2015-06-12 11:51:43 -04:00 |
|
Isaac Connor
|
7759e57776
|
update changelog to match last snapshot
|
2015-06-12 11:50:10 -04:00 |
|
Isaac Connor
|
106d543367
|
add ubuntu15.04 using cmake with split packages
|
2015-06-12 11:20:24 -04:00 |
|
Isaac Connor
|
bda35ed4d6
|
fix bootstrap.ini substitution
|
2015-06-12 11:12:58 -04:00 |
|
Isaac Connor
|
ecb7720056
|
Merge pull request #882 from pliablepixels/881-merge-angularui-apis
Merged Angular UI branch API to master
|
2015-06-12 11:06:59 -04:00 |
|
Pliable Pixels
|
9b3ae210e5
|
Merge pull request #1 from knnniggett/881-merge-angularui-apis
Convert Crud to submodule
|
2015-06-11 13:06:00 -04:00 |
|
Andrew Bauer
|
d915d859ed
|
Convert Crud to submodule
|
2015-06-11 11:56:39 -05:00 |