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 |
Isaac Connor
|
ead1631fce
|
copy some filter code into the object
|
2016-12-02 13:24:59 -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
|
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 |
|
Isaac Connor
|
1a25b957ad
|
check for and create events dir for monitor on Object instantiation
|
2016-11-27 20:10:12 -05:00 |
|
Isaac Connor
|
859d361373
|
turn off libswresample
|
2016-11-27 17:06:12 -05:00 |
|
Isaac Connor
|
921205216d
|
turn off libswresample
|
2016-11-27 17:00:16 -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 |
|
Isaac Connor
|
f712f577a2
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-11-22 13:48:19 -05: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
|
af746e2154
|
Merge ../ZoneMinder.master.bad into disk_space_in_events
|
2016-11-22 11:06:35 -05: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
|
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 |
|
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 |
|
Isaac Connor
|
bb6b0c2d49
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter
|
2016-11-17 12:16:49 -05:00 |
|
Kyle Johnson
|
2b10cbf37a
|
Merge pull request #1687 from connortechnology/sort_gitignore2
sort and remove duplicates from .gitignore
|
2016-11-17 10:08:36 -07:00 |
|
Isaac Connor
|
d80adc9f98
|
add comment at top, suggesting how to keep sorting maintained
|
2016-11-17 12:05:42 -05:00 |
|
Isaac Connor
|
c647d43616
|
sort and remove duplicates using vims :%sort u command
|
2016-11-17 12:01:30 -05:00 |
|
Isaac Connor
|
0b3eb574b2
|
Merge pull request #1685 from kylejohnson/1684_loginFailed
Fix Undefined index: loginFailed. Resolves #1684
|
2016-11-16 22:06:25 -05:00 |
|
Kyle Johnson
|
4eb5ff7aff
|
Fix Undefined index: loginFailed. Resolves #1684
|
2016-11-16 19:42:04 -07:00 |
Andrew Bauer
|
bcc5a57b02
|
prelimniary support for nginx on fedora
|
2016-11-15 18:34:25 -06:00 |
|
Isaac Connor
|
2bd080a6a6
|
Merge branch 'master' into storageareas
|
2016-11-15 08:41:00 -05:00 |
|
Isaac Connor
|
acc62585a2
|
Merge ../ZoneMinder.master
|
2016-11-14 21:48:31 -05:00 |
|
Isaac Connor
|
27b5b60eae
|
Merge branch 'master' into fix_braces
|
2016-11-14 21:46:25 -05:00 |