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
|
e28cb5b412
|
fix body padding
|
2016-05-16 13:29:13 -04:00 |
|
Isaac Connor
|
1ce2e597cf
|
fix body top padding
|
2016-05-12 20:00:37 -04:00 |
|
Isaac Connor
|
2144cb7de6
|
fix body padding only for console and options
|
2016-05-12 10:45:13 -04:00 |
|
Isaac Connor
|
e9d8b7925a
|
Merge branch 'db_reconnect' into storageareas
|
2016-05-10 11:13:09 -04:00 |
|
Isaac Connor
|
e4171855bb
|
add padding for nabar to body
|
2016-05-07 18:12:31 -04:00 |
|
Isaac Connor
|
dcdefac48a
|
fix styles in header, move footer back into header
|
2016-05-06 16:08:32 -04:00 |
|
Isaac Connor
|
2ccefdb23c
|
Merge branch 'iconnor-updated-console' into storageareas
|
2016-05-06 15:30:25 -04:00 |
|
Isaac Connor
|
f4df9e053d
|
port sidebar css over from classic to flat
|
2016-05-06 15:30:10 -04:00 |
|
Isaac Connor
|
4defe92911
|
Merge branch 'master' into updated-console
|
2016-05-03 14:22:37 -04:00 |
|
Isaac Connor
|
516bacdfd3
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 13:38:57 -04:00 |
Kyle Johnson
|
b4d8bc6a52
|
Change sidebar to lighter colors
|
2016-04-24 13:51:48 -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
|
11981efad2
|
add this back
|
2016-04-08 13:20:26 -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
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -04:00 |
|
Isaac Connor
|
564f189416
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 16:45:54 -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 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
3e20e5f21c
|
fix ptz control box size
|
2016-04-04 11:40:01 -04:00 |
|
Kyle Johnson
|
f59ed9cf0d
|
clean up options a bit more
|
2016-04-01 14:39:15 -04:00 |
|
Kyle Johnson
|
92e0552f8e
|
Add side tab list to options page, and style it.
|
2016-04-01 14:02:19 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Kyle Johnson
|
6f409f0bf4
|
Make the ZM logo in header stand out
|
2016-03-15 23:53:29 -04:00 |
|
Kyle Johnson
|
897a0a995c
|
Convert options layout to side-tabs, and improve readability
|
2016-03-15 15:21:28 -04:00 |
|
Kyle Johnson
|
87932002cf
|
Push the options page down a bit to make tab look better
|
2016-03-15 14:45:40 -04:00 |
|
Kyle Johnson
|
183f58ad17
|
Restyle options view with horizontal form layout
|
2016-03-15 14:43:22 -04:00 |
|
Kyle Johnson
|
8acfe1b0d8
|
Update options styling
|
2016-03-12 22:44:11 -05:00 |
|
Kyle Johnson
|
d202760d82
|
Additional footer padding
|
2016-03-12 20:37:07 -05:00 |
|
Kyle Johnson
|
a2c2101c48
|
Remove extra #footer styling
|
2016-03-12 20:28:16 -05:00 |
|
Kyle Johnson
|
f80cbf52df
|
Bump up the default font size
|
2016-03-12 20:27:51 -05: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 |
Isaac Connor
|
d3755611c5
|
Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
|
2016-02-04 11:54:02 -05:00 |
|
SteveGilvarry
|
7301e803ed
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2016-01-30 15:45:08 +11:00 |
Brandon Odegard
|
54a11175ff
|
Reduce default size of body font in Flat skin
|
2016-01-22 13:56:41 -06:00 |
|
Brandon Odegard
|
1ca9ace84d
|
Fixed missing semicolons
|
2016-01-22 13:31:02 -06:00 |
|
Isaac Connor
|
53bd342f85
|
remove Google open Sans external import
|
2016-01-08 09:46:14 -05: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 |
Dmitry Smirnov
|
333e7ec67b
|
header typo corrections
|
2015-09-19 17:39:54 +10:00 |
|
Isaac Connor
|
c60d1cbeca
|
Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
Grey color for disabled buttons
|
2015-08-25 12:50:50 -04:00 |
Pliable Pixels
|
a6f296d84e
|
Grey color for disabled buttons
|
2015-08-25 12:29:40 -04:00 |
Robin Daermann
|
e390200824
|
Small dark CSS fixes in frames and timeline view
|
2015-08-17 14:39:41 +02:00 |