Isaac Connor
e47adcf6cc
the tfoot has to come after the tbody
2017-06-01 09:36:00 -04:00
Isaac Connor
a1af422d29
the [filter][terms] etc part needs to be urlencoded as well. Becase [] are not valid in urls.
2017-06-01 09:35:38 -04:00
Isaac Connor
73ca07792b
double quotes to single quotes
2017-05-31 22:11:54 -04:00
Isaac Connor
5c67c87147
remove deprecated cellspacing attr on table
2017-05-31 22:08:44 -04:00
Isaac Connor
a940fe429c
deprecate the use of the center tag, and only put in the development h3 if it has contents
2017-05-31 22:08:05 -04:00
Isaac Connor
1df147e183
adjust spacing
2017-05-31 22:01:35 -04:00
Isaac Connor
17c8224733
begin to ahndle imageData not being populated
2017-05-31 20:55:10 -04:00
Isaac Connor
4889f3d0e8
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
2017-05-31 20:54:34 -04:00
Isaac Connor
dbeb000505
Merge ../ZoneMinder.connortechnology
2017-05-31 20:45:37 -04:00
Isaac Connor
2b9134512f
remove leftover
2017-05-31 20:45:21 -04:00
Isaac Connor
06a9598755
Merge ../ZoneMinder.connortechnology
2017-05-31 12:55:35 -04:00
Isaac Connor
8596891e4d
fix double to single quote mistakes
2017-05-31 12:55:27 -04:00
Isaac Connor
ece10d6278
braces and whitspace
2017-05-31 11:16:55 -04:00
Isaac Connor
83d6f415b3
cleanup whitespace
2017-05-30 14:07:37 -04:00
Isaac Connor
b96f5cf49d
more merges/fixes from SA
2017-05-30 13:50:24 -04:00
Isaac Connor
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
Isaac Connor
1a43334113
Use NULLs instead of '' when saving things
2017-05-30 13:38:57 -04:00
Isaac Connor
c7b52bd998
fix logging dirs
2017-05-30 13:14:43 -04:00
Isaac Connor
e9a0474cf7
add back required lines with a comment
2017-05-30 12:04:12 -04:00
Isaac Connor
c5288a172d
fix merge problem
2017-05-30 11:57:20 -04:00
Isaac Connor
5bbe13f98f
update cycle from SA
2017-05-30 11:53:05 -04:00
Isaac Connor
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
Isaac Connor
5c5aafb1e8
white space and a check for mid being set to quiet error messages
2017-05-30 11:37:48 -04:00
Isaac Connor
59d00b20b1
fix fetchImage
2017-05-30 11:35:52 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
fe2155dd1a
merges from SA
2017-05-30 11:15:00 -04:00
Isaac Connor
c616a3b3b7
fix some bad to '' changes
2017-05-30 09:39:01 -04:00
Isaac Connor
ff08843d68
replace with ''
2017-05-30 09:10:41 -04:00
Isaac Connor
043d722651
braces,whitespace
2017-05-25 14:26:49 -04:00
Isaac Connor
4347ee1258
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-23 10:41:40 -04:00
Isaac Connor
13265a8f4f
undo StorageAreas contents
2017-05-23 10:41:21 -04:00
Isaac Connor
75dc774a08
Continue to support non-USE_DEEP_STORAGE option
2017-05-22 21:21:49 -04:00
Isaac Connor
9e3af977e2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:09:08 -04:00
Isaac Connor
c64391c98d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-19 11:00:37 -04:00
Isaac Connor
29b43cfd0a
Whitespace, google style, localized video.js ( #1890 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
* Merge updates from sa branch
* Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-19 10:23:51 -04:00
Isaac Connor
75ca52dba5
fix width of plus and minus buttons in filters
2017-05-19 10:18:52 -04:00
Isaac Connor
94f7194e4f
Update frmo SA. Use Monitor object, still hide Controls by default.
2017-05-18 21:48:21 -04:00
Isaac Connor
319712a4c1
Merge updates from sa branch
2017-05-18 15:16:59 -04:00
Isaac Connor
377cc94acb
Merge more changes to make video storage ui's work ( #1889 )
...
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
* merge whitespace and brace changes from sa branch
* merge localized versions of js files
* merge localized versions of js files
* merge code to load video.js etc on Event view
2017-05-18 15:11:26 -04:00
Isaac Connor
f851daca68
merge code to load video.js etc on Event view
2017-05-18 15:10:13 -04:00
Isaac Connor
5500d7bbc0
merge localized versions of js files
2017-05-18 15:05:57 -04:00
Isaac Connor
bf3db69cbe
merge localized versions of js files
2017-05-18 15:05:10 -04:00
Isaac Connor
bc1a2dcb21
whitespace & braces
2017-05-18 14:55:53 -04:00
Isaac Connor
57d07aef22
merge whitespace and brace changes from sa branch
2017-05-18 14:44:06 -04:00
Isaac Connor
9fd9a75669
fix whitespace, braces, simplify sql
2017-05-18 14:04:24 -04:00
Isaac Connor
29bcab9204
fix Debug to Logger::Debug
2017-05-18 13:54:06 -04:00
Isaac Connor
d1c61a252f
fix whitspace/braces
2017-05-18 13:50:56 -04:00
Isaac Connor
96051a0071
we switched to .png instead of .gif
2017-05-18 13:50:46 -04:00
Andrew Bauer
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00