Kyle Johnson
|
daef9eb40b
|
Remove extra #footer styling
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
ea0c61d482
|
Bump up the default font size
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
c3cc5d46bd
|
Wrap footer in container-fluid
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
d7f471f41f
|
Restyle of Login page.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
03c188db89
|
Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
aa3c99fc68
|
Initial major restyle of classic skin.
|
2016-05-03 13:51:34 -04:00 |
|
Kyle Johnson
|
c4c9b6c494
|
Local copy of bootstrap 3.3.6, included in classic skin.
|
2016-05-03 13:51:06 -04:00 |
Isaac Connor
|
516bacdfd3
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 13:38:57 -04:00 |
|
Kyle Johnson
|
a1b4869ee6
|
Add state modal to options view
|
2016-05-03 13:33:22 -04:00 |
|
Kyle Johnson
|
0a77da8a2f
|
Remove header from log view
|
2016-05-03 13:33:08 -04:00 |
|
Kyle Johnson
|
c2fd3dd84a
|
Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
|
2016-05-03 13:25:39 -04:00 |
|
Kyle Johnson
|
6768fe5554
|
Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
|
2016-05-03 13:06:28 -04:00 |
|
Isaac Connor
|
24bf91707f
|
Database module should really use DBI
|
2016-05-03 10:22:38 -04:00 |
|
Isaac Connor
|
e80db4c433
|
Use zmDbConnect instead of duplicated db connect code
|
2016-05-03 10:22:16 -04:00 |
|
Isaac Connor
|
49e3d3be7a
|
Turn the config loading code from a BEGIN to a function that could be called repeatedly.
|
2016-05-03 10:21:50 -04:00 |
|
Isaac Connor
|
9406a2337f
|
Add a BEGIN section to load things in the correct order.
|
2016-05-03 10:21:01 -04:00 |
|
Isaac Connor
|
2ba18e14fc
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-03 09:05:36 -04:00 |
|
Isaac Connor
|
30f34a6f49
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:59:40 -04:00 |
|
Isaac Connor
|
55d58a140e
|
instead of code duplication for opening the db, use zmDbConnect everywhere
|
2016-05-03 08:57:51 -04:00 |
Steve Gilvarry
|
02013cef94
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
|
2016-05-03 21:15:46 +10:00 |
|
Steve Gilvarry
|
8aa1cb6bf6
|
WIP packetqueue shared memory
|
2016-05-03 20:07:45 +10:00 |
Isaac Connor
|
01aa2c9319
|
change permissions to stream permissions for view
|
2016-05-02 19:48:24 -04:00 |
|
Isaac Connor
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
240d08133d
|
implement caching of scaled images.
|
2016-05-02 14:12:30 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -04:00 |
|
Isaac Connor
|
550fdc9295
|
change thumbnail path to specify eid and fid instead of path to the jpg.
|
2016-05-02 13:42:15 -04:00 |
|
Isaac Connor
|
b8c8ff3807
|
fix if structuring
|
2016-05-02 13:36:19 -04:00 |
Isaac Connor
|
5321fe35bd
|
Merge pull request #1321 from SteveGilvarry/ffmpeg3_deprecation
FFMPEG 3.0 deprecation fixes
|
2016-05-02 12:44:16 -04:00 |
|
Isaac Connor
|
341ebc7b45
|
Merge branch 'master' into bind_fixes
|
2016-05-02 12:39:55 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |
|
Isaac Connor
|
79572270d3
|
bump version
|
2016-05-02 10:46:23 -04:00 |
|
Isaac Connor
|
75f9fde920
|
rough in Server object support
|
2016-05-02 10:41:25 -04:00 |
|
Isaac Connor
|
9d6a7541c8
|
add Id column to storage areas
|
2016-05-02 10:40:42 -04:00 |
|
Isaac Connor
|
00f38cdd1b
|
version bump
|
2016-05-02 10:39:41 -04:00 |
|
Isaac Connor
|
272e1da958
|
rough in Server object support
|
2016-05-02 10:37:19 -04:00 |
|
Steve Gilvarry
|
bdbc7a9d94
|
Merge pull request #1454 from SteveGilvarry/h264-fixes
h264 Fix dropped part of sql query.
|
2016-05-01 16:09:05 +10:00 |
|
Steve Gilvarry
|
b9a6273f32
|
Fix dropped part of sql query.
|
2016-05-01 15:59:53 +10:00 |
|
Steve Gilvarry
|
97a4cf0852
|
Add the changes...doh
|
2016-05-01 15:06:45 +10:00 |
|
Steve Gilvarry
|
d7f7a0f074
|
Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
|
2016-05-01 13:46:09 +10:00 |
|
Isaac Connor
|
943bce788c
|
Merge pull request #1452 from SteveGilvarry/feature-h264-videostorage
Merge master to feature-h264-videostorage
|
2016-04-30 19:31:41 -04:00 |
|
Isaac Connor
|
4aafd1d417
|
Make api use zm.conf
|
2016-04-30 13:50:09 -04:00 |
Isaac Connor
|
408fba8d24
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-30 10:09:52 -04:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
ce69f24bdd
|
use zm.conf values for database connection
|
2016-04-30 08:11:39 -04:00 |
|
Isaac Connor
|
532fb77ecb
|
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
|
2016-04-30 08:09:56 -04:00 |
|
Isaac Connor
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -04:00 |
|
Isaac Connor
|
be5f0cd4a9
|
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
|
2016-04-29 10:44:46 -04:00 |
|
Isaac Connor
|
819dad455e
|
whitespace/tabs
|
2016-04-29 09:11:14 -04:00 |
|
Isaac Connor
|
b41a3b1b25
|
fix tabs/shiftwidth
|
2016-04-29 09:01:28 -04:00 |
|
Isaac Connor
|
5eebc50bfb
|
tabs to spaces
|
2016-04-29 08:57:31 -04:00 |