Isaac Connor
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
Isaac Connor
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
Isaac Connor
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
Isaac Connor
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
Isaac Connor
41d92bbf94
need to include Server class
2015-12-02 10:26:11 -05:00
Isaac Connor
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
Isaac Connor
644080fd41
call CORSHeaders
2015-12-02 10:05:27 -05:00
Isaac Connor
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
Isaac Connor
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
Isaac Connor
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
Isaac Connor
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
Isaac Connor
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
Isaac Connor
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
Isaac Connor
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
Isaac Connor
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
Isaac Connor
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
Isaac Connor
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
Isaac Connor
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
Isaac Connor
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
Isaac Connor
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Kyle Johnson
c0216f74cb
Merge pull request #1164 from abishai/master
...
compat for php 5.4. Fixes #1163
2015-11-16 09:28:03 -07:00
Kyle Johnson
5add10289b
Merge pull request #1136 from pliablepixels/1135-events-API-prev-next
...
added prev/next event ids
2015-11-16 09:23:36 -07:00
abishai
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
Isaac Connor
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
Isaac Connor
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
Pliable Pixels
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
Pliable Pixels
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
Andy Bauer
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
Isaac Connor
6570a8d855
fix Server->Hostname()
2015-10-02 18:22:19 +00:00
Andrew Bauer
13aab8a1be
Merge pull request #1113 from baffo32/1112-detect-missing-content
...
Fatal if content dirs are unwritable
2015-10-14 06:49:33 -05:00
baffo32
da8e9dd81b
Remove reference to php.ini from timezone error
2015-10-13 16:55:38 -04:00
baffo32
250c3c31e1
Revised source-install specific recommendation.
2015-10-13 16:45:31 -04:00
baffo32
362b190641
Fatal if content dirs are unwritable
2015-10-12 16:16:22 -04:00
baffo32
4a280a73d1
Use Fatal function to report bad timezone
2015-10-12 15:43:24 -04:00
baffo32
d20478a15f
Detect invalid timezones
2015-10-12 13:22:30 -04:00
baffo32
7190b532dd
Fatal error if date.timezone is unset
2015-10-12 13:07:07 -04: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
e12640ec73
Merge branch 'no_overwrite_zm_conf' into multi-server
2015-10-02 15:34:14 +00:00
Isaac Connor
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00: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
Isaac Connor
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
Pliable Pixels
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
Kyle Johnson
9c7a15daf7
use deleteAll() vs. delete() when deleting an Event's Frames
2015-09-30 13:53:23 -06:00
Kyle Johnson
1937814c82
Update API Frame Model to new Primary Key. Fixes #663
2015-09-29 14:39:24 -06:00
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
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -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
Isaac Connor
e4b0e74f69
merge master
2015-09-24 10:01:27 -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
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
Isaac Connor
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
Isaac Connor
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
Isaac Connor
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
Isaac Connor
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
Isaac Connor
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
Isaac Connor
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
Isaac Connor
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
Isaac Connor
c0139e87ad
define ZM_BASE_PROTOCOL
2015-09-17 15:14:43 -04:00
Isaac Connor
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
Isaac Connor
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
Isaac Connor
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
Isaac Connor
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
Isaac Connor
73badd1c2d
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
2015-09-16 11:12:04 -04:00
Isaac Connor
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
Isaac Connor
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
Isaac Connor
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
Isaac Connor
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -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
Isaac Connor
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -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
f5ba7cb208
restore
2015-08-27 11:39:16 -04:00
Isaac Connor
c48bd3ebca
restore
2015-08-27 11:37:33 -04:00
Isaac Connor
b2699237c7
put back mootools
2015-08-27 11:35:47 -04:00
Isaac Connor
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04: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
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05: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
Isaac Connor
41637278c9
merge master
2015-08-19 16:08:12 -04:00
Isaac Connor
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
Isaac Connor
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04: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
Isaac Connor
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
Isaac Connor
b3240bbc8f
set name=action on submit tag, and remove stuff that we don't want right now
2015-08-16 12:21:52 -04:00
Isaac Connor
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
Isaac Connor
9117e2949a
add server.php.
2015-08-16 10:52:47 -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
Robin Daermann
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
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
Linwood-F
c4599cdeda
Fix bug report on 100% scale 2
2015-08-09 20:30:42 -04:00
Linwood-F
938a2e7de2
Fix bug report on 100% scale
2015-08-09 20:14:33 -04:00
Linwood-F
4fedb5fce0
Fix typo in last commit
2015-08-09 18:41:12 -04:00
Linwood-F
6da8da9d8d
Add ability to do either height or width or both
2015-08-09 18:19:12 -04:00
Linwood-F
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
Linwood-F
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
Linwood-F
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
Linwood-F
34c2902570
Add scale as optional feature to image.php
2015-08-09 12:02:13 -04:00
Linwood-F
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
Linwood-F
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
Pliable Pixels
2b0a975fef
Bumped up # of events per API to 100 instead of 25
2015-08-07 16:25:48 -04:00
Pliable Pixels
38799050ef
APIs will be served only if user is logged into the ZM portal
2015-08-07 16:14:02 -04:00
Linwood-F
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04: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
Isaac Connor
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
Linwood-F
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
Linwood-F
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
Linwood-F
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
Linwood-F
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
Linwood-F
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
Linwood-F
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
Robin Daermann
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
Robin Daermann
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
Robin Daermann
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
root
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
Emmanuel Papin
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
Emmanuel Papin
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
Linwood-F
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
Linwood-F
e967e3de6e
Remove unexpected files that were added - 4
2015-07-23 15:20:40 -04:00
Linwood-F
9e81eaa0f9
Remove unexpected files that were added - 3
2015-07-23 15:19:40 -04:00
Linwood-F
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
Emmanuel Papin
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
Linwood-F
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
Emmanuel Papin
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
Pliable Pixels
e332fc36a9
Fixed Configs API to return all values
2015-07-21 13:28:37 -04:00
Andrew Bauer
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
Isaac Connor
441a82e611
fixup loading SERVER_ID from SERVER_NAME
2015-07-17 10:12:44 -04:00
Isaac Connor
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
root
a9df82256b
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
2015-07-17 14:24:46 +02:00
root
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
Isaac Connor
cc5ca259ed
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-15 16:47:36 -04:00
Isaac Connor
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
Pliable Pixels
444d978c81
Added API routing
2015-07-13 18:55:28 +00:00