Isaac Connor
|
75c11431e6
|
deprecate filtersavepopup
|
2017-06-16 11:10:25 -04:00 |
|
Isaac Connor
|
9f301e3c51
|
Merge branch 'log_no_truncate' into storageareas
|
2017-06-14 10:18:27 -04:00 |
|
Isaac Connor
|
ce6a6a41a8
|
fix gif->png and the path for arrow-s-u and arrow-s-d
|
2017-06-14 09:34:03 -04:00 |
|
Isaac Connor
|
b4bdc1fd6b
|
Merge branch 'master' into dragndrop_monitor_sorting
|
2017-06-06 20:39:58 -04:00 |
|
Isaac Connor
|
04aa01ba0c
|
add login css files
|
2017-06-05 21:41:39 -04:00 |
|
Isaac Connor
|
0e643f0f93
|
Merge branch 'master' into storageareas
|
2017-05-30 11:58:38 -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
|
7cfa0b12ec
|
Merge branch 'dragndrop_monitor_sorting' into storageareas
|
2017-05-25 15:26:04 -04:00 |
|
Isaac Connor
|
09c0b47568
|
remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows
|
2017-05-25 15:02:30 -04:00 |
|
Isaac Connor
|
96051a0071
|
we switched to .png instead of .gif
|
2017-05-18 13:50:46 -04:00 |
|
Isaac Connor
|
e15fdf9ac3
|
We switched to png's now
|
2017-05-18 13:18:07 -04:00 |
Isaac Connor
|
deb1cf653a
|
fix dimensions of ptz box
|
2017-05-05 16:47:21 -04:00 |
|
Isaac Connor
|
5a2ef571ef
|
fix scaling, zones now work. Add a Show/Hide Zones at the top
|
2017-04-24 14:47:30 -04:00 |
|
Isaac Connor
|
dd4550406f
|
remove styles from montagereview and stick them in a view-specific css
|
2017-03-30 13:03:46 -04:00 |
|
Isaac Connor
|
d8c79cb750
|
fixup header and sidebar layout
|
2017-02-02 11:31:16 -05:00 |
Isaac Connor
|
7d451e1e41
|
float the scale control right, add css for other skins
|
2017-01-31 11:13:16 -05:00 |
|
Isaac Connor
|
6f6eacaa72
|
fixup classic and dark skins
|
2017-01-30 21:45:48 -05:00 |
|
Isaac Connor
|
f3378207c0
|
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
|
2017-01-30 21:16:21 -05:00 |
|
Isaac Connor
|
35148008b6
|
make img an inline-block so that it continues having space, even when is a broken link
|
2017-01-18 21:14:15 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
|
Isaac Connor
|
4fe6b6f8b7
|
set a min width so that small images or fps updates don't cause a reflow
|
2016-11-21 11:39:31 -05:00 |
|
Isaac Connor
|
340b172dc4
|
Merge branch 'add_scale_to_frame_view' into storageareas
|
2016-10-26 14:46:50 -04:00 |
|
Isaac Connor
|
42783b68f9
|
float the scale control right, add css for other skins
|
2016-10-26 14:43:23 -04:00 |
|
Isaac Connor
|
ba7d935a85
|
fix border size of text below the image in montage when alerted.
|
2016-10-12 12:19:04 -04:00 |
|
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 |
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
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
f91ff4503a
|
rework the ptz controls to take up less vertical space, also don't set width of buttons
|
2016-04-04 13:20:04 -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 |
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06: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 |
Dmitry Smirnov
|
333e7ec67b
|
header typo corrections
|
2015-09-19 17:39:54 +10:00 |
Robin Daermann
|
e390200824
|
Small dark CSS fixes in frames and timeline view
|
2015-08-17 14:39:41 +02:00 |
|
Robin Daermann
|
37e01b504b
|
Implemented #989 (highlight current row in tables) for dark CSS
|
2015-08-05 14:36:07 +02:00 |
|
Robin Daermann
|
651cffd3b5
|
Small color corrections in tabList
|
2015-07-27 10:07:01 +02:00 |
|
Robin Daermann
|
5588406570
|
Add dark CSS for classic view
|
2015-07-27 09:53:59 +02:00 |