9f43825b92
prevent the end user from slecting an invalid configuration on the PT… ( #1676 )
...
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab
* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
6d57b326fa
change logic of sending file contents to handle an off by one and be more readable
2016-11-03 11:42:42 -04:00
9d76c9cf6a
fix fclose
2016-11-03 11:23:50 -04:00
a87f5e1592
fix sending full content when we should be
2016-11-03 11:23:10 -04:00
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
340b172dc4
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:46:50 -04:00
42783b68f9
float the scale control right, add css for other skins
2016-10-26 14:43:23 -04:00
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
c74cc54ac0
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:30 -04:00
98cde11e86
add a scale element to the frame view. Include some bits from StorageAreas to make it work
2016-10-26 13:34:28 -04:00
cf0e4935f1
cleanups, more debugging
...
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
2016-10-21 12:43:23 -04:00
f9ac601194
fix getOutputHelperStream -> getHelperStream
2016-10-21 12:41:37 -04:00
7b1395a4ea
set default for StorageId to '0' since it can't be NULL anymore
2016-10-20 14:06:09 -04:00
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
cb88b984c7
fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes
2016-10-20 12:01:25 -04:00
5ee8a1c0a7
deprecate the contents of getImageSrc since it is now in Event.php
2016-10-20 11:52:01 -04:00
fc540786a5
Move login by auth hash out of actions.php and into index.php. Double quotes to single quotes and google code style changes in indx.php
2016-10-20 11:51:42 -04:00
c795dd7568
double quotes to single quotes, remove some includes, slight efficiency gains and better error reporting when the .mp4 doesn't exist.
2016-10-20 11:50:13 -04:00
017085aee7
Use proper rounding instead of sprintf based rounding for fps
2016-10-20 11:49:35 -04:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
de9c5a3bed
add in missing break
2016-10-18 10:20:42 -04:00
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
85faa7321c
reorder if logic to handle first page load before AuthHash has ever been set.
2016-10-17 13:12:13 -04:00
4bb9709cb2
use object methods of Event
2016-10-12 15:39:53 -04:00
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
c2911ae756
better debug in deletePath
2016-10-12 15:38:59 -04:00
3baa64aa52
add caller info to log when a bad argument is passed to event constructor
2016-10-12 15:38:40 -04:00
bf4bbf8b8d
use object methods for event deletion. Main benefit is error message when deleting
2016-10-12 15:36:40 -04:00
ba7d935a85
fix border size of text below the image in montage when alerted.
2016-10-12 12:19:04 -04:00
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
0903ef294f
quick for to make MontageReview work
2016-10-11 17:35:28 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
743e8c59f9
google code style and double to single quotes
2016-10-11 12:11:59 -04:00
0c956d6728
fix logic when disabling a monitor
2016-10-11 12:11:33 -04:00
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
96b5af9021
Merge branch 'fix_onvif' into storageareas
2016-10-04 15:00:28 -04:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
68936b9af9
code style, replace with '
2016-10-03 21:58:57 -04:00
d4be5b06ea
Only generate auth hash when logged in.
2016-10-03 21:22:16 -04:00
f4418260e7
Should only generate an auth hash if we are logged in.
2016-10-03 21:18:13 -04:00
16bee2ef55
only generate auth hash if we are logged in
2016-10-02 14:13:54 -04:00
0ab84abe5b
Since we are returning a hash called user, it should really contain all data for that user.
2016-09-29 10:43:07 -04:00
404bbb79f0
must return the generated hash
2016-09-29 10:11:37 -04:00
8bc7b9562f
introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for
2016-09-29 10:04:53 -04:00
cf9fa78ca3
work on fixing event view
2016-09-29 09:28:48 -04:00
07ae6b6aa2
commit authhash to session
2016-09-28 11:49:00 -04:00
09f7c9ddf9
Merge pull request #1633 from bhaal2/storageareas
...
Storageareas
2016-09-28 09:43:00 -04:00
994f1d566e
fix [
2016-09-28 09:09:01 -04:00
9bf48d27b1
implement caching the authhash in the session
2016-09-28 09:08:49 -04:00
1ae23b49bf
generateAuthHash early when session is active, it will get cached in session
2016-09-28 09:08:36 -04:00
02a196d98b
add missing ]
2016-09-28 08:30:22 -04:00
e217ca17cd
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:57:53 -04:00
303a2c6c5f
re-open session if neccessary to save AuthHashGeneratedAt
2016-09-27 11:56:31 -04:00
6840031ee3
fix auth timeout and user session[username] when checking auth hash for speedup
2016-09-27 11:51:55 -04:00
e04266600e
Merge branch 'fix_auth_timeout' into storageareas
2016-09-27 11:04:12 -04:00
4ce531099c
add an auth field to request=stream results to give the client a new auth hash to use
2016-09-27 11:03:12 -04:00
167214cb01
Merge branch 'cookie_scale' into storageareas
2016-09-27 10:05:16 -04:00
6c3a3d3d50
store the scale value for watch and event views in a cookie, differentiated by monitorId.
2016-09-27 09:46:04 -04:00
0580ef0c88
whitespace changes
2016-09-26 20:09:09 -04:00
3dcc1c3697
fix php outputting extra newlines after content
2016-09-22 10:37:32 -04:00
d96febd967
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
2016-09-21 16:00:23 -04:00
92d7cad5f1
enabled utf8
2016-09-21 11:53:34 -04:00
091459004c
ServerId can be 0
2016-09-21 10:30:31 -04:00
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
364a80fb94
don't output jpeg header unless there is some kind of success
2016-09-20 15:55:28 -04:00
33ab9d3098
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
2016-09-20 12:19:44 -04:00
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
fb610ba87d
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
2016-09-20 12:18:20 -04:00
1add270b72
fixup saving Filters and executing them
2016-09-20 12:17:19 -04:00
f06723a178
add disk_usage_percent and fix whitespace
2016-09-20 12:16:49 -04:00
5604fe5610
add more debugging and fix LinkPath -> LinkPath
2016-09-20 12:16:07 -04:00
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
c95e449bbd
Modifications to getDiskPercent():
...
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
2016-09-17 02:11:07 +10:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
181339a2dd
Nearly forgot its possible to have no "default" storage area, have wrapped the defaults space check in an if()
2016-09-15 19:49:58 +10:00
76beaf281a
Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas.
2016-09-15 19:44:13 +10:00
d5337a08a8
Modify getDiskPercent() to report disk space for all storage areas.
2016-09-15 19:41:16 +10:00
37c559ba3d
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-09-14 12:49:55 -04:00
cf45feea66
quiet the logs on initial view load
2016-09-14 12:49:47 -04:00
fb8b2f2490
Merge pull request #1625 from bhaal2/storageareas
...
Storageareas
2016-09-14 12:08:55 -04:00
01ae4de123
Modified so deleting a filter is done by table Id instead of Name
2016-09-15 01:59:31 +10:00
17555bf623
Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter.
2016-09-15 01:57:31 +10:00
67f2ddc404
Changed filter list order back to Name
...
Added extra argument 'Id' to delete button onClick call
2016-09-15 01:55:58 +10:00
cd626a54ee
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:44 +10:00
99a212803a
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:29:35 +10:00
0d83fc5be7
Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters.
2016-09-15 01:27:59 +10:00
a0eaea00a5
fix relative paths to jquery and bootstrap fixes #1618
2016-09-14 10:06:15 -04:00
cd0e6ba285
StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match
2016-09-14 23:56:05 +10:00
33fc47c4b1
StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0
2016-09-14 23:53:52 +10:00
db8cada380
fix merge
2016-09-13 15:01:02 -04:00
0bc50810de
only add the development h3 if it has contents, otherwise it pushes the header size down
2016-09-13 10:25:49 -04:00
2b4bad86cb
Merge branch 'master' into storageareas
2016-09-13 10:21:10 -04:00
a80881bb98
Merge branch 'fix_1620' into storageareas
2016-09-13 10:03:02 -04:00
54db9f2e3a
ptzControl expects a monitor object instead of a dbrow array.
2016-09-12 21:36:03 -04:00
563f4a9d46
Merge pull request #1505 from ZoneMinder/fix_filter_actions
...
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
e35ef3ce83
Merge pull request #1617 from coracis/master
...
Update German translation
2016-09-09 08:55:19 -05:00
321deb5506
Merge pull request #1599 from sabbath88/master
...
add some more translation
2016-09-09 08:40:05 -05:00
070051d06a
Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
...
For easy pull-requesting
2016-09-09 14:20:03 +02:00
6fab2e97b1
Update German translation of Buffer
2016-09-09 13:32:20 +02:00
b10c79b4f7
Add translation for 'Montage Review'
2016-09-09 13:26:19 +02:00
6b18184e4a
Remove confusing link to web console
2016-09-09 12:38:30 +02:00
4dc6fc03b3
Add a missing translate()-call
2016-09-09 12:35:34 +02:00
430ecd8e32
Fix some too direct translations into German
2016-09-09 11:51:53 +02:00
d017138550
Fix a 'false friend' in German translation
2016-09-09 11:25:12 +02:00
1440dd9265
retab
2016-09-03 15:02:32 -04:00
7bf0b3c423
readded forMonitor - removed by mistake
2016-09-03 14:51:24 -04:00
9a4330eb59
#1537 Zones Controller not returning all zones
2016-09-03 14:46:47 -04:00
d6852e10b7
Merge pull request #1609 from connortechnology/fix_1606
...
implement suggested code to stop the monitor when Function is set to …
2016-09-01 22:57:57 -06:00
55f5db55dd
implement suggested code to stop the monitor when Function is set to None
2016-09-01 11:43:20 -04:00
10abe98e91
merge from packet queue. add monitorId to livestream div lookup
2016-09-01 10:15:12 -04:00
5f07911a63
fix spacing
2016-08-31 10:09:42 -04:00
ed1b6ccd58
Implement range support
2016-08-31 10:09:01 -04:00
ffaf046485
fix missing /
2016-08-30 14:51:56 -04:00
27c1f95607
handle when ZM_BASE_PATH == '/'
2016-08-30 14:36:14 -04:00
a28e7d8df8
fix typo
2016-08-30 14:24:51 -04:00
7411b47834
fix typo
2016-08-30 14:23:20 -04:00
6ce18c3628
ZM_BASE_URL is deprecated. Use ZM_BASE_PATH instead
2016-08-30 14:08:52 -04:00
237a4494b2
correct incorrect use of isset instead of array_key_exists
2016-08-30 13:44:57 -04:00
6204ed8dd4
correct incorrect use of isset instead of array_key_exists
2016-08-30 13:43:49 -04:00
2d44531d1f
add some more translation
2016-08-25 14:24:14 +02:00
944a131142
Merge ../ZoneMinder.master into storageareas
2016-08-22 11:49:50 -04:00
be7683299e
use single quotes instead of double quotes
2016-08-22 11:49:45 -04:00
09ebcfb7f8
only put in the development h3 tag if the value has been set
2016-08-22 11:42:44 -04:00
d6b126fe8c
Add caller and line when an unknown function is called on the Monitor object
2016-08-22 11:28:53 -04:00
eafe3d7748
Merge branch 'master' into storageareas
2016-08-17 10:31:55 -04:00
c82c872665
add a default NULL value to __construct
2016-08-17 10:31:16 -04:00
7d48b2c6c5
Merge pull request #1577 from ZoneMinder/fix_zmaControl
...
fix error in calling zmaControl
2016-08-17 08:36:51 -05:00
ea34f3d69a
Merge pull request #1576 from ZoneMinder/show_other_zones
...
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
19d46c2d09
Merge branch 'master' into storageareas
2016-08-15 10:45:50 -04:00
31cb86046c
Merge pull request #1592 from connortechnology/fix_analysis_frame
...
Fix analysis frame
2016-08-14 10:54:46 -05:00
a0bc30d3fe
fix the order of analyse/capture being passed
2016-08-12 15:40:47 -04:00
240336e3ec
silence error when Event has no StorageId set
2016-08-12 15:20:21 -04:00
9106675842
pass capture or analyse to getImageSrc
2016-08-12 15:17:13 -04:00
bcb7dd1ba4
take optional show= to specify the analyse image or the capture image
2016-08-12 15:16:05 -04:00
3dadcc8d32
add ability to pass show=capture or show=analyse to getImageSrc
2016-08-12 15:14:51 -04:00
bc4923b555
use instead of for the frame object and pass to getImageSrc which expects an array
2016-08-12 13:50:18 -04:00
cc06a84a0e
increase size of onvifprobe popup
2016-08-09 13:09:47 -04:00
f9e7d3ccd8
fix error messages when an empty Monitor is instantiated
2016-08-09 10:43:51 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
24d471f452
Merge pull request #1503 from ZoneMinder/id_on_console
...
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
9d65ef3bb2
Merge pull request #1556 from knnniggett/banner
...
custom banner text on web console
2016-08-06 10:59:53 -04:00
382896dc0d
Merge pull request #1498 from josh4trunks/mysql_port_socket
...
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
6a0c6cd4f2
Merge branch 'show_other_zones' into storageareas
2016-08-02 13:54:01 -04:00
aa78b403a1
zmaControl can take an id #, so need to move the check for local server test down.
2016-08-02 12:33:41 -04:00
8093470a2e
make only the editing polygon have a border. Set default for Type when creating a new zone
2016-08-02 12:19:55 -04:00
b522371080
include polygons for the other zones.
2016-08-02 12:02:07 -04:00
c58c3efcf5
fix to
2016-07-25 15:34:53 -04:00
b9bba6bde5
fix to
2016-07-25 15:32:57 -04:00
b9a15d1465
fix missed to conversion
2016-07-23 13:37:00 -04:00
4c1c95e3a5
only include the state if canEdit(system) otherwise it gives an auth error
2016-07-22 16:04:42 -04:00
32f9b2755e
add more height to the logout popup
2016-07-22 16:04:18 -04:00
8194876454
always put popup links in a, even if it is disabled
2016-07-22 16:03:57 -04:00
6d1f85bcd6
fix spacing and code style, and when logging in, change view to console
2016-07-22 16:03:39 -04:00
9262d9d14e
remove debug messages on css changing
2016-07-22 16:02:55 -04:00
3504c1d8f5
Add Id to the title for each monitor
2016-07-21 15:02:01 -04:00
440f8fafdd
implement object based versions of getImageSrc and creatListThumbnail
2016-07-20 15:21:23 -04:00
8c8461a88e
Update to use Event object and object based createListThumbnail function
2016-07-20 15:20:51 -04:00
b1d0223c30
implement human_filesize
2016-07-20 15:20:21 -04:00
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
4caa20821a
fix
2016-07-14 11:57:06 -04:00
eb0ddc4e32
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
2016-07-14 11:55:27 -04:00
b6c02b563b
turn off host validation
2016-07-14 10:22:09 -04:00
a30610fbda
Merge branch 'master' into storageareas
2016-07-12 10:31:10 -04:00
410e154b7f
code style
2016-07-12 10:29:40 -04:00
19265b631a
custom banner text on web console
2016-07-09 13:11:30 -05:00
3eccdcd3e2
Merge pull request #1524 from ZoneMinder/add_api_auth
...
if user=&pass= are in request, use them for auth in api
2016-06-29 21:47:44 +10:00
f3779d543c
Merge pull request #1521 from ZoneMinder/fix_zone_edit
...
update area when points move
2016-06-29 21:46:28 +10:00
bdd0790106
Merge pull request #1522 from ZoneMinder/video_session
...
Move the session start down to where it is actually needed so that we…
2016-06-29 21:45:12 +10:00
9f00971e6b
Use Debug for debug output instead of Error
2016-06-27 10:27:26 -04:00
4fc68c0aa0
Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by
2016-06-27 10:26:37 -04:00
6ab2b33e95
fix merge
2016-06-27 09:10:35 -04:00
6e4c8fa224
need to set the Id when duping
2016-06-24 10:31:15 -04:00
791c8fb3d5
add setting of object property
2016-06-24 10:30:56 -04:00
d732d9a49a
fix merge
2016-06-24 10:02:20 -04:00
c1f30480e3
fix merge
2016-06-23 12:49:27 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
31a5252afa
apply btn and btn-primary styles to remaining buttons on console
2016-06-21 09:22:32 -04:00
513de21260
Merge branch 'add_api_auth' into storageareas
2016-06-21 09:10:06 -04:00
b4aec41d3d
fix warnings and move User import up higher to where it needs to be
2016-06-21 09:09:58 -04:00
4230bd1bd5
move the control_fields into the class so that it is available.
2016-06-20 12:46:23 -04:00
9c7b22086f
introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable
2016-06-20 12:41:14 -04:00
1d1cedce95
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
2016-06-20 12:40:33 -04:00
26bba58c56
Merge branch 'master' into feature-h264-videostorage
2016-06-17 11:09:47 -04:00
3914e0b394
:Merge branch 'fix_zone_edit' into storageareas
2016-06-16 12:04:18 -04:00
0c82e82ae2
Don't update x in updateY and don't update y in updateX as they are not defined.
2016-06-16 12:00:00 -04:00
d0e08b32f5
Merge pull request #1506 from Disassembler0/master
...
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-06-17 00:01:08 +10:00
8e7665d397
use getStreamHTML instead of duplicated code
2016-06-14 12:40:18 -04:00
d5d48bef8a
clean out unused variables and don't scale the popup window. The contents of it won't be scaled.
2016-06-14 12:39:51 -04:00
bfa46e26ee
Use monitor Id instead of the array index. Id is unique, so just use it.
2016-06-14 12:39:15 -04:00
acba5bccf1
Always include the monitor Id in the tag id for the videostream
2016-06-14 12:38:37 -04:00
0f1a1a6294
log invalid calls to Monitor Object
2016-06-14 12:38:17 -04:00
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10:00
abad7cbf9f
Merge branch 'fix_zone_edit' into storageareas
2016-06-13 09:43:03 -04:00
83ac4cd061
change the input handler from onchange to oninput. Disable form submit when hitting enter
2016-06-13 09:40:04 -04:00
632ec38d7d
Put back in neccessary callt o updateArea
2016-06-12 16:10:24 -04:00
4f2e0edb44
remove unnecssary updateAreas
...
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
c3043c1487
cleanups, remove unneccessary updateArea calls
2016-06-07 21:22:22 -04:00
4fbab64368
Merge branch 'add_api_auth' into storageareas
2016-06-07 16:33:50 -04:00
dbdd1ae51e
remove debug logging
2016-06-07 16:26:58 -04:00
f26c9168c4
if user=&pass= are in request, use them for auth
2016-06-07 16:25:35 -04:00
94174a1fe2
use user= and pass= instead of auth hash
2016-06-07 15:47:59 -04:00
5f76cc8677
accept user=&pass= in url for auth
2016-06-07 15:14:47 -04:00
086d435712
send zmcCommand to api on server
2016-06-07 14:39:59 -04:00
b2dfdea66e
Merge branch 'fix_zone_edit' into storageareas
2016-06-07 11:45:50 -04:00
593fe2b0c5
update area when points move
2016-06-07 11:40:53 -04:00
1930b18100
Move the session start down to where it is actually needed so that we don't hold it open while generating videos
2016-06-07 10:38:37 -04:00
bb6adc3012
fix missing space
2016-06-07 09:37:05 -04:00
f0ec2a65ee
Merge branch 'fix_errors_when_event_not_found' into storageareas
2016-06-03 10:47:47 -04:00
380b86614f
put quotes around integer values that will be empty strings if the event is not found
2016-06-03 10:46:21 -04:00
b8c406f969
Merge branch 'master' into storageareas
2016-06-03 09:32:55 -04:00
060988c05c
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
2016-05-31 16:02:37 -04:00
a57a3d3186
Merge pull request #1501 from ZoneMinder/fix_zone_edit
...
Fix zone edit
2016-05-31 10:33:31 -05:00
883b323528
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
2016-05-29 22:16:00 +02:00
1add5a954a
Merge branch 'fix_filter_actions' into storageareas
2016-05-29 11:37:08 -04:00
9f6f5100fe
also copy Name from the request on update and only show delete button if it has a name
2016-05-29 11:32:18 -04:00
7725109917
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 12:47:32 -04:00
101c93d422
When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object
2016-05-27 12:45:36 -04:00
c4e5299943
sync up auto to Auto
2016-05-27 12:45:04 -04:00
c25b680799
Merge branch 'fix_filter_actions' into storageareas
2016-05-27 11:12:18 -04:00
65e33d6c19
synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter
2016-05-27 11:11:30 -04:00
7277283659
rename AttrServerId to AttrServer, because that is the text that is returned
2016-05-27 10:12:46 -04:00
d52a6f9a95
Merge branch 'improve_filter' into storageareas
2016-05-27 09:57:05 -04:00
3058dd9463
Merge branch 'id_on_console' into storageareas
2016-05-26 12:19:33 -04:00
f461bc1e80
get rid of extra )
2016-05-26 12:18:58 -04:00
05709f3084
Merge branch 'id_on_console' into storageareas
2016-05-26 11:17:41 -04:00
f969186abb
add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console
2016-05-26 11:15:13 -04:00
730abc9789
make zones unclickable when zm is not running
2016-05-26 09:35:36 -05:00
1972c4116b
Merge pull request #1486 from connortechnology/update_image_view
...
Update image view
2016-05-26 09:05:14 -05:00
0d08c50199
change quotes
2016-09-29 12:22:01 -04:00
ab8b58ba48
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:44:30 -04:00
5c867aa5f5
Merge branch 'fix_auth_timeout' into storageareas
2016-09-29 10:10:38 -04:00
ceaacf91bf
Merge pull request #1470 from connortechnology/api_improvements
...
Api improvements
2016-05-25 12:45:03 -05:00
7a08d4620f
Merge branch 'master' into storageareas
2016-05-25 10:17:46 -04:00
575f8ec265
Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
...
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
8f1596d683
use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr
2016-05-25 09:08:28 -04:00
7cfa2a5eaa
Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone
2016-05-24 16:46:34 -04:00
277fdafa85
Remove entry for Server Name, making Server Id just say Server. The filters will be populated with a dropdown, so no need to go by Id or Name
2016-05-24 16:45:55 -04:00
8fabeb78d3
Merge branch 'fix_zone_edit' into storageareas
2016-05-24 15:55:49 -04:00
a8e407172a
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
2016-05-24 15:50:22 -04:00
89f58daf89
Merge branch 'master' into fix_zone_edit
2016-05-24 15:30:56 -04:00
ae1eb94f27
fix getStreamHTML when using helper
2016-05-24 15:10:37 -04:00
0052bb080c
unlink only if file exists
2016-05-24 12:13:17 -05:00
00abd36af8
fix the other case of the wrong case of rtsp
2016-05-24 12:19:31 -04:00
056eed6df9
fix to show RTSP describe option when switching back to rtsp
2016-05-24 12:15:59 -04:00
bc49aa6aa6
add missing ; and remove extra )
2016-05-24 09:34:36 -04:00
5eac0559e2
Merge branch 'master' into hide_rtspdescribe
2016-05-24 09:32:41 -04:00
bec14bf111
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
...
pass in the server url into the monitor object to use instead of the …
2016-05-23 20:14:35 -05:00
2ab79820a1
Add back changes
2016-05-22 08:08:12 -07:00
4018cab743
don't pass partial data to daemoncontrol
2016-05-19 14:53:16 -04:00
fff54e4086
update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include
2016-05-18 09:02:14 -04:00
e62ea454ba
Merge branch 'master' into storageareas
2016-05-17 10:48:52 -04:00
20c4d07a00
Merge branch 'master' into hide_rtspdescribe
2016-05-16 14:40:04 -04:00
0faa28d058
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-05-16 14:38:49 -04:00
6084e2d00f
improve error message. The unrecognized action error happens above, so this error should just mention permissions
2016-05-16 14:38:40 -04:00
5e419e85d7
move logger down, as thisURL gets set in the skin.js and comment out overlay.js
2016-05-16 14:37:35 -04:00
e28cb5b412
fix body padding
2016-05-16 13:29:13 -04:00
9601b30972
Add Width, Height and alt to frame
2016-05-16 13:26:44 -04:00
e4566f2e8e
Merge branch 'update_image_view' into storageareas
2016-05-16 12:23:19 -04:00
df8964c1f9
use eid= & fid= instead of path to frame image. The use of view=image also provides more security.
2016-05-16 10:33:21 -04:00
235095ed5f
fix URL to image view
2016-05-16 10:32:43 -04:00
9a1b0b79b9
don't use a dropdown for montage, etc
2016-05-13 11:43:38 -04:00
a61dade6df
Merge branch 'fix_montage_server_refs' into storageareas
2016-05-13 11:11:27 -04:00
3ed6014f61
Merge branch 'iconnor-updated-console' into storageareas
2016-05-13 11:11:19 -04:00
8cb2692bbb
pass in the server url into the monitor object to use instead of the portal url
2016-05-13 11:09:12 -04:00
e301eaf6e4
use instead of $ to reference jquery
2016-05-13 11:08:04 -04:00
85f950d80a
put jquery into no conflict mode so it doesn't overwite mootools use of $
2016-05-13 09:45:24 -04:00
1ce2e597cf
fix body top padding
2016-05-12 20:00:37 -04:00
ed3e975e5a
take fid and eid as alternate parameters
2016-05-12 11:55:48 -04:00
2144cb7de6
fix body padding only for console and options
2016-05-12 10:45:13 -04:00
1530096560
whitespace/google code style
2016-05-12 10:17:41 -04:00
aba80f0935
introduce htmlselect as an alternative to buildselect
2016-05-12 09:43:37 -04:00
b513bcef82
icon's gonna kill me
2016-05-10 20:09:41 -04:00
af3cae578e
fixed verbose handling bug for status command on zmu
2016-05-10 20:07:28 -04:00
8d5f2a8e5d
added iconnor's change back
2016-05-10 19:17:09 -04:00
df830a5190
resolved merge conflicts
2016-05-10 19:15:00 -04:00
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
2af96237b3
increase filter save popup height
2016-05-10 10:02:07 -04:00
c0d3d69bec
Merge pull request #1420 from connortechnology/fix_event_menubars
...
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
a8de0bff71
Merge branch 'master' into storageareas
2016-05-09 19:30:02 -04:00
35783f7dc0
Merge branch 'mysql_fixes' into storageareas
2016-05-09 19:27:42 -04:00
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
7f9c70d521
when value to be stored is undefined or '', then set the field=NULL
2016-05-09 13:39:40 -04:00
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
beebe74e7b
Merge branch 'merge_db_connects' into storageareas
2016-05-09 12:26:17 -04:00
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
e4171855bb
add padding for nabar to body
2016-05-07 18:12:31 -04:00
ae40dc8b1b
revert to fixed navbar
2016-05-07 18:11:58 -04:00
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
654d4d2bee
Merge branch 'api_fixes' into storageareas
2016-05-07 10:56:47 -04:00
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
51e6372362
remove extra hidden fields
2016-05-06 18:20:05 -04:00
dcdefac48a
fix styles in header, move footer back into header
2016-05-06 16:08:32 -04:00
7219e0624b
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:56:07 -04:00
9756f59a2c
still trying to fix eventcounts
2016-05-06 15:56:01 -04:00
97a1d5a648
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:53:48 -04:00
52b4e98e5a
fixes
2016-05-06 15:53:19 -04:00
fc191dfaa5
fixes
2016-05-06 15:52:07 -04:00
38877f802c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:47:48 -04:00
905b69a394
fix too many {
2016-05-06 15:47:29 -04:00
7c3a7a6fda
fix i to monitor_i in for loop
2016-05-06 15:46:47 -04:00
38e02db9cf
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:46:00 -04:00
daf10c1b84
make displayMonitors global
2016-05-06 15:44:35 -04:00
f8d7f9906d
fixup merging of Event data into the monitor array
2016-05-06 15:44:23 -04:00
2ccefdb23c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:30:25 -04:00
f4df9e053d
port sidebar css over from classic to flat
2016-05-06 15:30:10 -04:00
fb1b8000ec
fix the use of when specifying a skin
2016-05-06 15:24:20 -04:00
02b5cd6b6c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:17:10 -04:00
5d8eeb5b56
deprecate header, just the getNavBarHTML function
2016-05-06 15:16:48 -04:00
da97dfd9cf
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:59:10 -04:00
ed5cb2f3ed
fix global language problems
2016-05-06 14:58:41 -04:00
99d9f98244
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:40:08 -04:00
956b971719
put back maxWidtha nd maxHeight
2016-05-06 14:39:48 -04:00
b3b63ec1d9
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:38:17 -04:00
829202b42a
move more eventcounting stuff to console.php.
2016-05-06 14:38:08 -04:00
b67ea65fcb
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:34:02 -04:00
297f27af8c
fix missing {
2016-05-06 14:33:56 -04:00
f1e22f9265
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:32:57 -04:00
7acf6cb694
fix colon to semi colon
2016-05-06 14:32:52 -04:00
01397b6695
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 14:31:27 -04:00
83795805f2
Move state getting into index.php
2016-05-06 14:30:50 -04:00
1d673a0b8c
move header into a function in functions.php. Move event population into console.php
2016-05-06 14:30:32 -04:00
7df2685223
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 12:51:40 -04:00
e87a35b04d
Merge branch 'always_show_ptz' into storageareas
2016-05-06 12:51:15 -04:00
c9f1614e32
If the camera has no centering control, don't make it look like it does. This also removes a logged error
2016-05-06 12:51:03 -04:00
d5f1519829
Can't externally reference .js.php, they have to be inline js
2016-05-06 12:40:23 -04:00
b333b8ebee
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 12:06:47 -04:00
ee015ee674
whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup
2016-05-06 12:06:13 -04:00
44e5b566b8
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:56:24 -04:00
8405db4750
Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere
2016-05-06 11:56:03 -04:00
b3b9eaa7d5
better code for deprecate sequpdownarrays
2016-05-06 11:44:13 -04:00
be4f155160
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:42:46 -04:00
4784f8b630
deprecate the seqUp and seqDown arrays
2016-05-06 11:36:11 -04:00
4b838dc66c
deprecate minSequence and maxSequence
2016-05-06 11:29:49 -04:00
b0e977f8ed
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 11:26:53 -04:00
55567b66e9
deprecate minSequence and maxSequence use
2016-05-06 11:04:35 -04:00
b0a057724a
document minSequence use
2016-05-06 11:04:22 -04:00
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
4b782efd54
Whitespace fixes
2016-05-05 15:30:24 -04:00
49dc917b2e
Merge isaac:ZoneMinder.p1 into storageareas
2016-05-05 15:24:14 -04:00
27b928839c
deprecate view=image-ffmpeg
2016-05-05 15:04:11 -04:00
1f6425b1b7
Fix for SQL to load next and previous event
2016-05-05 14:50:15 -04:00
0e74778dda
add find and find_all functions
2016-05-05 14:49:57 -04:00
df960bb1ea
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
2016-05-05 14:49:40 -04:00
d342b11e64
remove servers references from header, they go in console
2016-05-04 09:07:29 -04:00
36f94dddec
cleanup merge problems
2016-05-03 14:46:22 -04:00
d25e75f485
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-05-03 14:39:59 -04:00
c3628a8dfd
Merge branch 'updated-console' into storageareas
2016-05-03 14:34:58 -04:00
4defe92911
Merge branch 'master' into updated-console
2016-05-03 14:22:37 -04:00
36da4aed88
Push monitor view back to before I messed with it
2016-05-03 13:55:38 -04:00
b92c9f9be4
Add state modal to options view
2016-05-03 13:55:38 -04:00
3271d17a3a
Remove header from log view
2016-05-03 13:55:38 -04:00
bfda50b693
Also don't load additional JS to Log view
...
Another issue with mootools & jquery conflicts
2016-05-03 13:55:38 -04:00
dcd6449a9b
Don't include extra js libraries for monitor view.
...
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:55:38 -04:00
464db86c53
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-05-03 13:55:38 -04:00
237f1c3a9c
Change sidebar to lighter colors
2016-05-03 13:53:30 -04:00
6a48b9041a
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-05-03 13:53:30 -04:00
44fbbee152
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-05-03 13:53:30 -04:00
800378b095
Add state view's js and php to all pages as it is now part of header
2016-05-03 13:53:30 -04:00
2e2cc3d9ab
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-05-03 13:53:30 -04:00
62fc4dff7e
Change class of delete button to be red
2016-05-03 13:53:30 -04:00
0f5089bbf8
Fix button alignment on console page, and add button styling
2016-05-03 13:53:30 -04:00
f305a6ffc8
Replace console table css with styles from bootstrap
2016-05-03 13:53:30 -04:00
8b5693129b
Include Chart.js
2016-05-03 13:53:30 -04:00
0bb08a6256
clean up options a bit more
2016-05-03 13:51:54 -04:00
291179d3b1
Add side tab list to options page, and style it.
2016-05-03 13:51:54 -04:00
cf6f36b0e5
Add header to log view
2016-05-03 13:51:54 -04:00
3e51429fb0
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-05-03 13:51:54 -04:00
e435b3ebed
remove duplication
2016-05-03 13:51:54 -04:00
d698f2af14
Restyle the header. Full width, dark background, collapseable.
2016-05-03 13:51:54 -04:00
6c1f53cbdc
Load jquery and bootstrap js in classic skin
2016-05-03 13:51:54 -04:00
27c9d06aee
Add local copy of bootstrap.js 3.3.6
2016-05-03 13:51:54 -04:00
eb443e371f
Update doctype to html5, and add additional meta tags
2016-05-03 13:51:54 -04:00
ff15fdb6d9
Make the ZM logo in header stand out
2016-05-03 13:51:54 -04:00
7a6dae69f0
Convert options layout to side-tabs, and improve readability
2016-05-03 13:51:54 -04:00
d95cf8dae5
Push the options page down a bit to make tab look better
2016-05-03 13:51:54 -04:00
d12fc95ad1
Restyle options view with horizontal form layout
2016-05-03 13:51:54 -04:00
2214cb6389
Add styling to delete / save / add buttons in options.php
2016-05-03 13:51:54 -04:00
b317797a6c
Remove cancel button from options as it no longer makes sense.
2016-05-03 13:51:54 -04:00
2a9b10e80e
Update options.php to use bootstrap container
2016-05-03 13:51:54 -04:00
be8385535d
Oops. Move Console view outside of canView(system) restriction
2016-05-03 13:51:54 -04:00
858845e3a1
Add a link back to console in header
2016-05-03 13:51:54 -04:00
a8c7ec250d
Make the Options link a standard href (not a popup).
2016-05-03 13:51:54 -04:00
25c9328187
Move console php code to header as that code is now needed in additional views.
2016-05-03 13:51:54 -04:00
cd8e8d9685
Move the header into its own file, and include it in options view.
2016-05-03 13:51:34 -04:00
a4e07e9a73
Update options styling
2016-05-03 13:51:34 -04:00
2fff9a6a8b
Fix state link to do popup like before
2016-05-03 13:51:34 -04:00
3e59aca739
Additional footer padding
2016-05-03 13:51:34 -04:00
d6b0b637ea
Add styles to additional console buttons
2016-05-03 13:51:34 -04:00
daef9eb40b
Remove extra #footer styling
2016-05-03 13:51:34 -04:00
ea0c61d482
Bump up the default font size
2016-05-03 13:51:34 -04:00
c3cc5d46bd
Wrap footer in container-fluid
2016-05-03 13:51:34 -04:00
d7f471f41f
Restyle of Login page.
2016-05-03 13:51:34 -04:00
03c188db89
Move recaptcha javascript to actual <head> tag
...
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-05-03 13:51:34 -04:00
aa3c99fc68
Initial major restyle of classic skin.
2016-05-03 13:51:34 -04:00
c4c9b6c494
Local copy of bootstrap 3.3.6, included in classic skin.
2016-05-03 13:51:06 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
a1b4869ee6
Add state modal to options view
2016-05-03 13:33:22 -04:00
0a77da8a2f
Remove header from log view
2016-05-03 13:33:08 -04:00
c2fd3dd84a
Also don't load additional JS to Log view
...
Another issue with mootools & jquery conflicts
2016-05-03 13:25:39 -04:00
6768fe5554
Don't include extra js libraries for monitor view.
...
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:06:28 -04:00
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
e53bd1292e
increase events list width to accomodate thumbnails
2016-05-02 14:30:54 -04:00
240d08133d
implement caching of scaled images.
2016-05-02 14:12:30 -04:00
fe63e4af80
remove extra semi colon
2016-05-02 13:42:42 -04:00
550fdc9295
change thumbnail path to specify eid and fid instead of path to the jpg.
2016-05-02 13:42:15 -04:00
b8c8ff3807
fix if structuring
2016-05-02 13:36:19 -04:00
b38aa60209
fix height of function popup
2016-05-02 11:56:42 -04:00
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
9d6a7541c8
add Id column to storage areas
2016-05-02 10:40:42 -04:00
272e1da958
rough in Server object support
2016-05-02 10:37:19 -04:00
4aafd1d417
Make api use zm.conf
2016-04-30 13:50:09 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
0044161b9c
Merge branch 'fix_zone_edit' into storageareas
2016-04-29 10:46:37 -04:00
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
af66105c37
Merge branch 'master' into storageareas
2016-04-29 08:28:53 -04:00
513d1568d0
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
...
handle disk_free_space error
2016-04-29 21:36:29 +10:00
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
010f748016
fix clone merge
2016-04-26 15:02:34 -04:00
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
0adbaafd98
Merge branch 'master' into storageareas
2016-04-26 13:10:37 -04:00
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
59db5d42e7
include Frame.php
2016-04-25 15:00:27 -04:00
b50172fc2e
introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.
2016-04-25 14:59:55 -04:00
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
fed575bdb4
add some missing () on class method calls. Remove some no longer needed global 's and some empty lines
2016-04-25 08:56:21 -04:00
f3a2f9e223
Revert "Add sidebar and top nav to Monitors popup view"
...
This reverts commit 315fb3e857
2016-04-24 14:15:42 -04:00
802a8928d0
Revert "Add missing <form> back to monitor view"
...
This reverts commit cc08607939
2016-04-24 14:15:33 -04:00
cc08607939
Add missing <form> back to monitor view
2016-04-24 14:03:04 -04:00
b4d8bc6a52
Change sidebar to lighter colors
2016-04-24 13:51:48 -04:00
f2d43de137
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-04-24 00:52:19 -04:00
08fb74c992
Major rewrite of states view. Now a modal on every page.
...
Read: No longer an HTML popup window.
* State html is now included toward the bottom of every page
* The states.js has been rewritten in jquery
* Applying, deleting or saving a state reloads the page after the POST is done
2016-04-24 00:48:16 -04:00
ca0ba4a5f8
Add state view's js and php to all pages as it is now part of header
2016-04-23 22:59:50 -04:00
2ff01b6bcb
remove unneeded global
2016-04-22 13:36:12 -04:00
30b746c603
Add missing ()'s
2016-04-22 13:35:40 -04:00
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
ba3f9d1b9a
Merge branch 'master' into storageareas
2016-04-19 12:03:21 -04:00
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
10589ee913
Change 'marked' row style to bootstrap 'danger' and find it with jquery
2016-04-18 15:38:10 -04:00
2c5e04a9af
Change class of delete button to be red
2016-04-18 15:38:01 -04:00
7504d69dea
Fix button alignment on console page, and add button styling
2016-04-18 15:25:48 -04:00
c9b81e07c2
Replace console table css with styles from bootstrap
2016-04-18 15:20:32 -04:00
bc99e4c476
whitespace changes
2016-04-17 09:29:14 -04:00
479ea17ed5
fix event menubars
2016-04-16 15:13:18 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
4b4add49bd
Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas
2016-04-15 13:18:35 -04:00
ccb5ea766d
add the toggle for RecordAudio so that the checkbox works to turn off Audio
2016-04-15 13:16:52 -04:00
b57abb4e54
revert
2016-04-15 12:50:51 -04:00
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
6ca40966a1
remove teh dropdown-ness of the montage options
2016-04-12 08:52:26 -04:00
61bd60184a
Merge branch 'random_fixes' into storageareas
2016-04-11 11:28:24 -04:00
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
f3673fe4b1
Merge branch 'icon_video' into storageareas
2016-04-11 10:32:07 -04:00
67abf91925
add a view to check auth and just send the video
2016-04-11 10:31:51 -04:00
56c2679afd
Merge branch 'icon_video' into storageareas
2016-04-11 10:30:01 -04:00
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
5542788a45
make cannot write to content dir an error, rather than fatal
2016-04-10 18:45:38 -05:00
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
fbb2a527e6
remove setButtonState. it is not needed.
2016-04-10 07:55:45 -05:00
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
78c6e14e0c
Merge branch 'master' into storageareas
2016-04-09 14:52:28 -04:00
c0c543e029
change quotes to prevent php7 complaint
2016-04-09 11:25:56 -04:00
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
6d27a857aa
put a zones class on the svg
2016-04-08 14:38:50 -04:00
c73e768f1f
put in the onclick for the zone to open the edit page
2016-04-08 14:25:19 -04:00
b10c6ee093
fix Monitor capitalisation
2016-04-08 14:23:44 -04:00
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
bbd33cc159
add monitor class so we don't have to everywhere else
2016-04-08 13:56:49 -04:00
498bceae0a
remove styles for svg circles
2016-04-08 13:44:20 -04:00
22f207602b
add css for the svg zones
2016-04-08 13:43:00 -04:00
f749ff47ea
convert to monitor object
2016-04-08 13:40:32 -04:00
0ce85137dc
remove points. Don't need them here
2016-04-08 13:39:31 -04:00
56a91ed4b2
rename monitor object from Monitor to monitor. Remove points in zone list.
2016-04-08 13:37:29 -04:00
8735f1ac73
convert to monitor object
2016-04-08 13:37:01 -04:00
11981efad2
add this back
2016-04-08 13:20:26 -04:00
6bb95beb9a
Merge branch 'svg_zones' into storageareas
2016-04-08 13:20:01 -04:00
34bfbb4708
blah
2016-04-08 13:18:13 -04:00
f20945bf84
update zone points in SVG
2016-04-08 13:13:10 -04:00
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
256df08af4
update SVG polygon points on point update
2016-04-08 12:32:26 -04:00
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
7491aa4381
fix spelling mistake
2016-04-06 10:55:11 -04:00
45f61b503b
add these back
2016-04-06 10:53:28 -04:00
b4b622668c
fix merge
2016-04-06 08:39:47 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
a0e6c004a2
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
...
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
ab6758de45
Merge pull request #1387 from ZoneMinder/reload_stream_on_scale
...
reload stream on scale change
2016-04-04 20:32:53 -05:00
6c8e8368e1
rtsp should be lower case
2016-04-04 16:56:54 -04:00
564f189416
Merge branch 'always_show_ptz' into storageareas
2016-04-04 16:45:54 -04:00
868e5a51fa
Rename some of the columns names when laoding Control settings as they conflict with Monitor columns
2016-04-04 16:44:21 -04:00
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
ec6782a663
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:33:46 -04:00
6c92c0e3f7
Merge branch 'reload_stream_on_scale' into storageareas
2016-04-04 16:13:35 -04:00
98fce7c3c6
Merge branch 'reload_stream_on_error' into storageareas
2016-04-04 16:13:26 -04:00
bc9760ce79
Merge branch 'master' into storageareas
2016-04-04 16:13:17 -04:00
123a1a898a
try to reload the image stream on error.
2016-04-04 15:04:09 -04:00
0b13f9d76f
reload stream on scale change
2016-04-04 14:58:07 -04:00
5f3e7134fb
split power out of the Panel box so that I can style it better
2016-04-04 13:22:26 -04:00
f91ff4503a
rework the ptz controls to take up less vertical space, also don't set width of buttons
2016-04-04 13:20:04 -04:00
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
faa75bbe39
fix wrong brace and needs quotes
2016-04-04 12:00:29 -04:00
b3f0f5d0e8
Merge branch 'updated-console' into storageareas
2016-04-04 11:51:07 -04:00
197ae67313
Merge branch 'always_show_ptz' into storageareas
2016-04-04 11:47:29 -04:00
3e20e5f21c
fix ptz control box size
2016-04-04 11:40:01 -04:00
9dfe71ceb8
Always show events and always show ptz controls. Also clean out some commented out cruft
2016-04-04 11:39:12 -04:00
2233747fcb
add a missing t
2016-04-04 11:38:16 -04:00
43e4052dd9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-04-04 11:36:03 -04:00
dd153d8efb
add header.php to autotools build
2016-04-04 11:35:51 -04:00
c8fa0a9b4f
Merge branch 'master' into feature-h264-videostorage
2016-04-04 10:14:15 -04:00
33d6d311b0
Include Chart.js
2016-04-02 00:48:58 -04:00
315fb3e857
Add sidebar and top nav to Monitors popup view
2016-04-01 15:52:52 -04:00
b3c7002eca
install view_video as well
2016-04-01 15:44:37 -04:00
96aa20fb79
value should be lower case when checking for rtsp
2016-04-01 15:43:59 -04:00
8a2605578a
fix type in htmlSelect
2016-04-01 15:43:40 -04:00
d71eaa66ec
use view_video.php as a short-term fix for viewing video
2016-04-01 15:43:31 -04:00
f59ed9cf0d
clean up options a bit more
2016-04-01 14:39:15 -04:00
5f6d140de5
Load all event fields, so we know we have them deeper in the code.
2016-04-01 14:07:27 -04:00
92e0552f8e
Add side tab list to options page, and style it.
2016-04-01 14:02:19 -04:00
8c5d309feb
Add header to log view
2016-04-01 13:44:37 -04:00
fa3425f2b0
Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console
2016-04-01 13:43:26 -04:00
ca96481036
fix thumbnail generation from video file
2016-04-01 13:02:31 -04:00
cbebdfe670
add Time function to get unixtime from StartTime
2016-04-01 13:00:59 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
6ebd71f980
instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file
2016-04-01 12:51:09 -04:00
6816a4c75b
Merge branch 'iconnor_video' into storageareas
2016-04-01 11:35:38 -04:00
a2e228a5ca
put quotes aroudn the string
2016-04-01 11:01:16 -04:00
59bf780537
introduce htmlSelect as a better version of buildSelect
2016-04-01 10:35:59 -04:00
3140905d02
whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array
2016-04-01 10:35:34 -04:00
c074f6e0bf
Add a set function to take an array of value to set in the Object
2016-04-01 10:34:40 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
e7ee464a17
Add a RecordAudio setting to the Storage Tab
2016-03-31 15:50:44 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
89e70b324d
add boostrap
2016-03-30 14:28:27 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
e9c65785e8
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-03-30 10:56:53 -04:00
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
50f9241c14
When no Id is specified, default to ZM_DIR_EVENTS
2016-03-29 15:38:53 -04:00
1b69299c2d
Include Monitor object so it can be used elsewhere
2016-03-29 14:36:42 -04:00
0ab6e27259
Use Monitor object
2016-03-29 14:35:12 -04:00
cfa11b95dc
Add missing Server and Storage Area filters
2016-03-29 12:27:23 -04:00
d91045319d
Use Event object delete method in deleteEvent
2016-03-29 12:07:13 -04:00
c309cdaad4
include Event object so it can be used elsewhere
2016-03-29 12:06:51 -04:00
f0a307e082
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
...
Conflicts:
distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
1ea1852476
Do some Storage Areas support
2016-03-29 11:52:25 -04:00
655116eea9
add LinkPath and delete methods
2016-03-29 11:49:15 -04:00
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
757740ede5
Move skin and css changing up above the include of header.php so that the set cookie call will work
2016-03-23 16:12:51 -04:00
dd06db0bf0
remove duplication
2016-03-23 15:54:20 -04:00
a66e97de09
Merge & fix new console & options
2016-03-23 09:48:57 -04:00
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -04:00
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
dd937f7732
Restyle the header. Full width, dark background, collapseable.
2016-03-16 00:51:13 -04:00
8fdf3291b4
Load jquery and bootstrap js in classic skin
2016-03-16 00:49:51 -04:00
53d0e1c8df
Add local copy of bootstrap.js 3.3.6
2016-03-16 00:45:34 -04:00
d01ef25f82
Update doctype to html5, and add additional meta tags
2016-03-16 00:17:05 -04:00
6f409f0bf4
Make the ZM logo in header stand out
2016-03-15 23:53:29 -04:00
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
87932002cf
Push the options page down a bit to make tab look better
2016-03-15 14:45:40 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
694ad0b539
Add styling to delete / save / add buttons in options.php
2016-03-15 14:08:01 -04:00
bd30d40522
Remove cancel button from options as it no longer makes sense.
2016-03-15 14:03:17 -04:00
0004a1180e
Update options.php to use bootstrap container
2016-03-15 13:56:54 -04:00
26748c2de5
Oops. Move Console view outside of canView(system) restriction
2016-03-15 13:52:36 -04:00
f05c1548ce
Add a link back to console in header
2016-03-15 13:49:14 -04:00
299c61c1ec
Make the Options link a standard href (not a popup).
2016-03-15 13:47:31 -04:00
8070bf8700
Move console php code to header as that code is now needed in additional views.
2016-03-15 13:46:03 -04:00
49f46ac927
Move the header into its own file, and include it in options view.
2016-03-15 13:43:49 -04:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
2378c9a359
Fix state link to do popup like before
2016-03-12 20:44:42 -05:00
d202760d82
Additional footer padding
2016-03-12 20:37:07 -05:00
f5ba52824a
Add styles to additional console buttons
2016-03-12 20:36:39 -05:00
a2c2101c48
Remove extra #footer styling
2016-03-12 20:28:16 -05:00
f80cbf52df
Bump up the default font size
2016-03-12 20:27:51 -05:00
bebb1017fd
Wrap footer in container-fluid
2016-03-12 20:27:22 -05:00
5e2d4bc325
Restyle of Login page.
2016-03-12 20:11:32 -05:00
a403c1db8c
Move recaptcha javascript to actual <head> tag
...
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-03-12 19:14:07 -05:00
8a47241e18
address issue #1335
2016-03-12 08:07:25 -05:00
71c35e712b
Initial major restyle of classic skin.
2016-03-12 03:28:02 -05:00
c9441ec8c0
Local copy of bootstrap 3.3.6, included in classic skin.
2016-03-12 01:16:19 -05:00
77f7a3642c
remove check for "selected" property
2016-03-09 10:34:06 -06:00
3280aff876
disable save button when nothing slected. fixes #1322
2016-03-09 09:43:44 -06:00
24ebc33ea4
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-03-09 20:54:11 +11:00
b06b82f634
widen filter popup, because storage area name or server name might be longer
2016-03-04 15:35:55 -05:00
86dbe4fa15
define default for StorageId to prevent error message
2016-03-03 09:22:53 -05:00
bcb403bf08
Merge branch 'fix_setButtonStates' into storageareas
2016-03-03 09:08:37 -05:00
c0ed40fd06
fix structure of if/for
2016-03-03 09:06:57 -05:00
cedc46adf3
Merge branch 'fix_setButtonStates' into storageareas
2016-03-02 09:12:19 -05:00
0d8c63f578
Merge branch 'master' into storageareas
2016-03-02 09:11:55 -05:00
bb0dcf3d43
fix setButtonStates. The checkboxes are an array.
2016-03-01 12:19:46 -05:00
466f2b2ae3
change multi-server error message text
2016-03-01 11:12:54 -06:00
84801fcb86
typo in function name
2016-02-27 13:06:33 -05:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
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
7c7d7b245c
Remove the XML skin folder
2016-02-26 22:30:20 +11:00
e6d57da0d4
Remove the mobile skin folder
2016-02-26 22:29:41 +11:00
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
86c223668d
Merge branch 'master' into storageareas
2016-02-25 19:11:38 -05:00
b294f210dc
Update to CakePHP 2.8.0 copy in lib folder
2016-02-25 23:25:24 +11:00
131d0daefe
fix syntax
2016-02-19 11:47:18 -05:00
afb0cf2a7e
Merge branch 'master' into storageareas
2016-02-19 11:09:18 -05:00
5a2a4baa89
Must load StorageId as well when loading event
2016-02-19 09:47:19 -05:00
e2d892961b
use storage area paths in getting analyze images and frame stills
2016-02-19 09:46:56 -05:00
68babd783b
Merge branch 'master' into storageareas
2016-02-17 09:46:56 -05:00
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -05:00
292e3a141f
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-12 13:53:34 -05:00
5da8df45a7
Merge branch 'hide_rtspdescribe' into storageareas
2016-02-12 13:53:09 -05:00
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
b7256a6891
Merge branch 'master' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
version
2016-02-10 09:17:40 -05:00
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
e106a86f5e
Add Concurrent
2016-02-05 11:59:05 -05:00
e67f247374
add ConcurrentFilter translation
2016-02-05 11:58:20 -05:00
51d814ad46
add concurrent to save filter
2016-02-05 11:58:05 -05:00
0674fa2d7a
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-02-04 12:21:33 -05:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
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
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
1c142a48a6
Merge pull request #1212 from RBxx/patch-1
...
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06:00
cbe88d0a3f
Merge pull request #1239 from ZoneMinder/trim_when_saving
...
use trim on values when saving.
2016-02-04 08:29:02 -06:00
08858685c5
add find_all function to Storage
2016-02-03 09:43:02 -05:00
555904c588
Add Storage column to console
2016-02-03 09:42:50 -05:00
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
Andrew Bauer
Kyle Johnson
Isaac Connor
Steve Gilvarry
Pliable Pixels
Jeff Vogt
Isaac Connor
bhaal2
corax
David Sabbath Grits
Isaac Connor
Isaac Connor
Disassembler
Andrew Bauer
Isaac Connor
josh4trunks
root
Laercio Motta
Robin Daermann
Jon Burgess
Dmitry Smirnov
Brandon Odegard
Isaac Connor
Isaac Connor
RBxx
SteveGilvarry