Andrew Bauer
|
22a0daaac8
|
Merge pull request #557 from manupap1/rtsp_fix
Fixed bug in rtsp streaming caused by a bad string concatenation
|
2014-11-06 07:12:00 -06:00 |
manupap1
|
e764938a0d
|
Fixed bug in rtsp streaming caused by a bad string concatenation
|
2014-11-06 10:16:28 +01:00 |
Isaac Connor
|
91986f3159
|
Merge pull request #555 from manupap1/rtsp_fix
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
I like it. but please... somehelp help out with my comments above.
|
2014-11-05 15:10:50 -05:00 |
Isaac Connor
|
a88ce80716
|
Add a stringVector join function for future use
|
2014-11-05 14:01:48 -05:00 |
|
manupap1
|
fefc17b0fc
|
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
|
2014-11-05 19:08:57 +01:00 |
Steve Gilvarry
|
1f73155bfd
|
Update Ubuntu install instructions
Removed need to install snapshot version for latest Ubuntu now that 1.28 is packaged.
|
2014-11-04 07:53:51 +11:00 |
Kyle Johnson
|
dfc3d70584
|
Remove Filters from the header
|
2014-11-03 13:49:48 +00:00 |
|
Kyle Johnson
|
e8b93f0a20
|
Revert "Remove Filters from the header"
This reverts commit 4b6cf9ca04.
|
2014-11-03 13:49:36 +00:00 |
|
Kyle Johnson
|
4b6cf9ca04
|
Remove Filters from the header
|
2014-11-03 13:49:06 +00:00 |
|
Kyle Johnson
|
28a4de809b
|
Show log state color in header
|
2014-11-02 14:54:08 +00:00 |
|
Kyle Johnson
|
ee2e0a5aec
|
Add Events to main nav
|
2014-11-02 12:42:40 +00:00 |
|
Kyle Johnson
|
f847ad548a
|
Added ZoneMinder logo to header
|
2014-11-02 12:41:40 +00:00 |
|
Kyle Johnson
|
91af0992bd
|
Remove unused elements from the sidebar
|
2014-11-02 00:51:56 +00:00 |
|
Kyle Johnson
|
dfa246bbf6
|
Add header to log and rearrange filter elements
|
2014-11-02 00:51:24 +00:00 |
|
Kyle Johnson
|
1f8d2d3b77
|
Add header to monitor view
|
2014-11-02 00:48:21 +00:00 |
|
Kyle Johnson
|
23b367614b
|
Use <a> elements intead of makePopupLink() in header
|
2014-11-02 00:47:32 +00:00 |
|
Kyle Johnson
|
1436414ddc
|
Add header to main views
|
2014-11-02 00:47:14 +00:00 |
|
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 |
|
Isaac Connor
|
4863ce96a3
|
remove annoying warning.
|
2014-10-31 14:12:36 -04:00 |
|
Isaac Connor
|
60ea505139
|
add avdevice55 as a dependcy instead of 53, which we need for utopic
|
2014-10-31 14:11:34 -04: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 |