mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-20 14:53:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,008 Commits 80 Branches 104 Tags
ef5d62a6c2d1e4cb554fbb34adfe818b60e30dfd
Commit Graph

1729 Commits

Author SHA1 Message Date
Isaac Connor
d39f57c4ff Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix 
Delete fixes for Events
 2015-09-28 14:46:01 -04:00
Pliable Pixels
a00fed480d Delete fixes for Events 2015-09-28 14:41:36 -04:00
Isaac Connor
cb18adef5c increase min height of zone edit popup so that buttons are visible 2015-09-28 13:01:07 -04:00
Isaac Connor
4e2ed00027 widen zone edit popup to fit the image 2015-09-28 12:54:54 -04:00
Isaac Connor
7d52c0b784 widen events popup to fit the thumbnail 2015-09-28 12:44:58 -04:00
Isaac Connor
b53603dee1 Merge pull request #1066 from pliablepixels/1065-recaptcha-ui-fix-when-vars-dont-exist 
fixed recaptcha showing up pre DB update
 2015-09-28 10:00:46 -04:00
Pliable Pixels
ee78ae5c49 restart monitor when edited via APIs 2015-09-28 09:31:57 -04:00
Pliable Pixels
727486d8f3 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:25 -04:00
Pliable Pixels
d751c3ad61 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:15 -04:00
Pliable Pixels
e5a6889253 fixed conflict 2015-09-24 15:51:16 -04:00
Pliable Pixels
939bdc90ef Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist 2015-09-24 15:45:34 -04:00
Pliable Pixels
23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
Pliable Pixels
5ca00c2ef5 fixed constant check when not defined 2015-09-24 09:57:53 -04:00
Pliable Pixels
ae6fd7daea fixed constant check when not defined 2015-09-24 09:57:43 -04:00
Pliable Pixels
48071d7dfc Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into 1065-recaptcha-ui-fix-when-vars-dont-exist 2015-09-24 09:38:57 -04:00
Pliable Pixels
25ab1f6ddd fixed recaptcha showing up pre DB update 2015-09-23 10:54:24 -04:00
Pliable Pixels
23d5e0e95b fixed recaptcha showing up pre DB update 2015-09-23 10:50:15 -04:00
Isaac Connor
fbc4f77491 Merge pull request #1049 from knnniggett/core.php 
remove core.php, modify core.php.default
 2015-09-23 09:07:29 -04:00
Dmitry Smirnov
333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Isaac Connor
c0139e87ad define ZM_BASE_PROTOCOL 2015-09-17 15:14:43 -04:00
Andrew Bauer
04fcc253bd Merge pull request #1048 from pliablepixels/1046-google-recaptcha 
Google recaptcha
 2015-09-01 08:18:54 -05:00
Pliable Pixels
2481c7a22e Handled situation where user enables captcha but forgets to supply keys 2015-08-31 20:39:43 -04:00
Pliable Pixels
22a7a1d53d Handled situation where user enables captcha but forgets to supply keys 2015-08-31 20:39:28 -04:00
Andy Bauer
827eebd38c remove core.php, modify core.php.default 2015-08-29 14:53:39 -05:00
Pliable Pixels
feeb890be2 removed recaptcha client dependency 2015-08-29 15:14:20 -04:00
Pliable Pixels
f7fea2fe48 Removed dependency on recaptcha client library 2015-08-29 15:13:15 -04:00
Pliable Pixels
73fa051ef8 Google recaptcha 2015-08-29 13:29:52 -04:00
Andy Bauer
395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00
Isaac Connor
1cf54d2e38 Merge pull request #1026 from schrorg/blacken-zones 
Add new zone type - privacy zones
 2015-08-27 09:14:16 -04:00
Isaac Connor
6093587ff2 Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix 
1038 fixing state mgmt 1030 is active fix
 2015-08-27 09:08:50 -04:00
Robin Daermann
d68e8e8f68 Restart capture process after deleting a Privacy zone 2015-08-27 10:12:54 +02:00
Robin Daermann
dc8a3769e7 Make the capture process restart if a Privacy zone got changed 2015-08-27 09:45:12 +02:00
Pliable Pixels
08d177185c added oninput for text field handling 2015-08-26 11:22:09 -04:00
Pliable Pixels
02a6443c3b Cleaned up button handling 2015-08-26 11:21:29 -04:00
Isaac Connor
c60d1cbeca Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons 
Grey color for disabled buttons
 2015-08-25 12:50:50 -04:00
Pliable Pixels
a6f296d84e Grey color for disabled buttons 2015-08-25 12:29:40 -04:00
Andrew Bauer
2fbf79674b Add RTSP Describe checkbox to web console 2015-08-21 10:32:50 -05:00
Isaac Connor
22275e661c Tell cake to use the same session id as classic ui 2015-08-21 09:03:44 -04:00
tikismoke
52d3fdf471 Update README.md 
little correction
 2015-08-21 11:29:35 +02:00
Robin Daermann
5b465194f8 Renamed 'Blacken' zone type to 'Privacy' 2015-08-20 17:37:59 +02:00
Robin Daermann
b5fc6a9091 Make web correctly recognize new zone type 2015-08-20 15:09:02 +02:00
Andrew Bauer
fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Andrew Bauer
68adcc9e67 Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 14:07:38 -05:00
Andrew Bauer
c78f39c106 Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images 
959 add exif date time to images
 2015-08-18 13:46:54 -05:00
Linwood-F
987db68452 Fix extra image copy; fix options unset of exif toggle 2015-08-18 14:39:55 -04:00
Linwood-F
99c8af4a17 Bring up to date with master (mostly) 2015-08-17 22:52:51 -04:00
Andy Bauer
64299082ad Send login activity to the zoneminder event log 2015-08-17 17:54:17 -05:00
Isaac Connor
3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -04:00
Isaac Connor
6bd038cb29 don't add the api to autotools, because the autotools files are not present in there 2015-08-17 12:33:00 -04:00
Isaac Connor
7eb07dbb65 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-17 12:30:54 -04:00