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
|
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 |
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
|
0e302001dd
|
fix snprintf format for 64bit type
|
2016-11-29 15:26:19 -05: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
|
1cb8d6baba
|
enable apache cgi
|
2016-11-28 11:45:30 -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 |
|
Andy Bauer
|
9a694541ba
|
repm specfile maintenance: retire fc23, add fc25
|
2016-11-26 08:20:03 -06:00 |
Kyle Johnson
|
49620d51b9
|
Merge pull request #1692 from ZoneMinder/small_fixes
Small fixes
|
2016-11-24 20:42:45 -07:00 |
|
Isaac Connor
|
be5b4691da
|
check for isset of SESSION['username'] instead of just assuming it exists
|
2016-11-22 15:35:07 -05:00 |
|
Andy Bauer
|
bf85791e4c
|
improvements to fedora nginx rpm support
|
2016-11-22 13:02:02 -06:00 |
|
Andy Bauer
|
c2b1638a3e
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:43:56 -06:00 |
|
Andy Bauer
|
a96ab604ec
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:42:48 -06:00 |
|
Andrew Bauer
|
71898df756
|
Merge pull request #1697 from connortechnology/apache_indexes
Apache indexes
|
2016-11-22 12:33:55 -06:00 |
Isaac Connor
|
b3f2b13718
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:29:30 -05:00 |
|
Isaac Connor
|
9cc1b23460
|
put back mizzing F
|
2016-11-22 13:25:52 -05:00 |
|
Isaac Connor
|
b059ca83da
|
Rremove Index from options to prevent directory listings
|
2016-11-22 13:25:52 -05:00 |
|
Isaac Connor
|
aa0a4d1f5a
|
put back mizzing F
|
2016-11-22 13:13:09 -05:00 |
|
Isaac Connor
|
e8da04df56
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:09:44 -05:00 |
|
Isaac Connor
|
cf49a234b3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-22 13:05:03 -05:00 |
|
Andrew Bauer
|
c5bee3c8e1
|
Merge pull request #1693 from connortechnology/fix_zmwatch_stealing_dev_shm_space
add a zmMemInvalidate at the beginning of the while loop
|
2016-11-22 10:50:08 -06:00 |
|
Isaac Connor
|
406a7ebdec
|
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
|
2016-11-22 11:04:37 -05:00 |
|
Isaac Connor
|
9e8404516b
|
add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files
|
2016-11-22 11:02:38 -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 |
|
Andy Bauer
|
873bb9902b
|
recalculating zmswap at this point is unnesessary
|
2016-11-19 08:53:17 -06:00 |
|
Andy Bauer
|
3afa8937d8
|
calculate string lengths and array ndx's properly
|
2016-11-19 08:52:22 -06:00 |
|
Andrew Bauer
|
b67450b8ae
|
Update zoneminder.php-fpm.conf.in
|
2016-11-17 19:48:35 -06:00 |
|
Isaac Connor
|
c360e27b02
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-17 13:13:47 -05:00 |