Isaac Connor
|
6f6eacaa72
|
fixup classic and dark skins
|
2017-01-30 21:45:48 -05:00 |
|
Isaac Connor
|
89022fff0c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-30 21:16:26 -05:00 |
|
Isaac Connor
|
f3378207c0
|
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
|
2017-01-30 21:16:21 -05:00 |
Isaac Connor
|
ad2e00166a
|
use isset
|
2017-01-30 19:53:08 -05:00 |
|
Isaac Connor
|
4543b3e1b1
|
include jquery-ui instead of using a cdn version
|
2017-01-30 19:17:14 -05:00 |
|
Isaac Connor
|
19aed3f860
|
dont check ZM_DIR_EVENTS if it already exists in storageareas
|
2017-01-30 17:29:15 -05:00 |
|
Isaac Connor
|
9fd9c5de20
|
test for empty and non-existent path
|
2017-01-30 17:24:41 -05:00 |
|
Isaac Connor
|
fda115bebe
|
tell zmc and zma to stop before updating db
|
2017-01-30 16:37:53 -05:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
Andrew Bauer
|
dbd73690b2
|
use !== false rather than === true
|
2017-01-25 09:26:07 -06:00 |
|
Andrew Bauer
|
6189d2670c
|
ZM_DIR_EVENTS can be, and often is, a symlink
|
2017-01-25 09:05:34 -06:00 |
|
Andrew Bauer
|
8b19fca992
|
sanitize the image path before processing
|
2017-01-25 08:30:19 -06:00 |
|
Isaac Connor
|
129acb5b8e
|
only show mark column if you have the Monitor Edit ability
|
2017-01-24 09:30:56 -05:00 |
|
Isaac Connor
|
5b598fe90d
|
cleanup and use cleaned up monitor_id
|
2017-01-23 21:51:38 -05:00 |
|
Isaac Connor
|
7cd2f6c69e
|
use glyphicon for sort
|
2017-01-23 21:51:17 -05:00 |
|
Isaac Connor
|
bb3d47ab45
|
get rid of mapping
|
2017-01-23 21:34:06 -05:00 |
|
Isaac Connor
|
e937b4099b
|
add an ajax file for console to do sorting
|
2017-01-23 10:13:16 -05:00 |
|
Isaac Connor
|
fdd71a826a
|
implement dragndrop sorting
|
2017-01-23 10:12:57 -05:00 |
|
Isaac Connor
|
35148008b6
|
make img an inline-block so that it continues having space, even when is a broken link
|
2017-01-18 21:14:15 -05:00 |
|
Isaac Connor
|
8ce7719a33
|
remove extra db call cuz i sredundant
|
2017-01-18 21:12:54 -05:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |
|
Isaac Connor
|
2ce4bad39b
|
fix Event being undefined when called by path
|
2017-01-13 14:42:10 -05:00 |
|
Isaac Connor
|
16fdac3179
|
fix remSocketFile to remSockFile
|
2017-01-11 11:14:00 -05:00 |
|
Isaac Connor
|
2436e40f5d
|
Merge branch 'master' into storageareas
|
2017-01-11 10:34:27 -05:00 |
Andy Bauer
|
7ef7a36f39
|
fix conditional logic in controlcap.js
|
2017-01-10 17:53:05 -06:00 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Isaac Connor
|
55403219d8
|
fix regexp for direction in control command. Also log if the regexp doesn't match
|
2017-01-10 12:35:38 -05:00 |
|
Isaac Connor
|
fea5fa1b59
|
fix xtell should be -1 for move left
|
2017-01-10 12:35:02 -05:00 |
|
Isaac Connor
|
d8b8d78576
|
Fix storagearea lookup. Default to ZM_EVENTS_DIR
|
2017-01-09 16:35:58 -05:00 |
|
Isaac Connor
|
03fd964518
|
fix parsing StorageID
|
2017-01-09 14:59:14 -05:00 |
|
Isaac Connor
|
7ef0c2c9d3
|
fix deleting filters. We don't need to set fid anymore
|
2017-01-09 14:58:55 -05:00 |
|
Isaac Connor
|
cc724a5542
|
add a question mark to delete confirmation
|
2017-01-09 14:53:13 -05:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Isaac Connor
|
0a90dbac9f
|
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
|
2017-01-02 10:35:51 -05:00 |
|
Isaac Connor
|
30674919c4
|
always include Storage object, because in the end we will be using it everywhere
|
2017-01-02 10:34:45 -05:00 |
|
Isaac Connor
|
f6ea52280a
|
Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions
|
2017-01-02 10:34:15 -05:00 |
|
Andrew Bauer
|
b063d8d6aa
|
Merge pull request #1728 from connortechnology/path_zms_message
Path zms message
|
2017-01-02 08:54:32 -06:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
|
Isaac Connor
|
ef71ae248c
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:26 -05:00 |
|
Isaac Connor
|
d97926c478
|
fix ramSocketFile to remSocketFile
|
2017-01-02 09:31:06 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
|
Andy Bauer
|
25ab1bee18
|
more fixed to gpl license text
|
2016-12-26 10:40:09 -06:00 |
|
Andy Bauer
|
2dda2d9e1e
|
remove unneeded, empty files
|
2016-12-26 09:49:14 -06: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
|
f92edc3456
|
refresh stream url when changing scale
|
2016-12-21 10:40:47 -05:00 |
|
Isaac Connor
|
02a2fdf58f
|
Merge branch 'remove_emptys' into storageareas
|
2016-12-20 16:40:42 -05:00 |
|
Isaac Connor
|
38c0cedecc
|
remove the use of empty which on php < 5.5 only supports variables.
|
2016-12-20 16:37:42 -05:00 |
|
Isaac Connor
|
c27d0270dc
|
Merge branch 'knnniggett-zmMemDetach' into storageareas
|
2016-12-20 15:40:14 -05:00 |