Isaac Connor
|
c8855c03fc
|
don't use a submodule for video.js
|
2017-04-20 10:50:42 -04:00 |
|
Isaac Connor
|
035b464b97
|
Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
|
2017-04-20 10:45:51 -04:00 |
|
Isaac Connor
|
dd4b93f130
|
add submodule video.js, using release tag v5.18.4
|
2017-04-20 10:35:32 -04:00 |
|
Isaac Connor
|
fb2f8022a7
|
don't use external hosted video.js or moment.js
|
2017-04-20 10:12:47 -04:00 |
|
Isaac Connor
|
71a9763c32
|
add a comment
|
2017-04-19 10:02:31 -04:00 |
|
Isaac Connor
|
c5ff45922f
|
fix zone edit height
|
2017-04-05 16:09:06 -04:00 |
|
Isaac Connor
|
7b63461517
|
attempt to support redirecting to the given url instead of just refreshing
|
2017-03-27 13:13:08 -04:00 |
|
Isaac Connor
|
7360619941
|
Merge branch 'master' into storageareas
|
2017-03-24 11:53:45 -04:00 |
Matthew Noorenberghe
|
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 |
Isaac Connor
|
4543b3e1b1
|
include jquery-ui instead of using a cdn version
|
2017-01-30 19:17:14 -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
|
0f4b78b180
|
increase height of bandwidth popup
|
2016-12-21 10:46:42 -05:00 |
Isaac Connor
|
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 |
|
Isaac Connor
|
0358476ac0
|
Merge branch 'fix_popup' into storageareas
|
2016-10-11 12:19:38 -04:00 |
|
Isaac Connor
|
ded1e0ea73
|
handle when window.open fails
|
2016-10-11 11:48:29 -04:00 |
|
Isaac Connor
|
cc06a84a0e
|
increase size of onvifprobe popup
|
2016-08-09 13:09:47 -04:00 |
|
Isaac Connor
|
32f9b2755e
|
add more height to the logout popup
|
2016-07-22 16:04:18 -04:00 |
|
Isaac Connor
|
2af96237b3
|
increase filter save popup height
|
2016-05-10 10:02:07 -04:00 |
|
Isaac Connor
|
49dc917b2e
|
Merge isaac:ZoneMinder.p1 into storageareas
|
2016-05-05 15:24:14 -04:00 |
|
Isaac Connor
|
516bacdfd3
|
Merge branch 'updated-console' into storageareas
|
2016-05-03 13:38:57 -04:00 |
Isaac Connor
|
e53bd1292e
|
increase events list width to accomodate thumbnails
|
2016-05-02 14:30:54 -04:00 |
|
Isaac Connor
|
b38aa60209
|
fix height of function popup
|
2016-05-02 11:56:42 -04:00 |
|
Isaac Connor
|
851e8f46ff
|
redo fix_rotate
|
2016-04-25 15:57:39 -04:00 |
Kyle Johnson
|
f2d43de137
|
Revert "Include Chart.js"
This reverts commit 33d6d311b0.
Didn't mean to add this code in yet. For a future feature.
|
2016-04-24 00:52:19 -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 |
|
Kyle Johnson
|
33d6d311b0
|
Include Chart.js
|
2016-04-02 00:48:58 -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
|
53d0e1c8df
|
Add local copy of bootstrap.js 3.3.6
|
2016-03-16 00:45:34 -04:00 |
|
Isaac Connor
|
b06b82f634
|
widen filter popup, because storage area name or server name might be longer
|
2016-03-04 15:35:55 -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
|
afb0cf2a7e
|
Merge branch 'master' into storageareas
|
2016-02-19 11:09:18 -05:00 |
Dmitry Smirnov
|
632e9c8e53
|
Upgrade bundled jQuery (Closes: #1263)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
|
2016-02-18 00:28:30 +11: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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
2d86e7713d
|
increase height of logout popup to fit content
|
2016-01-08 12:14:01 -05:00 |
|
Isaac Connor
|
492550b5ef
|
Merge branch 'storageareas' into newpointone
Conflicts:
scripts/zmaudit.pl.in
|
2015-12-24 12:36:40 -05:00 |
|
Isaac Connor
|
9d8455daea
|
fix size of filter popups
|
2015-12-21 15:18:05 -05: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
|
ca07b951cb
|
Merge branch 'master' into newpointone
Conflicts:
docs/installationguide/ubuntu.rst
|
2015-12-21 12:41:25 -05:00 |
SteveGilvarry
|
e28e3c2b75
|
Merge branch 'master' into feature-h264-videostorage
|
2015-12-20 14:13:30 +11:00 |
|
Isaac Connor
|
a0f8e8be4b
|
increase width and height of monitors popup to fit new fields
|
2015-12-18 13:43:16 -05:00 |
|
Isaac Connor
|
ee42174002
|
Merge branch 'master' into storageareas
|
2015-12-18 13:42:15 -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 |
|
SteveGilvarry
|
220ee5e516
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-11-29 13:17:22 +11:00 |
|
Isaac Connor
|
c2a7e0c587
|
fix size of monitor popup in flat skin
|
2015-11-25 15:39:46 -05:00 |