fb5668c9ef
Fix spelling of remSocketFile
2017-04-29 09:02:35 +02:00
9135da92ed
fix typo fileFields => filterFields
2017-01-31 21:33:43 -05:00
a8d1450adf
Merge branch 'master' into fix_sql_injection
2017-01-27 17:18:34 -05:00
ef71ae248c
fix ramSocketFile to remSocketFile
2017-01-02 09:31:26 -05:00
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
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
ad157cf21c
fix tabs
2016-12-14 14:56:54 -05:00
7c84e2417d
remove extra ?
2016-12-08 15:53:38 -05:00
c8009baf3f
fix missing ; and test for integer string in limit
2016-12-08 15:46:42 -05:00
587fd16aa6
Add testing for limit, sortField and all the filters to ensure that they are valid.
2016-12-08 13:31:44 -05: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
f804f7739d
Adjust download file path to swap path to match the file generated.
2016-06-14 20:49:38 +10: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
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
c0c543e029
change quotes to prevent php7 complaint
2016-04-09 11:25:56 -04: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
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
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
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
6d34f8f424
Use Monitor class instead of old sql
2015-12-09 09:23:42 -05:00
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
e10fdaf344
reduce the wait to 2/10ths instead of a whole second
2015-06-05 11:49:05 -04:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
3f64f9d919
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 15:16:19 -05:00
ebe35c2135
handle empty [file] to prevent logzilla
2014-11-13 09:17:54 -05:00
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
5e262f5a67
the var is remSockFile, not remSocketFile
2014-07-24 11:05:35 -04:00
eb5f299512
increase max_socket_tries to 10 as #470
2014-07-11 10:51:24 -04:00
61cf067be0
Wrap sort order. Fixes #450
2014-06-29 22:09:59 +10:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
003b8c9868
more removal of escaping
2013-12-17 14:38:08 -05:00
9f5b8bb03b
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-12-17 14:33:46 -05:00
20f1b460ee
fix
2013-12-17 14:30:56 -05:00
ceca805b48
more updates
2013-12-17 11:07:19 -05:00
1c028e5806
use parameter passing and remove extra escsaping
2013-12-16 16:52:30 -05:00
969918781f
more updates, currently the log updates are not enough. Filtering does not work.
2013-11-13 10:11:16 -05:00
93560652f1
make sortorder be asc or desc, not something arbitrary which needs to be escaped
...
other fixes to use parameter passing to PDO instead of escaping them ourselves
2013-11-01 12:30:07 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
fcf7e5b188
Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely.
2013-09-12 13:54:03 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
8b86c9af58
Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 10:50:50 +00:00
e695dfd4dd
Allow for level as a minimum when selecting availability criteria for other fields.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-24 13:15:58 +00:00
7e55373b87
Fixed incorrect scaling of timeout on select call
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-27 16:15:16 +00:00
Joergen Edelbo
Isaac Connor
Steve Gilvarry
Isaac Connor
Isaac Connor
Robin Daermann
Andrew Bauer
Kfir Itzhak
Sune1337
Isaac Connor
Kyle Johnson
stan