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
4,949 Commits 80 Branches 104 Tags
dc9a5b13fe93dfd80bcfeb7e267e6dfa431da036
Commit Graph

1708 Commits

Author SHA1 Message Date
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
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
Robin Daermann
e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann
299c629a20 Merge remote-tracking branch 'upstream/master' into large-timestamp 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-17 13:42:36 +02:00
Andrew Bauer
c17de4a00f add Exif checkbox to monitor 2015-08-16 17:56:03 -05:00
Andrew Bauer
32f6c92b02 replace php short open tag 2015-08-16 12:29:03 -05:00
Isaac Connor
4f07279d25 include server.php in autotools build 2015-08-16 12:25:23 -04:00
Isaac Connor
7d8bdd73f9 add api dir to autotools build 2015-08-16 12:23:32 -04:00
Andrew Bauer
5b2155f551 define Groups permission for the default user 2015-08-15 16:47:07 -05:00
Andrew Bauer
0dc35553ef modify group delete action 2015-08-15 14:03:11 -05:00
Andrew Bauer
c53bb7f56f change edit permission from system to groups 2015-08-15 13:45:43 -05:00
Andrew Bauer
1d688be1a1 propagate canEditGroup permission 2015-08-15 13:22:13 -05:00
Andrew Bauer
c051f3482b add Groups to options again 2015-08-15 12:37:25 -05:00
Andrew Bauer
1d97e9d1f9 Add Groups column to options 2015-08-15 12:24:48 -05:00
Andrew Bauer
85e2b165b1 bump version to 1.28.101 2015-08-15 12:01:57 -05:00
Andrew Bauer
2770e752b4 create new permission group "Groups" in php 2015-08-15 11:56:51 -05:00
Andrew Bauer
66ec84fdea Merge pull request #1008 from pliablepixels/993-API-Auth 
Included logic to not enforce authentication in API layer if ZM auth is off
 2015-08-11 14:51:02 -05:00
Pliable Pixels
a64f7c0036 Included logic to not enforce authentication in API layer if ZM_OPT_USE_AUTH is disabled 
If ZM auth is off, API won't work. Changed this to make sure API disables auth if ZM disables auth
 2015-08-11 14:47:49 -04:00
Andrew Bauer
dff624a42c Merge pull request #985 from ZoneMinder/fix_state_load 
fix #948 1
 2015-08-11 10:45:16 -05:00
Andrew Bauer
882bf76750 Merge pull request #986 from ZoneMinder/fix_948_3 
quiet error when no Servers in Servers table
 2015-08-11 10:45:04 -05:00
Isaac Connor
495d7ad374 Merge pull request #1001 from Linwood-F/1000-add-scale-feature-to-image-php 
Add scale as optional feature to image.php
 2015-08-11 11:37:40 -04:00
Isaac Connor
3e5170678e Merge pull request #1006 from pliablepixels/993-API-Auth 
I was using the wrong field to check for portal authentication
 2015-08-10 15:58:50 -04:00
Pliable Pixels
f7025aaa26 I was using the wrong field to check for portal authentication 
Should be user.Username instead of username
 2015-08-10 15:55:44 -04:00