Commit Graph

2904 Commits

Author SHA1 Message Date
Isaac Connor ded1e0ea73 handle when window.open fails 2016-10-11 11:48:29 -04:00
Jeff Vogt 3801d9e43e Disabled autocorrect, autocapitalize, spellcheck on username field for login form 2016-10-10 11:27:36 -07:00
Andrew Bauer 7b574e0d41 Merge pull request #1645 from connortechnology/fix_onvif
Fix onvif
2016-10-04 16:34:58 -05:00
Isaac Connor 96b5af9021 Merge branch 'fix_onvif' into storageareas 2016-10-04 15:00:28 -04:00
Isaac Connor ac24865647 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:51 -04:00
Isaac Connor 6814bcc791 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:38 -04:00
Isaac Connor 09c5e3012a username and password don't actually have to be specified 2016-10-04 14:09:32 -04:00
Isaac Connor 21a94a6200 better error message 2016-10-04 10:29:37 -04:00
Isaac Connor 68936b9af9 code style, replace with ' 2016-10-03 21:58:57 -04:00
Isaac Connor d4be5b06ea Only generate auth hash when logged in. 2016-10-03 21:22:16 -04:00
Isaac Connor f4418260e7 Should only generate an auth hash if we are logged in. 2016-10-03 21:18:13 -04:00
Isaac Connor 16bee2ef55 only generate auth hash if we are logged in 2016-10-02 14:13:54 -04:00
Isaac Connor 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
Isaac Connor 404bbb79f0 must return the generated hash 2016-09-29 10:11:37 -04:00
Isaac Connor 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
Isaac Connor cf9fa78ca3 work on fixing event view 2016-09-29 09:28:48 -04:00
Isaac Connor 07ae6b6aa2 commit authhash to session 2016-09-28 11:49:00 -04:00
Isaac Connor 09f7c9ddf9 Merge pull request #1633 from bhaal2/storageareas
Storageareas
2016-09-28 09:43:00 -04:00
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 9bf48d27b1 implement caching the authhash in the session 2016-09-28 09:08:49 -04:00
Isaac Connor 1ae23b49bf generateAuthHash early when session is active, it will get cached in session 2016-09-28 09:08:36 -04:00
Isaac Connor 02a196d98b add missing ] 2016-09-28 08:30:22 -04:00
Isaac Connor e217ca17cd Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:57:53 -04:00
Isaac Connor 303a2c6c5f re-open session if neccessary to save AuthHashGeneratedAt 2016-09-27 11:56:31 -04:00
Isaac Connor 6840031ee3 fix auth timeout and user session[username] when checking auth hash for speedup 2016-09-27 11:51:55 -04:00
Isaac Connor e04266600e Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:04:12 -04:00
Isaac Connor 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
Isaac Connor 167214cb01 Merge branch 'cookie_scale' into storageareas 2016-09-27 10:05:16 -04:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00
Isaac Connor 0580ef0c88 whitespace changes 2016-09-26 20:09:09 -04:00
Isaac Connor 3dcc1c3697 fix php outputting extra newlines after content 2016-09-22 10:37:32 -04:00
Isaac Connor d96febd967 when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB 2016-09-21 16:00:23 -04:00
Pliable Pixels 92d7cad5f1 enabled utf8 2016-09-21 11:53:34 -04:00
Isaac Connor 091459004c ServerId can be 0 2016-09-21 10:30:31 -04:00
bhaal2 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
Isaac Connor 364a80fb94 don't output jpeg header unless there is some kind of success 2016-09-20 15:55:28 -04:00
Isaac Connor 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
Isaac Connor 5ce2e95fb7 replace getDiskPercent call with code to show percent for all storageareas 2016-09-20 12:18:50 -04:00
Isaac Connor 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
Isaac Connor 1add270b72 fixup saving Filters and executing them 2016-09-20 12:17:19 -04:00
Isaac Connor f06723a178 add disk_usage_percent and fix whitespace 2016-09-20 12:16:49 -04:00
Isaac Connor 5604fe5610 add more debugging and fix LinkPath -> LinkPath 2016-09-20 12:16:07 -04:00
bhaal2 c74af40ffb Had file open with old stuff. Fixed now. 2016-09-17 02:20:17 +10:00
bhaal2 aee6ae956d Moved '%' to getDiskPercent() where it should have been. 2016-09-17 02:13:33 +10:00
bhaal2 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
Isaac Connor 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
Isaac Connor 2c21fe80e7 Merge pull request #1626 from bhaal2/storageareas
Storageareas
2016-09-15 10:18:11 -04:00
bhaal2 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
bhaal2 76beaf281a Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas. 2016-09-15 19:44:13 +10:00
bhaal2 d5337a08a8 Modify getDiskPercent() to report disk space for all storage areas. 2016-09-15 19:41:16 +10:00
Isaac Connor 37c559ba3d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-09-14 12:49:55 -04:00
Isaac Connor cf45feea66 quiet the logs on initial view load 2016-09-14 12:49:47 -04:00
Isaac Connor fb8b2f2490 Merge pull request #1625 from bhaal2/storageareas
Storageareas
2016-09-14 12:08:55 -04:00
bhaal2 01ae4de123 Modified so deleting a filter is done by table Id instead of Name 2016-09-15 01:59:31 +10:00
bhaal2 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
bhaal2 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
bhaal2 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
bhaal2 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
bhaal2 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
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
bhaal2 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
bhaal2 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
Isaac Connor db8cada380 fix merge 2016-09-13 15:01:02 -04:00
Isaac Connor 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
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Steve Gilvarry 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
Andrew Bauer e35ef3ce83 Merge pull request #1617 from coracis/master
Update German translation
2016-09-09 08:55:19 -05:00
Andrew Bauer 321deb5506 Merge pull request #1599 from sabbath88/master
add some more translation
2016-09-09 08:40:05 -05:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
For easy pull-requesting
2016-09-09 14:20:03 +02:00
corax 6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
corax 430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Pliable Pixels 1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels 7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels 9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Kyle Johnson 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
Isaac Connor 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Isaac Connor 10abe98e91 merge from packet queue. add monitorId to livestream div lookup 2016-09-01 10:15:12 -04:00
Isaac Connor 5f07911a63 fix spacing 2016-08-31 10:09:42 -04:00
Isaac Connor ed1b6ccd58 Implement range support 2016-08-31 10:09:01 -04:00
Isaac Connor ffaf046485 fix missing / 2016-08-30 14:51:56 -04:00
Isaac Connor 27c1f95607 handle when ZM_BASE_PATH == '/' 2016-08-30 14:36:14 -04:00
Isaac Connor a28e7d8df8 fix typo 2016-08-30 14:24:51 -04:00
Isaac Connor 7411b47834 fix typo 2016-08-30 14:23:20 -04:00
Isaac Connor 6ce18c3628 ZM_BASE_URL is deprecated. Use ZM_BASE_PATH instead 2016-08-30 14:08:52 -04:00
Isaac Connor 237a4494b2 correct incorrect use of isset instead of array_key_exists 2016-08-30 13:44:57 -04:00
Isaac Connor 6204ed8dd4 correct incorrect use of isset instead of array_key_exists 2016-08-30 13:43:49 -04:00
David Sabbath Grits 2d44531d1f add some more translation 2016-08-25 14:24:14 +02:00
Isaac Connor 944a131142 Merge ../ZoneMinder.master into storageareas 2016-08-22 11:49:50 -04:00
Isaac Connor be7683299e use single quotes instead of double quotes 2016-08-22 11:49:45 -04:00
Isaac Connor 09ebcfb7f8 only put in the development h3 tag if the value has been set 2016-08-22 11:42:44 -04:00
Isaac Connor d6b126fe8c Add caller and line when an unknown function is called on the Monitor object 2016-08-22 11:28:53 -04:00
Isaac Connor eafe3d7748 Merge branch 'master' into storageareas 2016-08-17 10:31:55 -04:00
Isaac Connor c82c872665 add a default NULL value to __construct 2016-08-17 10:31:16 -04:00
Andrew Bauer 7d48b2c6c5 Merge pull request #1577 from ZoneMinder/fix_zmaControl
fix error in calling zmaControl
2016-08-17 08:36:51 -05:00