Isaac Connor
|
6a0c6cd4f2
|
Merge branch 'show_other_zones' into storageareas
|
2016-08-02 13:54:01 -04:00 |
|
Isaac Connor
|
8093470a2e
|
make only the editing polygon have a border. Set default for Type when creating a new zone
|
2016-08-02 12:19:55 -04:00 |
Isaac Connor
|
060988c05c
|
set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding
|
2016-05-31 16:02:37 -04:00 |
|
Isaac Connor
|
1ce2e597cf
|
fix body top padding
|
2016-05-12 20:00:37 -04:00 |
|
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
root
|
479ea17ed5
|
fix event menubars
|
2016-04-16 15:13:18 -04:00 |
|
Isaac Connor
|
2b05815bfa
|
remove set height on the menu bars, fixing flow issues
|
2016-04-15 15:44:35 -04:00 |
|
Isaac Connor
|
498bceae0a
|
remove styles for svg circles
|
2016-04-08 13:44:20 -04:00 |
|
Isaac Connor
|
22f207602b
|
add css for the svg zones
|
2016-04-08 13:43:00 -04:00 |
|
Isaac Connor
|
34bfbb4708
|
blah
|
2016-04-08 13:18:13 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
SteveGilvarry
|
5ff427d9e9
|
Removed Autotools Makefile.am
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
|
2016-02-26 22:19:02 +11:00 |
SteveGilvarry
|
d8494aba2d
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
|
2015-10-23 22:07:22 +11:00 |
|
Isaac Connor
|
cf5473836e
|
set default border on live streams so that when they alarm they don't jump around
|
2015-10-02 10:04:56 -04:00 |
|
SteveGilvarry
|
b3313edde0
|
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
Conflicts:
web/skins/classic/views/event.php
|
2015-03-21 23:49:56 +11:00 |
ljack
|
8616fdb33d
|
fix import path
|
2015-02-25 18:09:23 +02:00 |
|
ljack
|
6233432559
|
fix import path
|
2015-02-25 18:08:41 +02:00 |
|
Isaac Connor
|
c3f96ad8ca
|
fix path to the zone point gif
|
2015-02-19 11:11:01 -05:00 |
|
SteveGilvarry
|
ada53bbb28
|
Testing videojs for video playback
|
2015-02-16 19:43:13 +11:00 |
Isaac Connor
|
5abc58ea14
|
Merge pull request #620 from SteveGilvarry/11-php-short-tags
Replace PHP Short Open Tags - Fixes #11
Works for me too.
|
2014-12-08 14:39:24 -05:00 |
|
Isaac Connor
|
2c1e4a9965
|
fix the paths so that the ptzControls are visible
|
2014-12-08 10:34:25 -05:00 |
|
SteveGilvarry
|
e87e69fa57
|
Ran script to replace all Short open tags
|
2014-12-05 10:44:23 +11:00 |
|
Isaac Connor
|
82c01479c6
|
move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
|
2014-12-01 15:44:01 -05:00 |