ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,962 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

103 Commits

Author SHA1 Message Date
Isaac Connor 83785ac73f Merge branch 'storageareas' into zma_to_thread 2018-02-22 09:41:50 -05:00
Isaac Connor c5081d1e4e drop session before executing filter 2018-02-21 13:54:06 -05:00
Isaac Connor 4b7ddd81bf Merge branch 'storageareas' into zma_to_thread 2018-02-02 14:24:02 -05:00
Isaac Connor b0f755b5fc put unarchive, archive, delete in a transaction for speed 2018-02-02 12:14:01 -05:00
Isaac Connor 68521aa0d4 spacing, remove debug lines 2018-02-02 10:27:50 -05:00
Isaac Connor 3ce46d3fed Merge branch 'storageareas' into zma_to_thread 2018-01-29 15:55:05 -05:00
Isaac Connor 67b365948e Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_monitor.cpp
	web/includes/Monitor.php
	web/skins/classic/views/js/add_monitors.js
	web/skins/classic/views/js/console.js
 2018-01-29 15:53:26 -05:00
Isaac Connor c9e32fb344 Check for successful Monitor db Insertion 2018-01-29 10:41:09 -08:00
Isaac Connor 2dcb0d183f Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-28 18:07:33 -08:00
Isaac Connor f2b335c7b2 SORT auto server selection in ascending order 2018-01-28 18:07:01 -08:00
Isaac Connor 8a4b17fb50 turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable 2018-01-28 15:13:57 -05:00
Isaac Connor 356015a492 Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla 2018-01-25 08:42:08 -08:00
Isaac Connor 7165f3cfd8 Add server auto-selection 2018-01-25 08:41:42 -08:00
Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php
 2018-01-24 11:06:19 -05:00
Isaac Connor 994766fd50 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-22 13:25:38 -08:00
Isaac Connor 924fa80ea6 When renaming a monitor, take change of storage area into account when creating dirs and symlinks 2018-01-22 11:42:07 -05:00
Isaac Connor f0d4cab24a Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	web/ajax/add_monitors.php
 2018-01-21 11:13:06 -05:00
Isaac Connor 9b7fee03c7 Add Server auto-selection 2018-01-19 11:00:46 -08:00
Isaac Connor 773ed11742 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-19 08:17:53 -08:00
Isaac Connor 484a361af8 use Object methods to restart zmc and zma. restart them on save of existing Monitor 2018-01-18 12:40:10 -08:00
Isaac Connor a2211bf438 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
	src/zm_monitor.cpp
 2018-01-16 13:36:57 -05:00
Isaac Connor 004fdbad9b We don't need to update ZoneCount manually anymore 2018-01-16 09:31:23 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor 2643ac9f97 fix a quoting problem that prevented saving config 2017-12-12 11:16:08 -05:00
Isaac Connor 011c7e1540 revert to /1000000 tb 2017-12-08 14:22:38 -05:00
Isaac Connor bd73e7c2e2 Merge branch 'robots' into storageareas 2017-12-07 10:31:25 -05:00
Isaac Connor d741cc1a72 fix saving Groups 2017-12-04 22:02:56 -05:00
digital-gnome fb952179cd Fix delete filter (#2010) 
Delete filter didn't work because the request does not include 'object'.
 2017-12-04 21:26:21 -05:00
Isaac Connor 6270408c8f rework group MonitorIds and add GroupId filters to api 2017-12-04 15:52:16 -05:00
Isaac Connor 1ccd344bf5 implement Storage Area move 2017-12-04 11:05:50 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 900fbe1e0f update save to a button tag, and add a saveas functionality 2017-11-23 08:26:55 -08:00
Isaac Connor 96e0959c35 clear the cookie for zmMontageLayout 2017-11-01 13:07:35 -04:00
Isaac Connor d4080dcdbd when saving a new layout, auto-select it 2017-11-01 12:19:27 -04:00
Isaac Connor b5491102ef Fix saving MontageLayouts 2017-10-30 20:21:16 -04:00
Isaac Connor 1694eeb436 debugging and code simplification 2017-10-30 16:29:27 -04:00
Isaac Connor bc150574c7 wip import 2017-10-26 18:56:10 -07:00
Isaac Connor 653d213d62 Add EndTime and DiskSpace to Filters 2017-10-25 11:11:19 -07:00
Isaac Connor d2c8a0240a add a monitors view which is for editing function/enabled/server/storage of multiple monitors 2017-10-23 17:01:43 -07:00
Isaac Connor d0f0ab1afe refreshparent when saving group 2017-10-10 11:51:11 -04:00
Isaac Connor 3af795264d add actual disk space as a mouseover in nav bar 2017-10-10 10:38:13 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 9b95259567 fix deleting monitor, but passing an event Id to deleteEvent instead of a hash consisting of just the Id 2017-08-22 09:33:51 -04:00
Isaac Connor f01adc6be5 fixes 2017-08-17 10:18:51 -04:00
Isaac Connor b9addeecfd update deleting the events when deleting a monitor 2017-08-08 15:02:40 -04:00
Isaac Connor 874dc79948 tell eventdetail popup to close on save 2017-07-06 10:48:33 -04:00
Isaac Connor 90696331a9 Merge branch 'master' into storageareas 2017-06-26 21:58:11 -04:00
Isaac Connor b5565bb16a fix filters, refreshparent in wrong block 2017-06-23 09:04:46 -04:00
Isaac Connor 375e4a3e9c More filter UI fixes 2017-06-20 10:45:16 -04:00
Isaac Connor 93f81daa8d Fix saving logic 2017-06-20 09:08:25 -04:00