e9adc3bc5b
restore SA version
2017-05-30 13:14:27 -04:00
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
8a732dff8a
add back required lines with a comment
2017-05-30 12:03:31 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00
00479876f2
fix braces
2017-05-30 11:53:21 -04:00
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
26131f8a10
double quotes to single quotes
2017-05-30 11:52:48 -04:00
a75488e0f3
flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed
2017-05-30 11:52:04 -04:00
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
f88abfcb4d
the liveStream element now has the monitorId appended to it, to be consistent with montage so we can reuse code
2017-05-30 11:26:57 -04:00
3062fe43f3
revert csrf on login page. csrf needs to be off in order for zmNinja to work
2017-05-30 11:25:25 -04:00
fe2155dd1a
merges from SA
2017-05-30 11:15:00 -04:00
e855ad685f
small cleanups
2017-05-30 11:14:22 -04:00
e5616d5719
Merge ../ZoneMinder.connortechnology
2017-05-30 10:53:20 -04:00
8b0b938fc8
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-30 10:51:15 -04:00
772df5b41b
add a cast to quiet compiler warning
2017-05-30 10:31:02 -04:00
845ef6c05a
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-30 10:22:17 -04:00
b948bc5403
fix a few extra )
2017-05-30 10:21:34 -04:00
32daa4faed
Merge branch 'master' into storageareas
2017-05-30 10:21:01 -04:00
b979712892
fix inconsistent whitespace
2017-05-30 10:01:02 -04:00
3c9d8f4ec6
Don't do the qqq thing to remove whitespace from the config descriptions. HTML doesn't care about it. That kind of parsing should be done at display time.
2017-05-30 09:44:43 -04:00
c616a3b3b7
fix some bad to '' changes
2017-05-30 09:39:01 -04:00
ff08843d68
replace with ''
2017-05-30 09:10:41 -04:00
b23c45c9bc
bump version to 1.31.0
2017-05-29 10:00:46 -04:00
e2df0b74d4
remove including state.js.php as it has nothing to do with this pr
2017-05-29 09:51:31 -04:00
77d068fc48
merge updates from SA relating to building debian packages
2017-05-26 22:25:59 -04:00
9d464dfa24
remove errant comma
2017-05-26 22:24:57 -04:00
9226fb8a37
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-26 22:24:14 -04:00
cbb3903e5e
fix merge
2017-05-26 22:24:02 -04:00
72738166fe
fix read replay for install and upload
2017-05-26 22:21:51 -04:00
2e673e49c8
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-05-26 22:20:50 -04:00
94151b0318
put back changelog
2017-05-26 14:30:21 -04:00
9f25495844
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-26 14:19:22 -04:00
86361b59c7
convert double quotes to single quotes
2017-05-26 14:17:28 -04:00
0c25cecb93
Fix some spacing
2017-05-26 13:36:20 -04:00
368567335b
remove some quotes
2017-05-26 13:33:34 -04:00
a2bf5df2d4
remove some quotes
2017-05-26 13:27:55 -04:00
2a2d667afb
remove some quotes
2017-05-26 13:27:06 -04:00
4dee84f799
More updates from SA ( #1895 )
...
* merge from SA, includes StorageAreas support
* merge from SA. Adds the ability to pass in additional options when connecting
* fix options, to remove indexes
* remove StorageAreas stuff
* put back AutoMessage and AutoVideo logic
* fixup docs, cleanup
2017-05-26 13:21:32 -04:00
34f4abb549
Merge branch 'master' into storageareas
2017-05-26 13:17:51 -04:00
ed12dab648
fixup docs, cleanup
2017-05-26 13:13:34 -04:00
cc83582a90
put back AutoMessage and AutoVideo logic
2017-05-26 13:04:08 -04:00
8fde33ee1b
remove StorageAreas stuff
2017-05-26 12:30:20 -04:00
766d5b7dcc
fix merge
2017-05-25 16:33:09 -04:00
5f6c7008fd
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2017-05-25 15:32:13 -04:00
bb051fd509
fix merge conflicts
2017-05-25 15:29:31 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
123aaad080
add applySort function, and the sorting init code
2017-05-25 15:03:30 -04:00
Isaac Connor
Isaac Connor