Kyle Johnson
|
79e41dbb1b
|
Fix bug where on / off icon didn't have class if not console view
|
2014-11-02 00:40:26 +00:00 |
|
Kyle Johnson
|
6435fe24c0
|
Add console link to header
|
2014-11-01 16:04:15 +00:00 |
|
Kyle Johnson
|
c892e72ae8
|
Display cycle and montage as <a> element, only if running
|
2014-11-01 16:01:30 +00:00 |
|
Kyle Johnson
|
bcbd73fe44
|
Split nav / header out into own file
|
2014-11-01 15:39:11 +00:00 |
|
Kyle Johnson
|
1a83b3053e
|
More work on cosole - split into sep. files, create sidebar
|
2014-11-01 15:26:19 +00:00 |
|
Kyle Johnson
|
8ec86ae255
|
Convert most of console to bootstrap theme
|
2014-10-31 20:55:19 +00:00 |
|
Kyle Johnson
|
1c400f0966
|
Remove font-size:10px from <body>
|
2014-10-31 20:32:50 +00:00 |
|
Kyle Johnson
|
a4fbde9e3f
|
Add Chart.js to bootstrap skin
|
2014-10-31 20:24:25 +00:00 |
|
Kyle Johnson
|
896b258ad0
|
Use bootstrap .container-fluid instead of #page
|
2014-10-31 18:55:32 +00:00 |
|
Kyle Johnson
|
c11f4eb0bb
|
Use HTML5 doctype
|
2014-10-31 18:53:15 +00:00 |
|
Kyle Johnson
|
c066d9bdbc
|
Load the bootstrap css and js files
|
2014-10-31 18:50:07 +00:00 |
|
Kyle Johnson
|
7e89df842c
|
Check in of bootstrap 3.3.0 files to bootstrap skin
|
2014-10-31 18:47:46 +00:00 |
|
Kyle Johnson
|
bb465f0250
|
Initial commit of bootstrap-based skin
|
2014-10-31 18:46:37 +00:00 |
Andrew Bauer
|
5abd7ce7cd
|
Merge pull request #544 from kylejohnson/ignore-more-files
Ignore more files and initial travis framework
|
2014-10-31 12:22:04 -05:00 |
|
Kyle Johnson
|
39ac8c8b34
|
git ignore files created during bootstrap, configure and make.
|
2014-10-31 12:31:40 -04:00 |
|
Kyle Johnson
|
c48b039b15
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
.travis.yml
|
2014-10-31 12:25:57 -04:00 |
|
Andrew Bauer
|
16c86e6604
|
Merge pull request #535 from knnniggett/travis_libvlc
Add libvlc to Travis
|
2014-10-26 15:08:59 -05:00 |
Isaac Connor
|
387dfa9862
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2014-10-23 09:00:59 -04:00 |
|
Isaac Connor
|
57e5b4fee8
|
Fix segfault on zmu -l due to not connectig to the shared mem
|
2014-10-23 09:00:53 -04:00 |
|
Andrew Bauer
|
9ea24a6e04
|
Merge pull request #539 from SteveGilvarry/test-ffmpeg-2.4.2
Update Travis to ffmpeg 2.4.2
|
2014-10-23 07:00:23 -05:00 |
SteveGilvarry
|
838eb64537
|
Update Travis to ffmpeg 2.4.2
|
2014-10-23 20:22:09 +11:00 |
|
Isaac Connor
|
2f32c3895b
|
Merge branch 'release-1.28'
Conflicts:
web/skins/flat/js/skin.js
|
2014-10-22 15:10:19 -04:00 |
|
Isaac Connor
|
c9c6c17699
|
add script for TVIP862IC. Should also work with IP672 and others.
|
2014-10-22 15:08:58 -04:00 |
|
Isaac Connor
|
c5a1d9ffa9
|
fix console refresh in this skin too
|
2014-10-22 10:58:06 -04:00 |
|
Isaac Connor
|
c8a985a65f
|
Merge branch 'release-1.28'
|
2014-10-22 10:31:57 -04:00 |
|
Isaac Connor
|
85529efffc
|
check for existence of the columns beefore trying to add them
|
2014-10-22 10:31:23 -04:00 |
|
Andrew Bauer
|
23ebbf3887
|
Update skin.js
Move this line down to mitigate the problem where the console doesn't refresh.
|
2014-10-21 17:22:33 -05:00 |
|
Isaac Connor
|
e23c756ca4
|
Revert "replace uri_encode with uri_escape"
This reverts commit ce5396f4ea.
|
2014-10-21 15:17:34 -04:00 |
|
Isaac Connor
|
07cddf4164
|
Merge branch 'master' into release-1.28
|
2014-10-21 09:48:05 -04:00 |
|
Isaac Connor
|
ce5396f4ea
|
replace uri_encode with uri_escape
|
2014-10-21 09:47:31 -04:00 |
|
Andrew Bauer
|
cbfe7a3e9e
|
Update version
What is this file used for?
|
2014-10-21 07:21:13 -05:00 |
|
Andrew Bauer
|
607ce08613
|
Update version
What is this file used for?
|
2014-10-21 07:20:53 -05:00 |
|
Isaac Connor
|
5dedbc2135
|
detect when the control address has a http in front, and do the right thing
|
2014-10-20 16:55:24 -04:00 |
|
Isaac Connor
|
9ce7da4147
|
Don't 'use Data::Dumper'; it was only there for debug
|
2014-10-20 16:47:03 -04:00 |
|
Isaac Connor
|
693c4b2e68
|
Merge branch 'release-1.28'
|
2014-10-20 16:45:59 -04:00 |
|
Isaac Connor
|
c4394c3c92
|
add liburi-encode-perl to dependencies, we use it in M8640, will likely use it elsewhere
|
2014-10-20 16:45:15 -04:00 |
|
Isaac Connor
|
38ec44f04e
|
Merge branch 'release-1.28'
|
2014-10-20 15:33:06 -04:00 |
|
Isaac Connor
|
896ae6250a
|
Merge branch 'release-1.28' of github.com:ZoneMinder/ZoneMinder into release-1.28
|
2014-10-20 15:32:42 -04:00 |
|
Isaac Connor
|
8d225566b1
|
Move this line down to mitigate the problem where the console doesn't refresh.
|
2014-10-20 15:32:30 -04:00 |
Andrew Bauer
|
6a1db0f895
|
Use libvlccore5 instead of 7 or 8
|
2014-10-19 10:11:17 -05:00 |
|
Andrew Bauer
|
bdef494ac3
|
Use libvlccore7 instead of 8
|
2014-10-19 10:07:34 -05:00 |
|
Andrew Bauer
|
7bb8422b00
|
Add libvlc to Travis
|
2014-10-19 09:49:49 -05:00 |
|
Andrew Bauer
|
408bbbd535
|
Merge branch 'release-1.28'
|
2014-10-19 07:44:27 -05:00 |
|
Andrew Bauer
|
fcf39fc9fa
|
Update zoneminder.cmake.f20.spec
Fix path to README file
|
2014-10-18 17:36:12 -05:00 |
|
Andrew Bauer
|
71b56a163d
|
Zoneminder 1.28.0 Release
|
2014-10-18 15:23:13 -05:00 |
|
Isaac Connor
|
4fd2230b1d
|
add release 1.28.0
|
2014-10-17 09:27:54 -04:00 |
|
Isaac Connor
|
61ebb56424
|
add 1.28.0 release
|
2014-10-17 09:26:59 -04:00 |
Isaac Connor
|
a043526994
|
Merge pull request #462 from knnniggett/memory
Fix for shared data size conflict
|
2014-10-17 09:18:21 -04:00 |
|
Isaac Connor
|
8a33f78243
|
bugfix; coredump if no codec name was specified in url.
|
2014-10-15 14:35:01 -04:00 |
|
Isaac Connor
|
638ef29e28
|
Merge branch 'libav_ffmpeg_fixes'
|
2014-10-15 13:25:06 -04:00 |