Isaac Connor
|
42ac3ceb3b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-07-09 11:00:05 -04:00 |
Isaac Connor
|
51631b84b4
|
cleanup generated files
|
2015-07-09 10:59:45 -04:00 |
Isaac Connor
|
1328ba456a
|
fix drop primary key line.
|
2015-07-07 09:43:56 -04:00 |
Andrew Bauer
|
8406818b00
|
Merge pull request #921 from pliablepixels/master
Added "RewriteBase /zm/api" for API routing
|
2015-07-05 08:34:28 -05:00 |
Pliable Pixels
|
073dd27c93
|
Merge pull request #1 from pliablepixels/pliablepixels-htaccess-api
Added "RewriteBase /zm/api" for API routing
|
2015-07-05 08:59:45 -04:00 |
Pliable Pixels
|
3a9c941213
|
Added "RewriteBase /zm/api" for API routing
|
2015-07-05 08:59:07 -04:00 |
Steve Gilvarry
|
39d152656a
|
Merge pull request #920 from ZoneMinder/zms_no_crash
Zms no crash
|
2015-07-04 06:58:32 +10:00 |
Isaac Connor
|
58448adb51
|
Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
|
2015-07-03 11:40:24 -04:00 |
Isaac Connor
|
3c5a9b796b
|
Merge branch 'master' into zms_no_crash
|
2015-07-03 11:34:42 -04:00 |
Andrew Bauer
|
c01f21764c
|
Merge pull request #919 from ZoneMinder/librt
add check for gettime in librt, needed for building on pi
|
2015-07-03 10:34:07 -05:00 |
Isaac Connor
|
e0da473449
|
add check for gettime in librt, needed for building on pi
|
2015-07-03 10:53:23 -04:00 |
Isaac Connor
|
5c065d4842
|
Merge pull request #915 from knnniggett/crud3
Dumb down Crud from 4.0 -> 3.0.10
|
2015-06-30 11:35:28 -04:00 |
Andrew Bauer
|
a738011c04
|
Update zm_update-1.28.99.sql
typo
|
2015-06-30 10:33:09 -05:00 |
Andrew Bauer
|
1b2f214340
|
Dumb down Crud from 4.0 -> 3.0.10
|
2015-06-30 10:26:29 -05:00 |
Andy Bauer
|
3ee481771a
|
Merge branch 'pliablepixels-898-isRunning-States'
|
2015-06-27 16:33:07 -05:00 |
Andy Bauer
|
1aebbec4e8
|
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
|
2015-06-27 16:32:32 -05:00 |
Andrew Bauer
|
64e030e794
|
Merge pull request #910 from ZoneMinder/multi-server
Add Servers Table and add Id PRIMARY KEY to States
|
2015-06-26 12:03:04 -05:00 |
Isaac Connor
|
09b052010e
|
remove extra comma
|
2015-06-26 10:57:44 -04:00 |
Isaac Connor
|
287ff93a4d
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-06-26 10:18:11 -04:00 |
Isaac Connor
|
2fba839e8b
|
Add Servers Table and add Id PRIMARY KEY to States
|
2015-06-26 10:17:07 -04:00 |
Isaac Connor
|
e570fdba00
|
Merge pull request #909 from knnniggett/mobile_skin
fix montage view issue in mobile skin
|
2015-06-26 10:09:45 -04:00 |
Andrew Bauer
|
592ecd8e94
|
fix montage view issue in mobile skin
|
2015-06-26 08:47:20 -05:00 |
Isaac Connor
|
956e2936a3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2015-06-25 16:26:49 -04:00 |
Isaac Connor
|
c0c02f0d6f
|
Merge pull request #906 from knnniggett/solaris_cmake
Solaris cmake
Looks good to me
|
2015-06-25 10:16:00 -04:00 |
Andrew Bauer
|
005d880453
|
typo
|
2015-06-25 08:07:31 -05:00 |
Andrew Bauer
|
3f6333a33d
|
modify polkit checks & move host os check
|
2015-06-25 08:01:24 -05:00 |
Andrew Bauer
|
2fa81ed6b6
|
Merge pull request #902 from bill-mcgonigle/fix_el7_build
Fix el7 build
|
2015-06-24 06:50:09 -05:00 |
Bill McGonigle
|
ec1c3cfed0
|
Add cmake ffmpeg include path hint for distros that put headers in include/ffmpeg.
|
2015-06-24 01:39:26 -04:00 |
Bill McGonigle
|
e3727af243
|
softlayer-dal appears to defunct as a sourceforge mirror. Get jscalendar from nbtelcom instead.
|
2015-06-24 01:32:53 -04:00 |
Andrew Bauer
|
d225bf983d
|
Update configure.ac
Add depreciated soon note.
|
2015-06-23 14:48:57 -05:00 |
Andrew Bauer
|
b867ee4c4c
|
Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
Zmwatch cleanup2
|
2015-06-23 08:36:42 -05:00 |
Andrew Bauer
|
30c7ab697c
|
Merge pull request #847 from ZoneMinder/faster_shutdown
faster shutdown
|
2015-06-23 08:19:25 -05:00 |
Andrew Bauer
|
2030b5e6ef
|
Merge pull request #870 from ZoneMinder/better_http_reading
alter the logic of ReadData. New behaviour is documented.
|
2015-06-23 08:16:44 -05:00 |
Andrew Bauer
|
951f13c82a
|
Merge pull request #892 from ZoneMinder/zmwatch_cleanup3
improve debugging for analysis check and restart if can't read shared data
|
2015-06-23 08:16:11 -05:00 |
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 |