SteveGilvarry
|
20c295ad0c
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
.travis.yml
CMakeLists.txt
Makefile.am
bootstrap.sh
configure.ac
distros/debian8/control
distros/debian_cmake/control
misc/Makefile.am
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
src/CMakeLists.txt
src/Makefile.am
src/zm_monitor.cpp
src/zm_monitor.h
src/zmstreamer.cpp
web/lang/ru_ru.php
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-04-07 00:00:38 +10:00 |
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
SteveGilvarry
|
e089805276
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
|
2015-12-28 15:24:28 +11:00 |
|
Isaac Connor
|
dfd7986c01
|
Merge branch 'master' into multi-server
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
|
2015-12-21 12:57:45 -05:00 |
|
Isaac Connor
|
983d87f69b
|
increase height and width of groups window to fit buttons in
|
2015-12-18 13:34:44 -05:00 |
|
Isaac Connor
|
ca45ac23fa
|
increase height of group edit window
|
2015-12-18 13:30:42 -05:00 |
|
Isaac Connor
|
3c86965760
|
Merge branch 'master' into multi-server
Conflicts:
web/skins/classic/js/flat.js
|
2015-12-04 15:31:30 -05:00 |
|
Isaac Connor
|
c2a7e0c587
|
fix size of monitor popup in flat skin
|
2015-11-25 15:39:46 -05:00 |
|
SteveGilvarry
|
a700cbffdb
|
Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/es_es.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/views/monitor.php
|
2015-11-08 21:06:21 +11:00 |
|
Isaac Connor
|
ea87ffe66f
|
merge master, bump version to 1.28.108
|
2015-10-01 11:52:49 -04:00 |
|
Isaac Connor
|
cb18adef5c
|
increase min height of zone edit popup so that buttons are visible
|
2015-09-28 13:01:07 -04:00 |
|
Isaac Connor
|
4e2ed00027
|
widen zone edit popup to fit the image
|
2015-09-28 12:54:54 -04:00 |
|
Isaac Connor
|
7d52c0b784
|
widen events popup to fit the thumbnail
|
2015-09-28 12:44:58 -04:00 |
|
Isaac Connor
|
b12d72c68f
|
fix monitor popup size
|
2015-07-09 11:44:27 -04:00 |
Emmanuel Papin
|
e2957702b5
|
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
|
2015-06-04 20:57:34 +02:00 |
|
Isaac Connor
|
c8e41319e6
|
fix state popup dimensions
|
2015-06-03 12:22:12 -04:00 |
|
Emmanuel Papin
|
eb9e01eb00
|
Increase height of plugin window
|
2015-05-16 07:36:08 +02:00 |
|
Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
|
Isaac Connor
|
73cc4e5cab
|
move the window size definitions into a separate file for each css version flat or classic
|
2015-05-01 16:02:55 -04:00 |