23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
fbc4f77491
Merge pull request #1049 from knnniggett/core.php
...
remove core.php, modify core.php.default
2015-09-23 09:07:29 -04:00
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
c0139e87ad
define ZM_BASE_PROTOCOL
2015-09-17 15:14:43 -04:00
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -04:00
827eebd38c
remove core.php, modify core.php.default
2015-08-29 14:53:39 -05:00
feeb890be2
removed recaptcha client dependency
2015-08-29 15:14:20 -04:00
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -04:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
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
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
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
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
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
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -04:00
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
22275e661c
Tell cake to use the same session id as classic ui
2015-08-21 09:03:44 -04:00
52d3fdf471
Update README.md
...
little correction
2015-08-21 11:29:35 +02:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
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
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
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
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
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
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
7d8bdd73f9
add api dir to autotools build
2015-08-16 12:23:32 -04:00
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
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
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
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
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
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
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
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
3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
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
c4599cdeda
Fix bug report on 100% scale 2
2015-08-09 20:30:42 -04:00
938a2e7de2
Fix bug report on 100% scale
2015-08-09 20:14:33 -04:00
4fedb5fce0
Fix typo in last commit
2015-08-09 18:41:12 -04:00
6da8da9d8d
Add ability to do either height or width or both
2015-08-09 18:19:12 -04:00
34c2902570
Add scale as optional feature to image.php
2015-08-09 12:02:13 -04:00
2b0a975fef
Bumped up # of events per API to 100 instead of 25
2015-08-07 16:25:48 -04:00
38799050ef
APIs will be served only if user is logged into the ZM portal
2015-08-07 16:14:02 -04:00
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
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
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
e332fc36a9
Fixed Configs API to return all values
2015-07-21 13:28:37 -04:00
500b560884
Merge pull request #952 from schrorg/583-correct-de_de-encoding
...
Change encoding of german language file to UTF-8
2015-07-20 08:07:30 -05:00
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
a9df82256b
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
2015-07-17 14:24:46 +02:00
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
444d978c81
Added API routing
2015-07-13 18:55:28 +00:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
42ac3ceb3b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-07-09 11:00:05 -04:00
51631b84b4
cleanup generated files
2015-07-09 10:59:45 -04:00
8406818b00
Merge pull request #921 from pliablepixels/master
...
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:34:28 -05:00
3a9c941213
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:59:07 -04:00
1b2f214340
Dumb down Crud from 4.0 -> 3.0.10
2015-06-30 10:26:29 -05:00
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
592ecd8e94
fix montage view issue in mobile skin
2015-06-26 08:47:20 -05:00
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
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
719a903d43
Fixed events API to remove thumbnail code
2015-06-20 20:08:10 -04:00
138e931e24
Fixed events API to remove thumbnail code
2015-06-20 19:57:55 -04:00
8d309fbd6e
Merge pull request #874 from seeebek/master
...
German translation update
2015-06-19 13:50:55 +02:00
7112001b64
getVersion.json now returns both ZM version and API version
2015-06-13 16:33:15 +00:00
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
bda35ed4d6
fix bootstrap.ini substitution
2015-06-12 11:12:58 -04:00
Pliable Pixels
Isaac Connor
Dmitry Smirnov
Isaac Connor
Andrew Bauer
Robin Daermann
Andrew Bauer
tikismoke
Linwood-F
Pliable Pixels
Emmanuel Papin