Isaac Connor
|
91f8f898b8
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-12-14 08:41:44 -05:00 |
|
Isaac Connor
|
e9ae2e6968
|
COmment out logging in signal handlers. Logging is too complex.
|
2018-12-14 08:39:55 -05:00 |
|
Isaac Connor
|
67bf4d8fbc
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-12-11 10:21:39 -05:00 |
|
Isaac Connor
|
c8c34d3f95
|
Merge branch 'master' into storageareas
|
2018-12-11 10:21:22 -05:00 |
|
Isaac Connor
|
b3bed9a28a
|
fix whitespace
|
2018-12-11 10:20:02 -05:00 |
|
Isaac Connor
|
e1ecd47bff
|
Fix missing use of UrlToApi
|
2018-12-11 09:40:40 -05:00 |
|
Isaac Connor
|
1e8c4276bb
|
fix #2319 some more. This is fixing rate sticking across gapless events and reload
|
2018-12-10 17:32:17 -05:00 |
Andrew Bauer
|
077c643da0
|
1.32.3 release
|
2018-12-08 08:22:36 -06:00 |
|
Andrew Bauer
|
c3620672b3
|
1.32.3 release
|
2018-12-08 08:19:55 -06:00 |
Andrew Bauer
|
16318ca3ef
|
Update zoneminder.spec
|
2018-12-07 09:59:28 -06:00 |
|
Isaac Connor
|
a1141d2dc4
|
remove second use of HTTP_HOST and use a better method of stripping off port from HTTP_HOST
|
2018-12-07 08:39:23 -05:00 |
|
Andrew Bauer
|
5258415e83
|
Merge pull request #2335 from connortechnology/server_path_prefix
strip port from HTTP_HOST
|
2018-12-06 16:17:42 -06:00 |
|
Isaac Connor
|
757e538550
|
strip port from HTTP_HOST
|
2018-12-06 17:12:03 -05:00 |
|
Isaac Connor
|
e4d9341207
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-12-05 13:40:10 -05:00 |
|
Isaac Connor
|
51fcede45c
|
Merge branch 'batch_frame_records' into storageareas
|
2018-12-05 13:18:35 -05:00 |
|
Isaac Connor
|
ab9081e1bf
|
create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db.
|
2018-12-05 13:18:21 -05:00 |
|
Isaac Connor
|
50017057de
|
Merge branch 'master' into storageareas
|
2018-12-05 09:05:27 -05:00 |
|
Isaac Connor
|
9ffd77428a
|
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
|
2018-12-05 09:05:10 -05:00 |
|
Isaac Connor
|
260a07cd01
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-12-03 16:47:14 -05:00 |
|
Isaac Connor
|
a9290759a5
|
Merge branch 'fix_ios9' into storageareas
|
2018-12-03 16:25:34 -05:00 |
|
Isaac Connor
|
0c7f91c38a
|
Merge branch 'master' into storageareas
|
2018-12-03 16:25:28 -05:00 |
|
Isaac Connor
|
f2f1e230d1
|
put back missing !
|
2018-12-03 16:25:03 -05:00 |
|
Isaac Connor
|
18ce7c9ea0
|
Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead.
|
2018-12-03 15:17:16 -05:00 |
|
Isaac Connor
|
27d4ba9e5f
|
use output of babeljs.io to provide code that works on older browsers. The nice class notation is ES6 upwards.. Safari on IOS9 doesn't like it
|
2018-12-03 15:16:47 -05:00 |
|
Isaac Connor
|
14272a42b4
|
fix use of getcwd in delete_empty_subdirs. We use absolute paths
|
2018-12-03 11:08:24 -05:00 |
|
Isaac Connor
|
23124d634c
|
improve ImageBufferCount too small message
|
2018-12-03 11:02:45 -05:00 |
|
Isaac Connor
|
d837b42836
|
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
|
2018-12-03 10:33:53 -05:00 |
|
Isaac Connor
|
ddd2e24dcb
|
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
|
2018-12-03 10:32:37 -05:00 |
|
Isaac Connor
|
0cf56f186c
|
add frame_size to stream dump
|
2018-12-03 10:32:01 -05:00 |
|
Isaac Connor
|
2df6d74a3e
|
Merge branch 'master' into storageareas
|
2018-12-02 17:15:12 -05:00 |
|
Andrew Bauer
|
dbb51e9857
|
add generic nginx config file
|
2018-12-02 09:40:15 -06:00 |
|
Andrew Bauer
|
e327ad100e
|
fix WebSite camera startup issue
|
2018-12-01 17:03:50 -06:00 |
|
Andrew Bauer
|
cae6ffd5a3
|
use HTTP_HOST instead of SERVER_NAME
|
2018-12-01 13:27:08 -06:00 |
|
Andrew Bauer
|
76e0782d97
|
rpm pkg - update nginx config
|
2018-12-01 09:58:12 -06:00 |
|
Isaac Connor
|
ea896717ab
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-30 15:06:29 -05:00 |
|
Isaac Connor
|
eac9170b33
|
Merge branch 'master' into storageareas
|
2018-11-30 15:06:09 -05:00 |
|
Isaac Connor
|
8cf3cd35cb
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-30 15:05:51 -05:00 |
|
Isaac Connor
|
6ad54aad93
|
add libswscale5 to depends for ubuntu cosmic
|
2018-11-30 14:53:31 -05:00 |
|
Isaac Connor
|
7d90a56561
|
Merge branch 'master' into storageareas
|
2018-11-30 14:46:42 -05:00 |
|
Isaac Connor
|
9bb4f1804e
|
Merge branch 'server_path_prefix'
|
2018-11-30 14:46:20 -05:00 |
|
Isaac Connor
|
8c626c984b
|
Need to pass port through all Url functions
|
2018-11-30 14:45:58 -05:00 |
|
Isaac Connor
|
6830849576
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-11-30 10:48:32 -05:00 |
|
Isaac Connor
|
f9139f2d98
|
Use the word skipped instead of aborted
|
2018-11-30 10:48:20 -05:00 |
|
Andrew Bauer
|
279255d979
|
rpm pkg - update README
|
2018-11-30 08:58:42 -06:00 |
|
Andrew Bauer
|
bfff07bb3e
|
rpm packaging - takes too long to set perms on events
|
2018-11-30 08:53:58 -06:00 |
|
Isaac Connor
|
5acd8ee1fe
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-29 15:54:43 -05:00 |
|
Isaac Connor
|
fe45e83bb4
|
Fix PathToIndex
|
2018-11-29 15:54:25 -05:00 |
|
Isaac Connor
|
4cf7ff7fe4
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-29 15:53:58 -05:00 |
|
Isaac Connor
|
945770c819
|
Merge branch 'server_path_prefix'
|
2018-11-29 15:53:35 -05:00 |
|
Isaac Connor
|
3bd5774ea1
|
Default to PathToIndex should have the index.php in it
|
2018-11-29 15:53:19 -05:00 |