Robin Daermann
|
af68fd20a8
|
Some Translations for Monitor names with spaces
|
2016-03-24 14:51:24 +01:00 |
Robin Daermann
|
71db9b84e6
|
Allow spaces in monitor names
|
2016-03-24 14:37:24 +01:00 |
Jon Burgess
|
9c98ccbb75
|
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
|
2016-03-20 16:13:53 +00:00 |
Jon Burgess
|
020731a89e
|
Fix typo in ffmpeg options help: s/passwd/passed/
|
2016-03-20 16:10:49 +00:00 |
arjunrc
|
8a47241e18
|
address issue #1335
|
2016-03-12 08:07:25 -05:00 |
Andrew Bauer
|
77f7a3642c
|
remove check for "selected" property
|
2016-03-09 10:34:06 -06:00 |
Andrew Bauer
|
3280aff876
|
disable save button when nothing slected. fixes #1322
|
2016-03-09 09:43:44 -06:00 |
Andy Bauer
|
466f2b2ae3
|
change multi-server error message text
|
2016-03-01 11:12:54 -06:00 |
arjunrc
|
84801fcb86
|
typo in function name
|
2016-02-27 13:06:33 -05:00 |
SteveGilvarry
|
d40bf89b17
|
Remove Phone BW settings used with mobile skin
|
2016-02-26 22:43:37 +11:00 |
SteveGilvarry
|
4837585601
|
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
src/zmstreamer.cpp
|
2016-02-26 22:37:23 +11:00 |
SteveGilvarry
|
7c7d7b245c
|
Remove the XML skin folder
|
2016-02-26 22:30:20 +11:00 |
SteveGilvarry
|
e6d57da0d4
|
Remove the mobile skin folder
|
2016-02-26 22:29:41 +11:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
SteveGilvarry
|
b294f210dc
|
Update to CakePHP 2.8.0 copy in lib folder
|
2016-02-25 23:25:24 +11:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11:00 |
Isaac Connor
|
172a4c6bd4
|
Add montagereview.php to autotools build.
|
2016-02-16 09:29:49 -05:00 |
Isaac Connor
|
5f217b48e0
|
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
|
2016-02-12 13:52:59 -05:00 |
Andrew Bauer
|
0b2a309014
|
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
960 montage review new feature
|
2016-02-08 20:40:04 -06:00 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
Andrew Bauer
|
ab7b4ab3e6
|
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
implement Width and Height functions, and test for image rotation and…
|
2016-02-04 10:17:19 -06:00 |
Andrew Bauer
|
1c142a48a6
|
Merge pull request #1212 from RBxx/patch-1
Convert ru_ru.php to UTF-8
|
2016-02-04 10:16:24 -06:00 |
Andrew Bauer
|
cbe88d0a3f
|
Merge pull request #1239 from ZoneMinder/trim_when_saving
use trim on values when saving.
|
2016-02-04 08:29:02 -06:00 |
Andrew Bauer
|
2f80f26f92
|
Merge pull request #1232 from ZoneMinder/remove_google_fonts
remove Google open Sans external import
|
2016-01-23 10:24:49 -06:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
Isaac Connor
|
4520902dd2
|
use trim on values when saving.
|
2016-01-14 09:37:41 -05:00 |
Isaac Connor
|
3ebeaec8ab
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-01-10 20:59:01 -05:00 |
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
Isaac Connor
|
d48ec1cfbe
|
Add AddNewServer and Hostname entries
|
2016-01-08 10:15:41 -05:00 |
Isaac Connor
|
99dfaa97fa
|
User Name instead of ServerName and Hostname instead of ServerHostname
|
2016-01-08 10:15:21 -05:00 |
Isaac Connor
|
d13829c6f3
|
Add Hostname to list of servers, since we have the space for it.
|
2016-01-08 10:15:06 -05:00 |
Isaac Connor
|
53bd342f85
|
remove Google open Sans external import
|
2016-01-08 09:46:14 -05:00 |
Isaac Connor
|
44f3b99d24
|
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
|
2016-01-04 14:59:04 -05:00 |
Isaac Connor
|
6ae1597671
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2016-01-04 14:51:47 -05:00 |
Isaac Connor
|
273ab6c5c6
|
Only show Server column when more than 1 Servers are defined
|
2016-01-04 14:51:24 -05:00 |
Isaac Connor
|
f5db14d823
|
return empty for the non multi-server case
|
2016-01-04 13:46:05 -05:00 |
Isaac Connor
|
45fc689203
|
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
|
2016-01-04 13:15:50 -05:00 |
Isaac Connor
|
f72260733c
|
Only do CORSHeaders if there is more than 1 server
|
2016-01-04 09:38:24 -05:00 |
Isaac Connor
|
d256530896
|
return early if no servers are defined instead of logging a warning
|
2016-01-04 09:36:45 -05:00 |
Isaac Connor
|
c639822d62
|
When Server is not set, us ZM_BASE_PATH
|
2016-01-03 11:55:53 -05:00 |
Isaac Connor
|
bd71c4999d
|
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
|
2016-01-02 14:36:37 -05:00 |
Isaac Connor
|
cf7e168872
|
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
|
2016-01-01 17:10:37 -05:00 |
Isaac Connor
|
468f997e4c
|
Soft error, with logging when the filter element doesn't exist
|
2016-01-01 16:36:29 -05:00 |
Isaac Connor
|
ec7504f925
|
Translate ServerId to Server in Log record before sending back
|
2016-01-01 16:33:28 -05:00 |
Isaac Connor
|
12ee147bc7
|
Add a find_all function to return an array of Server objects
|
2015-12-31 10:13:48 -05:00 |
Isaac Connor
|
bfe4175fdf
|
Add Server to filters and log results
|
2015-12-31 10:13:25 -05:00 |
Isaac Connor
|
31ba0221ed
|
Add Server to filters and log results
|
2015-12-31 10:13:03 -05:00 |
Isaac Connor
|
983b47f6dc
|
Add Server columns
|
2015-12-31 09:09:57 -05:00 |
RBxx
|
0ccce76ef8
|
Convert ru_ru.php to UTF-8
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
|
2015-12-31 16:58:56 +03:00 |
Isaac Connor
|
6df1425897
|
Slight update to allow the instantiation with no row or Id
|
2015-12-22 09:52:33 -05:00 |
Isaac Connor
|
1aa79c306b
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-22 09:47:45 -05:00 |
Isaac Connor
|
658e130d33
|
sync up to c39 version
|
2015-12-22 09:44:46 -05:00 |
Isaac Connor
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -05:00 |
Isaac Connor
|
6f5c70dd5d
|
Add Attr lines for ServerId and ServerName
|
2015-12-21 10:10:11 -05:00 |
Isaac Connor
|
b626712a2f
|
Add ServerId and ServerName to fields that we can filter on
|
2015-12-21 10:03:48 -05:00 |
Isaac Connor
|
37212dcf2e
|
Merge pull request #1196 from pliablepixels/api-more-security
Api more security
|
2015-12-20 10:22:40 -05:00 |
arjunrc
|
6e606aa74b
|
removed issue #
|
2015-12-19 19:04:27 -05:00 |
arjunrc
|
38b4785557
|
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
|
2015-12-19 18:36:38 -05:00 |
arjunrc
|
c4461c328e
|
initial user role support
|
2015-12-19 17:45:03 -05:00 |
arjunrc
|
b4fdaa9b4d
|
initial user role support
|
2015-12-19 17:44:46 -05:00 |
arjunrc
|
e812398fb9
|
initial user role support
|
2015-12-19 17:44:39 -05:00 |
arjunrc
|
f56688e7c2
|
initial user role support
|
2015-12-19 17:44:16 -05:00 |
arjunrc
|
028c9b956c
|
check for opt_use_api, also pull in user roles support
|
2015-12-19 17:44:02 -05:00 |
Andy Bauer
|
e5f243a9f8
|
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
|
2015-12-19 08:16:20 -06:00 |
Steve Gilvarry
|
e3d634e53e
|
Merge pull request #1182 from ZoneMinder/one_eighth
add a 1/8th scale option, which is useful for 1920x1080 streams
|
2015-12-19 14:07:18 +11:00 |
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
|
aaa9f3bcc9
|
Handle case where parameter is not passed to constuctor
|
2015-12-15 11:19:50 -05:00 |
Isaac Connor
|
6cfd993890
|
Merge branch 'master' into multi-server
|
2015-12-09 10:43:38 -05:00 |
Isaac Connor
|
53dec9f26d
|
check for setting of __REQUEST['object'] to silence php NOTICE
|
2015-12-09 10:43:23 -05:00 |
Isaac Connor
|
6d34f8f424
|
Use Monitor class instead of old sql
|
2015-12-09 09:23:42 -05:00 |
Isaac Connor
|
e6c9830728
|
Use Monitor class instead of old sql
|
2015-12-09 09:23:36 -05:00 |
Isaac Connor
|
f2065e2fcb
|
Merge branch 'one_eighth' into multi-server
|
2015-12-08 08:47:35 -05:00 |
Isaac Connor
|
d6b2e1959f
|
add a 1/8th scale option, which is useful for 1920x1080 streams
|
2015-12-08 08:40:44 -05:00 |
Isaac Connor
|
3c86965760
|
Merge branch 'master' into multi-server
Conflicts:
web/skins/classic/js/flat.js
|
2015-12-04 15:31:30 -05:00 |
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 |