Isaac Connor
72a50910e6
Merge pull request #56 from digital-gnome/storageareas-fixMontageReviewFilter
...
Montagereview filter respect groups setting
2017-12-04 17:08:51 -05:00
Isaac Connor
588f63b053
Merge branch 'storageareas' into zma_to_thread
2017-12-04 17:07:16 -05:00
digital-gnome
c72b1f3acf
Fix refreshParent on some popups
...
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery. This angers javascript and prevents the close function from working. Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00
Isaac Connor
97c9ae02c2
cleanup
2017-12-04 17:02:38 -05:00
Isaac Connor
1f2f708287
Handle empty strings in MonitorsIds
2017-12-04 17:00:52 -05:00
Isaac Connor
7bba52e0d4
bump version
2017-12-04 16:52:23 -05:00
Isaac Connor
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
Isaac Connor
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
digital-gnome
ab08769adb
Add nice to archive commands
...
Archiving could hammer io/cpu on the server. Big archives would cause problems.
2017-12-04 14:48:17 -05:00
digital-gnome
3f62d1e24d
Montagereview filter respect groups setting
2017-12-04 14:35:33 -05:00
Isaac Connor
203fe79391
cleanup debug
2017-12-04 11:14:55 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
Isaac Connor
af1729792f
add AutoMove and AutoMoveTo to Filters
2017-12-03 17:04:11 -05:00
Isaac Connor
9aa94bd3ab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-12-03 16:05:43 -05:00
Isaac Connor
e0ef56a012
Merge pull request #53 from digital-gnome/storageareas-unpop
...
Remove Events/Event/Watch popups
2017-12-03 16:05:22 -05:00
digital-gnome
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
digital-gnome
4f5677eb3b
Remove time limit from archive download for exceptionally large files
2017-12-03 14:42:08 -05:00
digital-gnome
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
Isaac Connor
c04ec1b8a8
fix mem corruption
2017-12-03 12:50:57 -05:00
Isaac Connor
bab308ffa8
Merge branch 'storageareas' into zma_to_thread
2017-12-03 12:43:31 -05:00
Isaac Connor
6fc684a018
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
2017-12-03 11:09:17 -05:00
Isaac Connor
4d73ce4109
rework locking to have a per-packet mutex
2017-12-03 11:09:01 -05:00
Isaac Connor
5f01313ff6
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2017-12-03 11:00:52 -05:00
Isaac Connor
b8f455ee7c
some cleanup, add a note about the lines that cause zm to crash
2017-12-03 11:00:40 -05:00
Isaac Connor
bc525a4e01
blah
2017-12-02 13:55:26 -05:00
digital-gnome
7a188a84f7
Add montagereview filter passing
...
montagereview now accepts any appropriate filters
2017-12-02 12:29:55 -05:00
digital-gnome
6d6b4366de
Fix MontageReview filters
2017-12-02 12:29:54 -05:00
digital-gnome
1c201b0efe
Fix timeline filters
2017-12-02 12:28:06 -05:00
digital-gnome
66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
digital-gnome
11629076f6
Fix Timeline view, add list link
2017-12-02 12:28:06 -05:00
digital-gnome
539172b769
remove top margin from header
2017-12-02 12:28:06 -05:00
digital-gnome
898c9e7473
Add bottom border to dark and classic header
2017-12-02 12:28:06 -05:00
digital-gnome
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
digital-gnome
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
digital-gnome
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
digital-gnome
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
digital-gnome
8772d1e99a
Timeline header to flex
...
Moved flex override to timeline.css rather than set in in skin file.
2017-12-02 12:28:05 -05:00
digital-gnome
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
digital-gnome
9d1bbfab42
Remove unused code from event
2017-12-02 12:28:05 -05:00
digital-gnome
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
digital-gnome
7a5dfb71dc
Remove no longer used max from events
2017-12-02 12:28:05 -05:00
digital-gnome
1636cf6e90
Tighten up headers
2017-12-02 12:28:05 -05:00
digital-gnome
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
digital-gnome
f02cd2e615
Remove watch popup
2017-12-02 12:28:04 -05:00
digital-gnome
1289269e6f
Change filter to work without popup
2017-12-02 12:28:04 -05:00
digital-gnome
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
digital-gnome
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
Isaac Connor
9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
...
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
Isaac Connor
b1019267d8
try moving codec selection up above ctx allocation so that it allocates a priv_data
2017-12-02 08:12:04 -05:00
digital-gnome
53f886edc4
Make navbar refresh not change header links
2017-12-01 22:15:29 -05:00