f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
200f92b1ad
make zmexport not rely on symlinks in the webroot ( #1888 )
...
* make zmexport not rely on symlinks in the webroot
* add archive view
2017-05-17 11:30:39 -04:00
bde887fc9c
remove unneeded ;'s
2017-05-05 17:17:55 -04:00
9482114f95
add db connections to the header
2017-04-28 14:17:09 -04:00
dce39bb2a9
Merge branch 'master' into storageareas
2017-04-26 15:58:17 -04:00
1a565a47f2
fix skin path in export_functions
2017-04-26 12:17:01 -05:00
83ba74ad66
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:54 -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
fb2f8022a7
don't use external hosted video.js or moment.js
2017-04-20 10:12:47 -04:00
f1f54205fb
Merge branch 'remove_BOM' into storageareas
2017-04-16 09:28:35 -04:00
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
7b73eb350f
update to current.
2017-02-02 12:15:16 -05:00
6f6eacaa72
fixup classic and dark skins
2017-01-30 21:45:48 -05:00
89022fff0c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-30 21:16:26 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
ad2e00166a
use isset
2017-01-30 19:53:08 -05:00
4543b3e1b1
include jquery-ui instead of using a cdn version
2017-01-30 19:17:14 -05:00
19aed3f860
dont check ZM_DIR_EVENTS if it already exists in storageareas
2017-01-30 17:29:15 -05:00
fdd71a826a
implement dragndrop sorting
2017-01-23 10:12:57 -05:00
fea5fa1b59
fix xtell should be -1 for move left
2017-01-10 12:35:02 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
2dda2d9e1e
remove unneeded, empty files
2016-12-26 09:49:14 -06:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
02a2fdf58f
Merge branch 'remove_emptys' into storageareas
2016-12-20 16:40:42 -05:00
38c0cedecc
remove the use of empty which on php < 5.5 only supports variables.
2016-12-20 16:37:42 -05:00
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
2adb17ad90
fix type
2016-11-29 15:25:24 -05:00
02cd3e8cba
Merge branch 'master' into small_fixes
2016-11-22 10:52:07 -05:00
3b7723ee8f
Merge branch 'master' into storageareas
2016-11-11 22:40:00 -05:00
3916b02a74
Only load bootstrap css in specific views.
...
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
97fb53e95c
Remove extra php tag in functions.php
2016-11-10 21:49:57 -07:00
3e3956f45d
Update doctype to HTML5, add meta tags for mobile browsers
2016-11-10 21:47:53 -07:00
eacf6cd415
Restyle login page, move recaptcha js to <head>
...
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
1607ae1210
Load bootstrap css
2016-11-10 21:45:46 -07:00
cb69d1a693
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2016-11-03 14:57:29 -04:00
2f22eb5a8c
fix error when only 1 monitor is listed
2016-11-03 09:41:54 -04:00
ca69a79bed
fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist.
2016-10-27 17:05:33 -04:00
f153e9b8fb
MontageReview should only be visisble to people who can view events. Fix running state
2016-10-20 13:38:12 -04:00
67e14bd12f
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
2016-10-20 13:16:50 -04:00
b00588b6ff
add back montagereview
2016-10-11 17:35:41 -04:00
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
76beaf281a
Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas.
2016-09-15 19:44:13 +10:00
a0eaea00a5
fix relative paths to jquery and bootstrap fixes #1618
2016-09-14 10:06:15 -04:00
0bc50810de
only add the development h3 if it has contents, otherwise it pushes the header size down
2016-09-13 10:25:49 -04:00
09ebcfb7f8
only put in the development h3 tag if the value has been set
2016-08-22 11:42:44 -04:00
2451768295
Merge branch 'master' into storageareas
2016-08-08 18:08:46 -04:00
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Andy Bauer
Isaac Connor
Kyle Johnson
bhaal2