3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
0312dc3c2d
Add Group saving to Monitor saving
2018-02-27 11:20:52 -08:00
bfbefc4c32
Use our new Control object to do the saving instead of a generic function
2018-02-26 07:31:48 -08:00
c5081d1e4e
drop session before executing filter
2018-02-21 13:54:06 -05:00
b0f755b5fc
put unarchive, archive, delete in a transaction for speed
2018-02-02 12:14:01 -05:00
68521aa0d4
spacing, remove debug lines
2018-02-02 10:27:50 -05:00
c9e32fb344
Check for successful Monitor db Insertion
2018-01-29 10:41:09 -08:00
2dcb0d183f
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-28 18:07:33 -08:00
f2b335c7b2
SORT auto server selection in ascending order
2018-01-28 18:07:01 -08:00
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
356015a492
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
2018-01-25 08:42:08 -08:00
7165f3cfd8
Add server auto-selection
2018-01-25 08:41:42 -08:00
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08:00
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
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08:00
773ed11742
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-19 08:17:53 -08:00
484a361af8
use Object methods to restart zmc and zma. restart them on save of existing Monitor
2018-01-18 12:40:10 -08:00
004fdbad9b
We don't need to update ZoneCount manually anymore
2018-01-16 09:31:23 -05:00
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
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
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
96e0959c35
clear the cookie for zmMontageLayout
2017-11-01 13:07:35 -04:00
d4080dcdbd
when saving a new layout, auto-select it
2017-11-01 12:19:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
1694eeb436
debugging and code simplification
2017-10-30 16:29:27 -04:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
d0f0ab1afe
refreshparent when saving group
2017-10-10 11:51:11 -04:00
3af795264d
add actual disk space as a mouseover in nav bar
2017-10-10 10:38:13 -04:00
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
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
f01adc6be5
fixes
2017-08-17 10:18:51 -04:00
b9addeecfd
update deleting the events when deleting a monitor
2017-08-08 15:02:40 -04:00
874dc79948
tell eventdetail popup to close on save
2017-07-06 10:48:33 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
b5565bb16a
fix filters, refreshparent in wrong block
2017-06-23 09:04:46 -04:00
375e4a3e9c
More filter UI fixes
2017-06-20 10:45:16 -04:00
93f81daa8d
Fix saving logic
2017-06-20 09:08:25 -04:00
965b306ebc
continue redoing filters
2017-06-19 13:24:02 -04:00
1d9e0b7d69
fix saving filters
2017-06-19 10:18:44 -04:00
75c11431e6
deprecate filtersavepopup
2017-06-16 11:10:25 -04:00
3225891843
update/fix filter behaviour
2017-06-15 15:45:43 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
ac8b09e89c
merge some trivial updates from storageareas
2017-05-16 14:14:07 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
digital-gnome
Andrew Bauer