Andrew Bauer
|
dd4bd42066
|
Merge pull request #2396 from connortechnology/fix_2383
disable delete button when event is archived.
|
2019-01-07 18:40:05 -06:00 |
Isaac Connor
|
3f5a2a2aa6
|
disable delete button when event is archived.
|
2019-01-07 15:56:23 -05:00 |
|
Isaac Connor
|
178d7daba3
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-01-07 09:21:49 -05:00 |
|
Isaac Connor
|
f3a807f1f8
|
Merge branch 'master' into storageareas
|
2019-01-07 09:21:25 -05:00 |
|
Isaac Connor
|
b8bf91bec6
|
include libswresample-ffmpeg1 in depends
|
2019-01-07 09:20:58 -05:00 |
|
Isaac Connor
|
b4f8500cb5
|
Merge branch 'split_actions'
|
2019-01-05 18:33:04 -05:00 |
|
Isaac Connor
|
3f10553464
|
Fix include path to Monitors.php
|
2019-01-05 18:32:53 -05:00 |
|
Isaac Connor
|
2ce7546cf0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-01-05 11:15:26 -05:00 |
|
Isaac Connor
|
1a75cf333e
|
Merge branch 'master' into storageareas
|
2019-01-05 11:12:38 -05:00 |
|
Isaac Connor
|
e34a5e972a
|
fix missing }
|
2019-01-05 11:12:26 -05:00 |
|
Isaac Connor
|
5e9f6e769c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2019-01-05 10:59:18 -05:00 |
|
Isaac Connor
|
cf0d55d3db
|
Merge branch 'master' into storageareas
|
2019-01-05 10:59:01 -05:00 |
David Beitey
|
e6ba8e58ef
|
Fix #2391 by defining monitor variable (#2392)
|
2019-01-05 10:20:34 -05:00 |
|
Isaac Connor
|
8eb61b1c11
|
Merge branch 'master' into storageareas
|
2019-01-05 10:16:38 -05:00 |
|
Isaac Connor
|
c4c6d5b642
|
switch to swr_convert_frame as a test
|
2019-01-05 10:15:22 -05:00 |
|
Andrew Bauer
|
7336cdaf0d
|
Update ISSUE_TEMPLATE.md
|
2019-01-05 08:29:58 -06:00 |
|
Andrew Bauer
|
16f272e3e0
|
Update issue templates
|
2019-01-05 08:21:52 -06:00 |
Andrew Bauer
|
986961d1d4
|
Create issue-close-app.yml
|
2019-01-05 08:14:39 -06:00 |
|
Andrew Bauer
|
4678456fe5
|
Merge pull request #2385 from connortechnology/split_actions
Split actions.php into individual files per view
|
2019-01-04 17:33:57 -06:00 |
|
Isaac Connor
|
5b5905c83a
|
We always use markEids[] now
|
2019-01-04 16:29:16 -05:00 |
|
Isaac Connor
|
de0ef6ce43
|
Merge branch 'master' into split_actions
|
2019-01-04 15:55:54 -05:00 |
|
Isaac Connor
|
e72e4e7ce4
|
Spacing, remove some html4 stuff, clean up duplicated hidden form elements.
|
2019-01-04 15:52:36 -05:00 |
|
Isaac Connor
|
dea64320f0
|
Fix a + that should be a .
|
2019-01-04 15:52:14 -05:00 |
|
Isaac Connor
|
0e20666992
|
fix eventdetail actions being in events
|
2019-01-04 15:43:31 -05:00 |
|
Isaac Connor
|
ab198bfd75
|
remove master version of actions.php
|
2019-01-04 15:29:21 -05:00 |
|
Isaac Connor
|
52466c398b
|
Merge branch 'split_actions' into storageareas
|
2019-01-04 15:28:55 -05:00 |
|
Isaac Connor
|
b8d065275b
|
Merge branch 'master' into storageareas
|
2019-01-04 15:22:18 -05:00 |
|
Isaac Connor
|
e2f32ab091
|
Upgrade config saving
|
2019-01-04 09:43:36 -05:00 |
|
Isaac Connor
|
7ec96655c3
|
fix missing ! when testing for permission on editing config
|
2019-01-04 09:37:26 -05:00 |
|
Isaac Connor
|
5b9bf48945
|
Merge branch 'master' into split_actions
|
2019-01-04 09:35:54 -05:00 |
|
Isaac Connor
|
46adcbb66b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2019-01-04 09:34:51 -05:00 |
|
Isaac Connor
|
edeaa07c12
|
Fix no quotes around Id
|
2019-01-04 09:34:42 -05:00 |
|
Isaac Connor
|
6cad852e11
|
fix path to MontageLayout
|
2019-01-04 09:34:18 -05:00 |
|
Isaac Connor
|
dbe9817bc8
|
Split actions.php into individual files per view
|
2019-01-04 09:26:34 -05:00 |
|
Andrew Bauer
|
151c7677d8
|
add WebSite type to enum (#2382)
* add WebSite type to enum
* add website enum to update script
* update enum
* bump the version
|
2019-01-03 17:06:44 -05:00 |
|
Andrew Bauer
|
5e5c8083f4
|
Merge pull request #2380 from techrockedge/master
add Foscam R2C ptz script
|
2019-01-03 16:00:57 -06:00 |
|
Andrew Bauer
|
92aa29d8d0
|
Update zm_create.sql.in
|
2019-01-03 16:00:30 -06:00 |
|
Andrew Bauer
|
c0e54a9874
|
Delete zm_create.sql
|
2019-01-03 15:59:28 -06:00 |
techrockedge
|
571daec8fc
|
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
refresh with master
|
2019-01-03 15:02:57 -05:00 |
|
techrockedge
|
af7d4b1af6
|
added Control line to zm_create.sql.in
|
2019-01-03 14:58:17 -05:00 |
|
techrockedge
|
07d745cf55
|
added Control line to zm_create.sql.in
|
2019-01-03 14:46:23 -05:00 |
|
techrockedge
|
561a881114
|
added Control line to zm_create.sql
|
2019-01-03 14:35:01 -05:00 |
|
Andrew Bauer
|
225fca08e3
|
Merge pull request #2379 from connortechnology/improve_config_efficiency
Improve config efficiency
|
2019-01-02 19:34:34 -06:00 |
|
Andrew Bauer
|
0ea811497c
|
Merge pull request #2377 from connortechnology/fix_2253
Fix 2253
|
2019-01-02 19:32:29 -06:00 |
|
techrockedge
|
e21b8dc1f9
|
changed to ZM db functions
|
2019-01-02 16:01:33 -05:00 |
|
techrockedge
|
51d3e6b2cd
|
changed to ZM db functions
|
2019-01-02 14:09:35 -05:00 |
|
Isaac Connor
|
874930d8fc
|
Merge branch 'master' into improve_config_efficiency
|
2019-01-02 13:07:53 -05:00 |
Isaac Connor
|
99471836b7
|
Use monitor's serverId when loading server object so that images load from recording server.
|
2019-01-02 11:28:12 -05:00 |
|
Isaac Connor
|
8a1707a615
|
Add monitorServerId array to provide server info for each monitor so that we can load images from the recording server.
|
2019-01-02 11:27:46 -05:00 |
|
Isaac Connor
|
79113a6869
|
Add a default Server object to handle non-multi-server case
|
2019-01-02 10:56:40 -05:00 |