fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
f832dd30ea
Merge pull request #1817 from mnoorenberghe/eslint
...
Add eslint configuration files extending Google's rules
2017-05-10 09:04:51 -04:00
e0256c1a67
add local version of js files
2017-05-08 21:06:25 -04:00
3b6cf74ed3
add auth_hash to ajax calls
2017-05-05 11:53:40 -04:00
c8855c03fc
don't use a submodule for video.js
2017-04-20 10:50:42 -04:00
035b464b97
Revert "don't use external hosted video.js or moment.js"
...
This reverts commit fb2f8022a7
2017-04-20 10:45:51 -04:00
dd4b93f130
add submodule video.js, using release tag v5.18.4
2017-04-20 10:35:32 -04:00
fb2f8022a7
don't use external hosted video.js or moment.js
2017-04-20 10:12:47 -04:00
71a9763c32
add a comment
2017-04-19 10:02:31 -04:00
c5ff45922f
fix zone edit height
2017-04-05 16:09:06 -04:00
7b63461517
attempt to support redirecting to the given url instead of just refreshing
2017-03-27 13:13:08 -04:00
7360619941
Merge branch 'master' into storageareas
2017-03-24 11:53:45 -04:00
c7955cd1b6
Add eslint configuration files extending Google's rules
2017-03-18 00:02:17 -07:00
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
4543b3e1b1
include jquery-ui instead of using a cdn version
2017-01-30 19:17:14 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
0f4b78b180
increase height of bandwidth popup
2016-12-21 10:46:42 -05:00
6bf921a858
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
2016-11-21 12:28:15 -05:00
0358476ac0
Merge branch 'fix_popup' into storageareas
2016-10-11 12:19:38 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
cc06a84a0e
increase size of onvifprobe popup
2016-08-09 13:09:47 -04:00
32f9b2755e
add more height to the logout popup
2016-07-22 16:04:18 -04:00
2af96237b3
increase filter save popup height
2016-05-10 10:02:07 -04:00
49dc917b2e
Merge isaac:ZoneMinder.p1 into storageareas
2016-05-05 15:24:14 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
e53bd1292e
increase events list width to accomodate thumbnails
2016-05-02 14:30:54 -04:00
b38aa60209
fix height of function popup
2016-05-02 11:56:42 -04:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
f2d43de137
Revert "Include Chart.js"
...
This reverts commit 33d6d311b0
2016-04-24 00:52:19 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
33d6d311b0
Include Chart.js
2016-04-02 00:48:58 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
53d0e1c8df
Add local copy of bootstrap.js 3.3.6
2016-03-16 00:45:34 -04:00
b06b82f634
widen filter popup, because storage area name or server name might be longer
2016-03-04 15:35:55 -05:00
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
afb0cf2a7e
Merge branch 'master' into storageareas
2016-02-19 11:09:18 -05:00
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
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
ddf7b1ad43
Merge branch 'master' into storageareas
...
Conflicts:
web/skins/classic/js/dark.js
web/skins/classic/js/flat.js
2016-01-14 09:41:24 -05:00
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
492550b5ef
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
9d8455daea
fix size of filter popups
2015-12-21 15:18:05 -05:00
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
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
a0f8e8be4b
increase width and height of monitors popup to fit new fields
2015-12-18 13:43:16 -05:00
ee42174002
Merge branch 'master' into storageareas
2015-12-18 13:42:15 -05:00
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
cb18adef5c
increase min height of zone edit popup so that buttons are visible
2015-09-28 13:01:07 -04:00
4e2ed00027
widen zone edit popup to fit the image
2015-09-28 12:54:54 -04:00
7d52c0b784
widen events popup to fit the thumbnail
2015-09-28 12:44:58 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
b12d72c68f
fix monitor popup size
2015-07-09 11:44:27 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
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
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
7ea003441d
Merge pull request #371 from m-bene/resizeWindows
...
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
bc18a27072
Update skin.js
...
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.
Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Andy Bauer
Isaac Connor
Isaac Connor
Kyle Johnson
SteveGilvarry
Dmitry Smirnov
SteveGilvarry
Heng Liu
Andrew Bauer
Robin Daermann
Jan M. Hochstein
m-bene
Isaac Connor
Isaac Connor
nagyrobi
nextime