48283191ec
Merge branch 'master' into storageareas
2016-02-01 15:47:08 -05:00
cc2c1405ed
include Event.php
2016-02-01 14:59:06 -05:00
4e9e01836f
Use Event->Path instead of ZM_DIR_EVENTS
2016-02-01 13:41:57 -05:00
9543a8a364
Add Event.php to autoconf build
2016-02-01 13:08:48 -05:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
2f80f26f92
Merge pull request #1232 from ZoneMinder/remove_google_fonts
...
remove Google open Sans external import
2016-01-23 10:24:49 -06:00
54a11175ff
Reduce default size of body font in Flat skin
2016-01-22 13:56:41 -06:00
1ca9ace84d
Fixed missing semicolons
2016-01-22 13:31:02 -06:00
baa805ae60
alternatively, accept and eid and fid to specify the frame
2016-01-14 13:35:30 -05:00
e057d8d722
rough in an Event object.
2016-01-14 13:34:51 -05:00
f16fb5c5f6
use eid and fid instead of specifying the path to the image
2016-01-14 13:34:12 -05:00
02f8fb80da
Put the monitor Id in the title so that it appears on mouseover.
2016-01-14 11:05:05 -05:00
7ce049dad1
add a title to each monitor with the name so that the mouseover will show it
2016-01-14 10:50:42 -05:00
ddf7b1ad43
Merge branch 'master' into storageareas
...
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
2016-01-14 09:41:24 -05:00
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
3ebeaec8ab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-10 20:59:01 -05:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
818cd614eb
Merge branch 'multi-server' into storageareas
2016-01-08 10:17:37 -05:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
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
75f6da3526
Merge branch 'multi-server' into storageareas
2016-01-04 14:53:52 -05:00
6ae1597671
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2016-01-04 14:51:47 -05:00
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
69ddc7d34c
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 14:38:37 -05:00
b9f17a18d6
Merge branch 'multi-server' into storageareas
2016-01-04 14:09:41 -05:00
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
5144d3befb
Merge branch 'rotate_dimensions_when_image_is_rotated' into storageareas
2016-01-04 13:19:09 -05:00
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
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
33b8405e0d
Merge branch 'multi-server' into storageareas
2016-01-03 11:57:07 -05:00
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
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
5c0e4aa172
Merge branch 'multi-server' into storageareas
2016-01-01 17:11:01 -05:00
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
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
93dbc3f0c1
Merge multi-server updates and bump version
2016-01-01 16:31:02 -05:00
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
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
492550b5ef
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
45987e92a9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2015-12-24 12:34:55 -05:00
1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
479e5df454
Add default events dir to dropdown
2015-12-22 10:53:39 -05:00
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
658e130d33
sync up to c39 version
2015-12-22 09:44:46 -05:00
9d8455daea
fix size of filter popups
2015-12-21 15:18:05 -05:00
c03088e1b5
Just say Storage Area instead of Storage Id /Name. Same with Server
2015-12-21 14:32:42 -05:00
a840246849
Add Server dropdown for ServerId
2015-12-21 14:29:53 -05:00
aa9a6ddcc3
populate dropdown with the available storage areas when StorageId is selected
2015-12-21 14:12:33 -05:00
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
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
2548ec3bc0
Add Attr lines for StrageId and StorageName
2015-12-21 10:10:53 -05:00
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
00c4eedb90
Add StorageId and StorageName to fields that we can filter on
2015-12-21 10:04:13 -05:00
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
27597c3401
Merge branch 'master' into storageareas
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-20 11:19:44 -05:00
37212dcf2e
Merge pull request #1196 from pliablepixels/api-more-security
...
Api more security
2015-12-20 10:22:40 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
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
c4461c328e
initial user role support
2015-12-19 17:45:03 -05:00
b4fdaa9b4d
initial user role support
2015-12-19 17:44:46 -05:00
e812398fb9
initial user role support
2015-12-19 17:44:39 -05:00
f56688e7c2
initial user role support
2015-12-19 17:44:16 -05:00
028c9b956c
check for opt_use_api, also pull in user roles support
2015-12-19 17:44:02 -05:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
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
a0f8e8be4b
increase width and height of monitors popup to fit new fields
2015-12-18 13:43:16 -05:00
ee42174002
Merge branch 'master' into storageareas
2015-12-18 13:42:15 -05:00
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
9782204548
include Storage.php
2015-12-18 12:13:26 -05:00
fb1766f21f
Add storage.php
2015-12-18 11:39:42 -05:00
09c75e2363
add a storage area editing page
2015-12-15 14:08:34 -05:00
8f141305b7
add default parameter in constuctor
2015-12-15 13:27:57 -05:00
c345d697b2
missed dbServer -> dbStorage
2015-12-15 11:21:52 -05:00
6ce7952acb
Merge branch 'multi-server' into storageareas
2015-12-15 11:20:01 -05:00
aaa9f3bcc9
Handle case where parameter is not passed to constuctor
2015-12-15 11:19:50 -05:00
20f9a01a66
Add a Storage tab, to provide a place to define your storage areas
2015-12-15 11:13:21 -05:00
14dc447145
add a Storage Area dropdown to set where this monitor will storage it's events
2015-12-15 11:13:00 -05:00
9ffbaabde5
add save and delete actions for Storage
2015-12-15 11:12:33 -05:00
c07c63cde6
Check for setting of IdOrRow. When loading from db, using FETCH_CLASS, the constructor is called without arguments
2015-12-15 11:12:21 -05:00
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
6d34f8f424
Use Monitor class instead of old sql
2015-12-09 09:23:42 -05:00
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
f2065e2fcb
Merge branch 'one_eighth' into multi-server
2015-12-08 08:47:35 -05:00
d6b2e1959f
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-08 08:40:44 -05:00
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
41d92bbf94
need to include Server class
2015-12-02 10:26:11 -05:00
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
644080fd41
call CORSHeaders
2015-12-02 10:05:27 -05:00
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
c0216f74cb
Merge pull request #1164 from abishai/master
...
compat for php 5.4. Fixes #1163
2015-11-16 09:28:03 -07:00
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
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
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
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
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
59b0675588
only expose monitor info which are being used in client
2015-10-02 20:04:10 -07:00
6570a8d855
fix Server->Hostname()
2015-10-02 18:22:19 +00:00
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
da8e9dd81b
Remove reference to php.ini from timezone error
2015-10-13 16:55:38 -04:00
250c3c31e1
Revised source-install specific recommendation.
2015-10-13 16:45:31 -04:00
362b190641
Fatal if content dirs are unwritable
2015-10-12 16:16:22 -04:00
4a280a73d1
Use Fatal function to report bad timezone
2015-10-12 15:43:24 -04:00
d20478a15f
Detect invalid timezones
2015-10-12 13:22:30 -04:00
7190b532dd
Fatal error if date.timezone is unset
2015-10-12 13:07:07 -04:00
1d173a9bf0
Merge pull request #1083 from pliablepixels/1082-monitor-orange
...
fixed orange display for monitor mode
2015-10-06 08:36:35 -04:00
e12640ec73
Merge branch 'no_overwrite_zm_conf' into multi-server
2015-10-02 15:34:14 +00:00
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00:00
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
2fd6cbe742
fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
2015-10-01 22:41:31 -07:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
9c7a15daf7
use deleteAll() vs. delete() when deleting an Event's Frames
2015-09-30 13:53:23 -06:00
1937814c82
Update API Frame Model to new Primary Key. Fixes #663
2015-09-29 14:39:24 -06:00
d39f57c4ff
Merge pull request #1073 from pliablepixels/1072-events-API-delete-fix
...
Delete fixes for Events
2015-09-28 14:46:01 -04:00
a00fed480d
Delete fixes for Events
2015-09-28 14:41:36 -04:00
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -04:00
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
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
ee78ae5c49
restart monitor when edited via APIs
2015-09-28 09:31:57 -04:00
727486d8f3
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:25 -04:00
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
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
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
5ca00c2ef5
fixed constant check when not defined
2015-09-24 09:57:53 -04:00
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
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
25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
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
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
c0139e87ad
define ZM_BASE_PROTOCOL
2015-09-17 15:14:43 -04:00
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
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
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -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
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -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
f5ba7cb208
restore
2015-08-27 11:39:16 -04:00
c48bd3ebca
restore
2015-08-27 11:37:33 -04:00
b2699237c7
put back mootools
2015-08-27 11:35:47 -04:00
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
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
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04: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
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
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
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
9117e2949a
add server.php.
2015-08-16 10:52:47 -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
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
34c2902570
Add scale as optional feature to image.php
2015-08-09 12:02:13 -04:00
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -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
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -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
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
42e021e652
Merge pull request #976 from SteveGilvarry/FrameImageGen
...
Dynamically create jpegs from video file for viewing in browser
2015-07-28 10:10:38 -05:00
5c44285f98
dynamically create jpegs from video file for viewing in browser
2015-07-29 00:24:05 +10:00
c7c27d7009
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into h264_playback
...
Conflicts:
web/skins/classic/views/event.php
2015-07-29 00:14:12 +10:00
7502e5b3e3
added control for video playback rate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-29 00:07:19 +10:00
bb0c016d3d
Merge pull request #974 from SteveGilvarry/h264_jpeg_mode
...
Fix to display thumbnails when only storing snapshot.jpg
2015-07-28 08:55:52 -05:00
d83349cc7f
fix to display thumbnails when only storing snapshot.jpg
2015-07-28 23:43:50 +10:00
477c34cc2c
Added missing brackets
2015-07-28 23:08:45 +10:00
6c8dbb8bea
Typo
...
added missing "
2015-07-28 23:08:10 +10:00
e6e1427c48
added missing videojs.zoomrotate.js file
...
added missing videojs.zoomrotate.js file
2015-07-28 23:06:03 +10:00
2d4c2bbe0a
Beautify!
...
Make the code somewhat readable.
2015-07-28 23:05:06 +10:00
46204c2768
local storage of video js plugin
2015-07-28 23:03:59 +10:00
2e8d88915b
removed redundant field in sql query
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 23:02:56 +10:00
05e82d2a96
proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
...
Conflicts:
web/skins/classic/views/event.php
2015-07-28 22:55:27 +10:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10: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
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
e967e3de6e
Remove unexpected files that were added - 4
2015-07-23 15:20:40 -04:00
9e81eaa0f9
Remove unexpected files that were added - 3
2015-07-23 15:19:40 -04:00
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04: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
441a82e611
fixup loading SERVER_ID from SERVER_NAME
2015-07-17 10:12:44 -04: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
cc5ca259ed
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-15 16:47:36 -04: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
69e1fd8b18
add code to convert the human readable config entry ZM_SERVER_NAME into ZM_SERVER_ID
2015-07-09 11:45:19 -04:00
b12d72c68f
fix monitor popup size
2015-07-09 11:44:27 -04: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
ecb7720056
Merge pull request #882 from pliablepixels/881-merge-angularui-apis
...
Merged Angular UI branch API to master
2015-06-12 11:06:59 -04:00
d915d859ed
Convert Crud to submodule
2015-06-11 11:56:39 -05:00
dd9603f70f
Merged Angular UI branch API to master
2015-06-11 02:58:58 +00:00
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
f3a8217651
resolve conflicts from merge by seebaer1976
2015-06-05 19:34:52 +02:00
e10fdaf344
reduce the wait to 2/10ths instead of a whole second
2015-06-05 11:49:05 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
f99c5f3627
use correct tag for the frame popup so that it gets the correct popup window size
2015-06-03 12:09:38 -04:00
4cf1e61197
Update de_de.php
2015-05-31 17:43:21 +02:00
ba980ae4ae
update german translation
2015-05-27 15:38:47 +02:00
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
5876186909
Merge pull request #803 from knnniggett/mootools
...
Update Mootools
2015-05-21 13:15:13 -04:00
b7890ec923
Merge pull request #833 from knnniggett/slang
...
add translate function
2015-05-21 13:14:44 -04:00
82f5ab5175
Fix use of DEFINED. It takes a string not a constant. When COOKIE is not set or has changed, set it
2015-05-11 16:22:14 -04:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
8a1625463c
Merge pull request #823 from ZoneMinder/fix_session_concurrency
...
close the session before requiring the page contents to fix the concurre...
2015-05-09 17:50:18 -05:00
69ccd53653
rollback mootools-core to 1.4.5-compat
2015-05-09 17:23:01 -05:00
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
91737eb28b
also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger.
2015-05-01 16:03:40 -04:00
73cc4e5cab
move the window size definitions into a separate file for each css version flat or classic
2015-05-01 16:02:55 -04:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
e92fb40c84
Set date and time format in french lang file
2015-04-18 19:08:03 +02:00
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
955237d6ac
Translate new strings in french file
2015-04-18 17:51:08 +02:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
5d0d5dadc7
Fix translations after first review
2015-04-17 22:58:51 +02:00
0f09dddf9c
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into fix_french_lang_file
2015-04-16 22:38:25 +02:00
1674675da4
Translation of a bunch of english text
2015-04-16 22:32:47 +02:00
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
38f6eb8b5f
Update mootools to 1.5.1
2015-04-12 17:52:01 -05:00
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
750420d42f
Update de_de.php
2015-04-05 09:52:34 +02:00
35ba2a2107
Update de_de.php
2015-04-05 09:03:41 +02:00
2522537184
Update de_de.php
2015-04-04 22:38:12 +02:00
4aa9b0e802
Update de_de.php
2015-04-04 18:03:25 +02:00
d1f00f02c2
skins/classic: fix HTML export with USE_DEEP_STORAGE ( Closes : #506 ).
...
Use mygetEventPath() to get valid path.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
da48b0ea4a
Update de_de.php
2015-04-04 09:21:43 +02:00
5c35bc5acb
Update de_de.php
2015-04-03 21:04:24 +02:00
2a3fdf3695
Update de_de.php
2015-04-03 19:12:15 +02:00
039cf09da9
Fix bad translations (first checking before tests)
2015-03-30 21:16:33 +02:00
c0b41ed6a8
Readd translations from Jypy
2015-03-30 20:50:42 +02:00
ca041a3ce5
Revert "Update fr_fr.php"
...
This reverts commit 3b9c3f0776
2015-03-30 20:06:59 +02:00
fd94d22b0e
Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
2015-03-22 17:31:22 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
20107ac1e6
remove NETPBM dependency from autotools
2015-03-01 10:51:04 -06:00
1a17c820f2
Merge pull request #730 from ljack/master
...
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
6233432559
fix import path
2015-02-25 18:08:41 +02:00
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
Isaac Connor
SteveGilvarry
Andrew Bauer
Brandon Odegard
Isaac Connor
Isaac Connor
Isaac Connor
RBxx
SteveGilvarry
Isaac Connor
arjunrc
Heng Liu
Kyle Johnson
abishai
baffo32
Dmitry Smirnov
Robin Daermann
Andrew Bauer
tikismoke
Linwood-F
Pliable Pixels
Michael
user
Emmanuel Papin
Ubuntu
Sebastian Kaminski
seebaer1976
Lihis
ljack