Andy Bauer
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
Andy Bauer
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
Isaac Connor
0f4b78b180
increase height of bandwidth popup
2016-12-21 10:46:42 -05:00
Isaac Connor
f92edc3456
refresh stream url when changing scale
2016-12-21 10:40:47 -05:00
Isaac Connor
02a2fdf58f
Merge branch 'remove_emptys' into storageareas
2016-12-20 16:40:42 -05:00
Isaac Connor
38c0cedecc
remove the use of empty which on php < 5.5 only supports variables.
2016-12-20 16:37:42 -05:00
Isaac Connor
c27d0270dc
Merge branch 'knnniggett-zmMemDetach' into storageareas
2016-12-20 15:40:14 -05:00
Isaac Connor
752f0eb40b
Merge branch 'master' into improve_filter
2016-12-20 11:43:02 -05:00
Andrew Bauer
68a24040ab
Merge pull request #1710 from connortechnology/path_zms_message
...
replace the old socket_sendto error message with something more useful
2016-12-20 10:30:35 -06:00
Isaac Connor
8b726996f7
FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant.
2016-12-19 21:36:39 -05:00
Isaac Connor
fe3f3d91ce
replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it.
2016-12-16 09:12:27 -05:00
Isaac Connor
794043cbe9
On successful login, tell php to regenerate the session id
2016-12-14 15:06:18 -05:00
Isaac Connor
ad157cf21c
fix tabs
2016-12-14 14:56:54 -05:00
Isaac Connor
69c39f8a23
set http_only flag in cookie settings
2016-12-14 14:39:44 -05:00
Isaac Connor
87e8f91868
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2016-12-13 15:06:07 -05:00
Isaac Connor
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
Isaac Connor
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
Isaac Connor
30ec67d4c3
Merge branch 'master' into disk_space_in_events
2016-12-13 13:28:32 -05:00
Isaac Connor
821f9f8e6e
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:58:10 -05:00
Isaac Connor
b5e4c94682
test for integer string as well
2016-12-08 15:58:00 -05:00
Isaac Connor
4fa24dcda4
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:53:46 -05:00
Isaac Connor
7c84e2417d
remove extra ?
2016-12-08 15:53:38 -05:00
Isaac Connor
f68c73b4a8
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 15:52:52 -05:00
Isaac Connor
08370b010e
Merge branch 'log_xss_fixes' into storageareas
2016-12-08 15:52:37 -05:00
Isaac Connor
42fdd1fbe9
Use htmlentities on the error message when dying because the string will be sent to the browser and if it includes scripts they will be run.
2016-12-08 15:52:21 -05:00
Isaac Connor
c8009baf3f
fix missing ; and test for integer string in limit
2016-12-08 15:46:42 -05:00
Isaac Connor
acbc5bc9e3
Merge branch 'cookie_http_only' into storageareas
2016-12-08 15:20:54 -05:00
Isaac Connor
772792a1b9
remove extra ,
2016-12-08 15:20:43 -05:00
Isaac Connor
ced701f56f
Merge branch 'fix_sql_injection' into storageareas
2016-12-08 14:58:50 -05:00
Isaac Connor
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
Isaac Connor
20793ee822
set httpOnly to true on cookie creation. This will override whatever is in php.ini
2016-12-08 14:25:29 -05:00
Isaac Connor
d600eb0e8b
Merge branch 'master' into fix_sql_injection
2016-12-08 13:39:04 -05:00
Isaac Connor
e7d0861530
check limit for a valid integer and complain if not.
2016-12-08 13:37:23 -05:00
Isaac Connor
587fd16aa6
Add testing for limit, sortField and all the filters to ensure that they are valid.
2016-12-08 13:31:44 -05:00
Isaac Connor
857b4e8345
Merge branch 'master' into improve_filter
2016-12-06 11:58:41 -05:00
Bernardus Jansen
986567839e
Additional minor changes
2016-12-02 10:08:49 +01:00
Bernardus Jansen
e27639f599
Updated dutch translation
2016-12-02 09:49:50 +01:00
Isaac Connor
9e5f52a0ae
fix MonitorId is part of event, not frame
2016-11-29 15:25:51 -05:00
Isaac Connor
2adb17ad90
fix type
2016-11-29 15:25:24 -05:00
Isaac Connor
c2d6b3d809
fix auth
2016-11-29 15:25:10 -05:00
Isaac Connor
f9af1e7129
put authorized check back after including actions.php where it needs to go
2016-11-28 11:34:46 -05:00
Isaac Connor
be5b4691da
check for isset of SESSION['username'] instead of just assuming it exists
2016-11-22 15:35:07 -05:00
Isaac Connor
9312eed17f
Merge branch 'master' into disk_space_in_events
2016-11-22 10:58:24 -05:00
Isaac Connor
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
Isaac Connor
6bf921a858
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
2016-11-21 12:28:15 -05:00
Isaac Connor
4fe6b6f8b7
set a min width so that small images or fps updates don't cause a reflow
2016-11-21 11:39:31 -05:00
Isaac Connor
c360e27b02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-11-17 13:13:47 -05:00
Isaac Connor
bb6b0c2d49
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
2016-11-17 12:16:49 -05:00
Kyle Johnson
4eb5ff7aff
Fix Undefined index: loginFailed. Resolves #1684
2016-11-16 19:42:04 -07:00
Isaac Connor
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
Isaac Connor
8f71971209
Show error message upon unsuccessful login. Fixes #1648 ( #1680 )
...
* Add additional post-cmake files to .gitignore
* Add bootstrap 3.3.7
* Load bootstrap css
* Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
* Update doctype to HTML5, add meta tags for mobile browsers
* Move inline Login css to css file
* Remove extra php tag in functions.php
* Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
* Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
* Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
* Fix a few typos in login inputs
* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
Kyle Johnson
b0d22aa2a5
Add new fonts directory to web CMakeLists
2016-11-14 19:23:05 -07:00
Isaac Connor
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
Andrew Bauer
49d8e35e56
Show available PATH_MAP percent on console ( #1675 )
...
* Add PATH_SWAP percent to console
* add changes to console.php
* use ZM_PATH_MAP instead of ZM_PATH_SWAP
* show the folder name PATH_MAP points to
* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
Kyle Johnson
65fe07e7aa
Fix a few typos in login inputs
2016-11-10 23:36:28 -07:00
Kyle Johnson
95d00f70a3
Test for invalid login via session variable.
...
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
Kyle Johnson
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
Kyle Johnson
0800a69a57
Show error message upon unsuccessful login. Fixes #1648
...
* Includes bootstrap glyphicons as they're used in the error message.
* Failure check is done via a simple test in login.js.php and login.js.
The 'view' param will only be set (to 'postlogin') if the login page
has refreshed due to a failed login. Otherwise you're directed to
the console view.
2016-11-10 22:51:32 -07:00
Kyle Johnson
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
Kyle Johnson
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
Kyle Johnson
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
Kyle Johnson
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
Kyle Johnson
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
Kyle Johnson
2c93f61622
Add bootstrap 3.3.7
2016-11-10 21:45:18 -07:00
Andrew Bauer
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
Kyle Johnson
8c41781a9f
Fix event.stop error in watch.js See #1672 ( #1678 )
2016-11-08 18:53:06 -05:00
Isaac Connor
4b3ac63a68
merge master, deprecate qqq()
2016-11-08 11:30:44 -05:00
Kyle Johnson
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
Isaac Connor
1e233c0ce5
Merge branch 'master' into improve_filter
2016-11-04 15:20:43 -04:00
Isaac Connor
5c62c654ce
fix WatchScale -> EventScale
2016-11-03 16:47:22 -04:00
Isaac Connor
53166fabf5
Merge branch 'master' into storageareas
2016-11-03 14:59:06 -04:00
Isaac Connor
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
Kyle Johnson
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
Isaac Connor
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
Isaac Connor
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
Isaac Connor
9d76c9cf6a
fix fclose
2016-11-03 11:23:50 -04:00
Isaac Connor
a87f5e1592
fix sending full content when we should be
2016-11-03 11:23:10 -04:00
Isaac Connor
0ea8461192
remove extra s
2016-11-03 09:43:38 -04:00
Isaac Connor
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
Steve Gilvarry
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
Isaac Connor
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
Isaac Connor
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
Isaac Connor
340b172dc4
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:46:50 -04:00
Isaac Connor
42783b68f9
float the scale control right, add css for other skins
2016-10-26 14:43:23 -04:00
Isaac Connor
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
Isaac Connor
d9a31f7fb6
Merge branch 'master' into storageareas
2016-10-26 13:39:31 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
f9ac601194
fix getOutputHelperStream -> getHelperStream
2016-10-21 12:41:37 -04:00
Isaac Connor
7b1395a4ea
set default for StorageId to '0' since it can't be NULL anymore
2016-10-20 14:06:09 -04:00
Isaac Connor
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
Isaac Connor
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
Isaac Connor
cb88b984c7
fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes
2016-10-20 12:01:25 -04:00
Isaac Connor
5ee8a1c0a7
deprecate the contents of getImageSrc since it is now in Event.php
2016-10-20 11:52:01 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
017085aee7
Use proper rounding instead of sprintf based rounding for fps
2016-10-20 11:49:35 -04:00
Steve Gilvarry
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
Steve Gilvarry
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
Steve Gilvarry
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
Pliable Pixels
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
Isaac Connor
de9c5a3bed
add in missing break
2016-10-18 10:20:42 -04:00
Isaac Connor
aaf8f6c98b
add the missing case for ServerId in Filter processing.
2016-10-18 10:14:19 -04:00
Isaac Connor
b385ba7bf4
Merge branch 'master' into improve_filter
2016-10-18 09:59:45 -04:00
Isaac Connor
85faa7321c
reorder if logic to handle first page load before AuthHash has ever been set.
2016-10-17 13:12:13 -04:00
Isaac Connor
4bb9709cb2
use object methods of Event
2016-10-12 15:39:53 -04:00
Isaac Connor
dcf6a39bf6
split Event and Monitor into objects and use properties from appropriate object
2016-10-12 15:39:32 -04:00
Isaac Connor
c2911ae756
better debug in deletePath
2016-10-12 15:38:59 -04:00
Isaac Connor
3baa64aa52
add caller info to log when a bad argument is passed to event constructor
2016-10-12 15:38:40 -04:00
Isaac Connor
bf4bbf8b8d
use object methods for event deletion. Main benefit is error message when deleting
2016-10-12 15:36:40 -04:00
Isaac Connor
ba7d935a85
fix border size of text below the image in montage when alerted.
2016-10-12 12:19:04 -04:00
Isaac Connor
5b8b9c5345
merge update
2016-10-12 09:24:10 -04:00
Isaac Connor
b4f065eb75
Convert event view to use Objects
2016-10-12 09:17:57 -04:00
Isaac Connor
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
Isaac Connor
0903ef294f
quick for to make MontageReview work
2016-10-11 17:35:28 -04:00
Isaac Connor
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
Isaac Connor
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
Isaac Connor
743e8c59f9
google code style and double to single quotes
2016-10-11 12:11:59 -04:00
Isaac Connor
0c956d6728
fix logic when disabling a monitor
2016-10-11 12:11:33 -04:00
Isaac Connor
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
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