Isaac Connor
|
87e8f91868
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2016-12-13 15:06:07 -05:00 |
|
Isaac Connor
|
1bf93d76b7
|
fix www and parenthesis.
|
2016-12-13 14:56:29 -05:00 |
|
Isaac Connor
|
6ceb4cc93e
|
fix qqq and replace doube quotes with single quotes
|
2016-12-13 14:32:28 -05:00 |
|
Isaac Connor
|
ca65f8287f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2016-12-13 13:36:38 -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
|
8009bce3d9
|
quote the link name so that spaces don't break it
|
2016-12-13 13:23:20 -05:00 |
|
Isaac Connor
|
758a9b36a0
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-12-13 08:29:19 -05:00 |
Isaac Connor
|
eb5f0b370e
|
fix type of Config.DefaultValue and add NOT NULL to Message
|
2016-12-12 22:23:56 -05:00 |
|
Isaac Connor
|
7063d218b9
|
bump version to 1.30.10
|
2016-12-12 22:08:34 -05:00 |
|
Isaac Connor
|
593fbf0022
|
Merge branch 'message_column_to_text' into storageareas
|
2016-12-12 21:59:00 -05:00 |
|
Isaac Connor
|
5bd41fd65f
|
db update script requires version bump to 1.30.1
|
2016-12-12 21:56:17 -05:00 |
|
Isaac Connor
|
e058217a4b
|
add a db update script to update the Messages column to a TEXT type.
|
2016-12-12 21:55:32 -05:00 |
Andrew Bauer
|
6fe88adc02
|
Update zoneminder.f25.spec
|
2016-12-12 20:50:53 -06:00 |
|
Isaac Connor
|
92a4641e1b
|
Merge branch 'log_failed_log_insert' into storageareas
|
2016-12-12 21:46:53 -05:00 |
|
Isaac Connor
|
6fa3b25d2a
|
fix whitespace
|
2016-12-12 21:44:03 -05:00 |
|
Isaac Connor
|
1f6a6f9758
|
fix whitespace
|
2016-12-12 21:43:07 -05:00 |
|
Isaac Connor
|
9b76a16af4
|
log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert
|
2016-12-12 21:41:55 -05:00 |
|
Andrew Bauer
|
e72a76fe33
|
Update control
|
2016-12-12 12:09:47 -06: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
|
d97c1f1cff
|
Merge branch 'fix_braces' into storageareas
|
2016-12-08 14:58:38 -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
|
c27a18a758
|
fix braces in zm_monitor.cpp
|
2016-12-08 11:49:54 -05:00 |
|
Isaac Connor
|
75b8c35059
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-12-08 11:13:33 -05:00 |
|
Isaac Connor
|
2c0a868eea
|
fix typo
|
2016-12-08 11:02:59 -05:00 |
|
Isaac Connor
|
857b4e8345
|
Merge branch 'master' into improve_filter
|
2016-12-06 11:58:41 -05:00 |
|
Isaac Connor
|
fbc47359eb
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-12-06 11:55:26 -05:00 |
|
Isaac Connor
|
fac6de6cb1
|
Instead of passing orientation, pass the whole monitor object so that we can use it's other features.
|
2016-12-06 11:54:34 -05:00 |
|
Andrew Bauer
|
ecbaaef59a
|
Merge pull request #1670 from connortechnology/fix_braces
Fix braces
|
2016-12-06 08:39:43 -06:00 |
|
Isaac Connor
|
0b3ba0a06d
|
fix detection of LIBSWRESAMPLE
|
2016-12-06 09:38:06 -05:00 |
|
Andrew Bauer
|
5180f325be
|
Merge pull request #1700 from bajansen/update-nl_NL-translation
Update nl_NL translation
|
2016-12-06 08:35:32 -06:00 |
Isaac Connor
|
e33245c092
|
Merge pull request #1702 from knnniggett/travis
Fix Travis
|
2016-12-06 08:53:33 -05:00 |
|
Andy Bauer
|
653c9324f9
|
use Travis builtin mysql service
|
2016-12-06 07:12:36 -06:00 |
|
Isaac Connor
|
42eeb2bb15
|
Merge pull request #1689 from knnniggett/zmswap
Restore former zmswap path behaviour
|
2016-12-05 21:49:10 -05:00 |
|
Andy Bauer
|
1dee6ffda3
|
Travis - show output from apt-get
|
2016-12-05 20:42:48 -06:00 |