ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,143 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

525 Commits

Author SHA1 Message Date
Isaac Connor 983d87f69b increase height and width of groups window to fit buttons in 2015-12-18 13:34:44 -05:00
Isaac Connor ca45ac23fa increase height of group edit window 2015-12-18 13:30:42 -05:00
Isaac Connor c2a7e0c587 fix size of monitor popup in flat skin 2015-11-25 15:39:46 -05:00
Isaac Connor 1d173a9bf0 Merge pull request #1083 from pliablepixels/1082-monitor-orange 
fixed orange display for monitor mode
 2015-10-06 08:36:35 -04:00
Isaac Connor cf5473836e set default border on live streams so that when they alarm they don't jump around 2015-10-02 10:04:56 -04:00
Pliable Pixels d9355064e7 fixed orange display for monitor mode 2015-10-01 11:35:38 -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
Pliable Pixels 727486d8f3 recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:25 -04:00
Pliable Pixels 23b549a471 recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -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
Dmitry Smirnov 333e7ec67b header typo corrections 2015-09-19 17:39:54 +10: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 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 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
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
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
Isaac Connor 3462b0e0ab content for server edit popup 2015-08-17 12:42:20 -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
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 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
Robin Daermann 078e18e6c5 Add label size to monitor options (frontend part) 
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
 2015-08-10 15:35:19 +02:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Dmitry Smirnov c4f78d634c CSS[skins/classic]: highlight current row in tables. 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2015-08-05 10:43:02 +10:00
Isaac Connor 4c8d7d7f62 quiet error when no Servers in Servers table 2015-08-04 11:48:04 -04:00