Isaac Connor
|
161fc94496
|
remove useless ()
|
2018-04-25 09:33:12 -04:00 |
|
Isaac Connor
|
80f73854c7
|
Include the groupIds hidden when not on general tab
|
2018-04-25 09:33:02 -04:00 |
|
Isaac Connor
|
dfae6661ab
|
use isset when determining if a column exists, otherwise we throw warnings
|
2018-04-25 09:32:40 -04:00 |
|
Isaac Connor
|
5f415873d4
|
Update GroupIds regardless of changes returned from getFormChanges on Monitor save
|
2018-04-25 09:32:15 -04:00 |
|
Isaac Connor
|
2a81877664
|
spacing
|
2018-04-25 09:31:40 -04:00 |
|
Isaac Connor
|
80803a164c
|
in set(), check to see if there is a method and if there is call it to set the value. Implement using GroupIds to set the GroupIds value. If the new value is a scalar, then turn it into an array.
|
2018-04-25 09:27:43 -04:00 |
Isaac Connor
|
28921a653b
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-24 11:22:48 -07:00 |
Isaac Connor
|
5b4d160710
|
add total bandwidth at bottom and move buttons to top
|
2018-04-24 14:18:41 -04:00 |
|
Isaac Connor
|
20f6985dff
|
implement capturing bandwidth
|
2018-04-24 14:11:27 -04:00 |
|
Isaac Connor
|
ad376fc267
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-24 09:40:39 -07:00 |
|
Isaac Connor
|
bbb10fa4b4
|
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
|
2018-04-24 12:40:15 -04:00 |
|
Isaac Connor
|
de149c1328
|
spacing
|
2018-04-24 08:48:35 -07:00 |
Isaac Connor
|
9fd2c12765
|
DB Logging is a Debug level
|
2018-04-24 08:42:52 -04:00 |
|
Isaac Connor
|
662215d125
|
Merge ../ZoneMinder.connortechnology
|
2018-04-21 10:35:49 -04:00 |
|
Isaac Connor
|
3560c0d610
|
fix displayed tbale header twice
|
2018-04-21 10:35:36 -04:00 |
|
Isaac Connor
|
578df0c5cc
|
update submodules
|
2018-04-20 16:18:58 -04:00 |
|
Isaac Connor
|
c65255a067
|
Merge ../ZoneMinder.connortechnology
|
2018-04-20 15:56:42 -04:00 |
|
Isaac Connor
|
a868bb70ed
|
Better debug when fail to attach images
|
2018-04-20 15:56:14 -04:00 |
|
Isaac Connor
|
fac3cde1e7
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-20 15:23:23 -04:00 |
|
Isaac Connor
|
3ea39ad417
|
whitespace
|
2018-04-20 15:22:45 -04:00 |
|
Isaac Connor
|
8b165c34b0
|
Handle event and frame no found earlier
|
2018-04-20 14:25:54 -04:00 |
|
Isaac Connor
|
781438d4c5
|
specify E.* in query because otherwise it uses M.Id for Id
|
2018-04-20 14:25:38 -04:00 |
|
Isaac Connor
|
fedc4d4cb1
|
spacing
|
2018-04-20 14:24:56 -04:00 |
|
Isaac Connor
|
ac775f13f6
|
always return an array from find_all
|
2018-04-20 14:23:27 -04:00 |
|
Isaac Connor
|
9de3c44702
|
Add find_one and caching
|
2018-04-20 14:23:04 -04:00 |
|
Isaac Connor
|
07e7ab1547
|
fix spacing
|
2018-04-20 14:21:41 -04:00 |
|
Isaac Connor
|
970830aee3
|
tidy up
|
2018-04-20 13:10:38 -04:00 |
Andy Bauer
|
ed140426ab
|
rpm packaging changes and documentation
|
2018-04-19 15:36:43 -05:00 |
Andrew Bauer
|
3c225c9f1c
|
Migrate Webcache out of webroot (#2083)
* migrate webcache folder out of webroot, migrate htaccess files
* rpm specfile - add missing reference to cache folder
* fix submodule mixup
|
2018-04-19 15:01:46 -04:00 |
|
Isaac Connor
|
fb44619a66
|
output the initial table head
|
2018-04-19 14:33:05 -04:00 |
|
Isaac Connor
|
2aa689a14a
|
Use a class instead of an id for consoleTable
|
2018-04-19 14:20:02 -04:00 |
|
Isaac Connor
|
5b5cd3f330
|
fix broken table when no monitors to display
|
2018-04-19 14:16:30 -04:00 |
|
Isaac Connor
|
983cd83054
|
Add default for SignalCheckPoints and add it as a hidden field to the non-misc tabs
|
2018-04-19 10:01:04 -04:00 |
|
Isaac Connor
|
cd70ed3dec
|
always show SignalCheckColour and add a SignalCheckPoints option
|
2018-04-19 09:45:28 -04:00 |
|
Isaac Connor
|
8da9bc412b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-04-18 21:12:33 -04:00 |
|
Isaac Connor
|
fcaac016b5
|
Merge ../ZoneMinder.connortechnology
|
2018-04-18 21:12:14 -04:00 |
Andrew Bauer
|
a5cbc8abd1
|
buildsystem - update git submodules
|
2018-04-18 19:21:14 -05:00 |
|
Isaac Connor
|
bbee7fd0f2
|
fix array_key_exists
|
2018-04-18 14:17:41 -07:00 |
|
Isaac Connor
|
28b85e1977
|
Add ZeroSize test to Event Audit Report
|
2018-04-18 13:48:20 -07:00 |
|
Andrew Bauer
|
f6540aeba1
|
point git submodules to our own forks
|
2018-04-18 14:00:00 -05:00 |
|
Isaac Connor
|
75248e7465
|
use array_key_exists instead of isset so that we can return nulls
|
2018-04-18 14:21:27 -04:00 |
|
Isaac Connor
|
d31207dd53
|
use find_one instead of new Group so that caching will happen
|
2018-04-18 12:30:47 -04:00 |
|
Isaac Connor
|
88a2c0d953
|
spacing
|
2018-04-18 12:30:32 -04:00 |
|
Isaac Connor
|
61249ccf2a
|
Show pause/play/stop when no stream buffer
|
2018-04-18 12:30:18 -04:00 |
|
Isaac Connor
|
36b8cfb115
|
test element so that processing will continue if buton doesn't exist
|
2018-04-18 12:29:59 -04:00 |
|
Isaac Connor
|
940c791d4f
|
GroupIds won't be set if no groups are selected
|
2018-04-18 12:14:49 -04:00 |
|
Isaac Connor
|
e3afa5e309
|
handle scale not being defined when using mpeg streaming
|
2018-04-18 11:28:19 -04:00 |
|
Isaac Connor
|
12d46e2377
|
change event_id in status_msg to 64bit when unpacking
|
2018-04-18 09:52:57 -04:00 |
|
Isaac Connor
|
ef86746991
|
Merge ../ZoneMinder.connortechnology
|
2018-04-17 21:07:48 -04:00 |
|
Isaac Connor
|
f620781f7e
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-17 21:07:00 -04:00 |
|
Isaac Connor
|
aaa7844350
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-17 14:18:01 -07:00 |
|
Isaac Connor
|
10a191ae5b
|
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
|
2018-04-17 14:14:40 -07:00 |
|
Isaac Connor
|
fd1c69d48a
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:51:20 -04:00 |
|
Isaac Connor
|
c043a157ad
|
spacing and add Server function
|
2018-04-17 12:37:30 -04:00 |
|
Isaac Connor
|
92c8b9038c
|
fix to group caching and group deleting
|
2018-04-17 12:36:35 -04:00 |
|
Isaac Connor
|
196b8c52dc
|
Apply multiport to event viewing as well
|
2018-04-17 12:35:59 -04:00 |
|
Isaac Connor
|
3b0282f6ec
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-17 12:32:10 -04:00 |
|
Isaac Connor
|
92cb7dabd5
|
merge some fixes from other branches
|
2018-04-17 08:48:59 -07:00 |
|
Isaac Connor
|
ef70ff86e9
|
cleanup zmaControl
|
2018-04-17 11:36:14 -04:00 |
|
Isaac Connor
|
34111251d9
|
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
|
2018-04-17 07:02:52 -07:00 |
|
Isaac Connor
|
dc098b5299
|
put the status into the function column
|
2018-04-16 14:51:10 -04:00 |
|
Isaac Connor
|
98b54f87f2
|
make thumbnail code more readable
|
2018-04-15 10:27:08 -04:00 |
|
Isaac Connor
|
2860e067bc
|
Fix caching when an array is passed to new
|
2018-04-15 10:26:57 -04:00 |
|
Isaac Connor
|
bef7098cb4
|
Fix Event->Storage()
|
2018-04-15 10:26:38 -04:00 |
|
Isaac Connor
|
998d60a4b2
|
whitespace
|
2018-04-14 22:26:57 -04:00 |
|
Isaac Connor
|
dcfd9a60bc
|
close the session earlier
|
2018-04-14 22:26:47 -04:00 |
|
Isaac Connor
|
ce5e484f2a
|
Work harder to ensure we return a Storage object
|
2018-04-14 21:50:27 -04:00 |
|
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
|
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
c466f50255
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-11 13:50:50 -07:00 |
|
Isaac Connor
|
47b871ed9f
|
implement MIN_STREAMING_PORT for Multi-server
|
2018-04-11 13:50:35 -07:00 |
|
Isaac Connor
|
989ed65f52
|
spacing and braces, remove a dead unused function
|
2018-04-11 10:50:28 -04:00 |
|
Isaac Connor
|
22f86da372
|
Have to use the .sock file instead of w.lock
|
2018-04-11 10:38:13 -04:00 |
|
Isaac Connor
|
bb924ee078
|
add report_event_audit
|
2018-04-10 13:06:01 -07:00 |
|
Isaac Connor
|
03ff2fcde4
|
add caching and find_one to Storage and Groups
|
2018-04-10 13:05:37 -07:00 |
|
Isaac Connor
|
ae3ccf6ffe
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-06 12:32:07 -07:00 |
|
Isaac Connor
|
fdd8be5daf
|
brackets and spaces
|
2018-04-06 14:52:56 -04:00 |
|
Isaac Connor
|
74fb8db5e2
|
make configvals global
|
2018-04-06 14:52:39 -04:00 |
|
Isaac Connor
|
530ac15344
|
remove csrf_startup
|
2018-04-06 14:46:33 -04:00 |
|
Isaac Connor
|
7076ff1b1b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-06 14:42:30 -04:00 |
|
Isaac Connor
|
7f850890cb
|
whitespace
|
2018-04-06 14:42:20 -04:00 |
|
Isaac Connor
|
513708b11c
|
don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved
|
2018-04-06 14:42:10 -04:00 |
|
Isaac Connor
|
a789fc88aa
|
implement getAuthHash
|
2018-04-06 14:41:39 -04:00 |
|
Isaac Connor
|
2c02a479d6
|
remove duplicated config code from bootstrap and just include config.php
|
2018-04-06 14:38:32 -04:00 |
|
Isaac Connor
|
53ce8c008a
|
move auth functions into it's own file
|
2018-04-06 14:36:23 -04:00 |
|
Isaac Connor
|
7b23ef80a4
|
blah
|
2018-04-06 14:31:11 -04:00 |
|
Isaac Connor
|
2c85e5e4c6
|
remove unneccessary type tags.
|
2018-04-06 11:43:19 -04:00 |
Mike Brown
|
c4a00e0657
|
changing the querySep in Event.php to allow gapless playback
|
2018-04-05 20:42:15 -05:00 |
|
Isaac Connor
|
7a12589a83
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-05 13:41:47 -07:00 |
|
Isaac Connor
|
f1a8d5f1ff
|
start of work on .41. Adding foreign keysy
|
2018-04-05 13:41:24 -07:00 |
|
Isaac Connor
|
9ecbba0947
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-05 14:22:23 -04:00 |
Isaac Connor
|
632ab143fe
|
error when can't set session in cake
|
2018-04-05 14:21:56 -04:00 |
|
Isaac Connor
|
140f11fd58
|
fix clearing groups
|
2018-04-05 13:10:25 -04:00 |
|
Isaac Connor
|
2a000cb5f8
|
fix clearing groups
|
2018-04-05 13:09:14 -04:00 |
|
Isaac Connor
|
4adebfce1d
|
Add Monitor Status breakdown to console
|
2018-04-05 09:53:53 -07:00 |
|
Isaac Connor
|
87f5204c46
|
rename process_configfile to remove namesspace colision
|
2018-04-05 11:44:21 -04:00 |
|
Isaac Connor
|
fb392b2765
|
put back process_configfile
|
2018-04-05 11:33:24 -04:00 |
|
Isaac Connor
|
6faf9b5c35
|
fix including auth on remote restart
|
2018-04-05 11:24:47 -04:00 |
|
Isaac Connor
|
8fee795fb4
|
don't duplicate declaration of process_configfile, because we include our version from ZM
|
2018-04-05 11:24:17 -04:00 |
|
Isaac Connor
|
70c7eaef0e
|
fix using wrong array. Should use StorageById
|
2018-04-04 20:29:01 -04:00 |
|
Isaac Connor
|
2f6adff1b2
|
handle when storage area is gone
|
2018-04-04 20:27:21 -04:00 |
|
Isaac Connor
|
1033755dc8
|
add missing {
|
2018-04-04 16:46:38 -04:00 |
|
Isaac Connor
|
6ebedff2e1
|
If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead of HTTP_HOST because HTTP_HOST may contain a custom port
|
2018-04-04 16:45:25 -04:00 |
|
Isaac Connor
|
489f11bd07
|
empty contents of zone.css because it is no different from base.
|
2018-04-03 21:18:29 -04:00 |
|
Isaac Connor
|
053322c2c3
|
add NextFrameId to Frames
|
2018-04-03 12:32:14 -07:00 |
|
Isaac Connor
|
66920eb5b8
|
fix status colour when not capturing
|
2018-04-03 12:31:54 -07:00 |
|
Isaac Connor
|
7a5d4d3b19
|
adjust frame_id for bulk frames
|
2018-04-03 12:31:39 -07:00 |
|
Isaac Connor
|
6a8084652e
|
add min width to Status Filter
|
2018-04-03 12:31:12 -07:00 |
|
Isaac Connor
|
85bb26668e
|
translate Statuses beter
|
2018-04-03 12:30:57 -07:00 |
|
Isaac Connor
|
49aeb4b467
|
whitespace
|
2018-04-03 10:38:38 -07:00 |
|
Isaac Connor
|
1f29fc601e
|
add Function Filter min width
|
2018-04-03 10:38:22 -07:00 |
|
Isaac Connor
|
09e05b1313
|
Clean up date stuff, use moment for formatting in secs2dbstr etc
|
2018-04-03 10:38:03 -07:00 |
|
Isaac Connor
|
7346a8c733
|
add select button
|
2018-04-03 10:36:58 -07:00 |
|
Isaac Connor
|
e91729692e
|
add Function filter
|
2018-04-03 10:36:44 -07:00 |
|
Isaac Connor
|
48ff480907
|
whitespace
|
2018-04-03 10:36:14 -07:00 |
|
Isaac Connor
|
b26707b647
|
fix resetting DiskSpace
|
2018-04-03 09:57:14 -07:00 |
|
Isaac Connor
|
614170c181
|
Add EndTime to event list
|
2018-04-03 06:57:22 -07:00 |
|
Isaac Connor
|
793f630ee0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-02 10:43:07 -07:00 |
|
Isaac Connor
|
df3a5b7d58
|
must reopen the session before destorying it
|
2018-03-29 19:19:08 -04:00 |
|
Isaac Connor
|
3fe5bb6fe2
|
open and close the session around user login
|
2018-03-29 11:30:20 -04:00 |
|
Isaac Connor
|
f8457e04e2
|
clean out commented out code
|
2018-03-29 11:30:09 -04:00 |
|
Isaac Connor
|
d1dd16b81c
|
fix event_id to EventId
|
2018-03-28 13:07:53 -07:00 |
|
Isaac Connor
|
842a42bcd5
|
test for existence of mp4 before trying to grab images from it
|
2018-03-28 13:01:58 -07:00 |
|
Isaac Connor
|
a2452db3de
|
Add Url to storage for S3 support
|
2018-03-28 08:23:36 -07:00 |
|
Isaac Connor
|
4d68f9a757
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-27 13:24:57 -07:00 |
|
Isaac Connor
|
62a0890383
|
Merge pull request #89 from pliablepixels/ui-tweaks
Ui tweaks for storage areas
|
2018-03-27 11:00:25 -04:00 |
Pliable Pixels
|
d3350919de
|
Reintroduced empty check rule, closed paranthesis
|
2018-03-27 10:55:36 -04:00 |
|
Pliable Pixels
|
caffe5f7c9
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:55:15 -04:00 |
|
Pliable Pixels
|
1b5d802890
|
dot should be red when either fclass or source_class is red
|
2018-03-27 08:43:58 -04:00 |
|
Pliable Pixels
|
5b7011c61b
|
commented out incomplete definition - please complete it if you need it
|
2018-03-27 03:58:28 -04:00 |
|
Pliable Pixels
|
b077cc8900
|
table header - keep consistent
|
2018-03-26 11:50:14 -04:00 |
|
Pliable Pixels
|
dfcee7c6c1
|
table header - keep consistent
|
2018-03-26 11:14:46 -04:00 |
|
Pliable Pixels
|
411e1d05f2
|
used chosen for log filters
|
2018-03-26 11:09:35 -04:00 |
|
Pliable Pixels
|
f790306990
|
added account icon
|
2018-03-25 16:18:50 -04:00 |
|
Pliable Pixels
|
980684a2f0
|
adjusted h1 size
|
2018-03-25 16:09:31 -04:00 |
|
Pliable Pixels
|
cc2f285408
|
log view tweaks, cleaned up header issues
|
2018-03-25 16:01:04 -04:00 |
|
Pliable Pixels
|
1179b6ddc4
|
rounded top for tables and highlights
|
2018-03-25 11:43:34 -04:00 |
|
Pliable Pixels
|
bf57b65ebb
|
reduced 2nd row of navbar text
|
2018-03-25 09:56:41 -04:00 |
|
Pliable Pixels
|
809e58fae6
|
acct icon to material
|
2018-03-25 09:44:30 -04:00 |
|
Pliable Pixels
|
14f638e009
|
replaced ionic fonts with material design icons
|
2018-03-25 09:28:00 -04:00 |
|
Pliable Pixels
|
acdc076b84
|
padding to navbutton
|
2018-03-24 18:36:10 -04:00 |
|
Pliable Pixels
|
10aedb51a6
|
reduced size of totals 2nd row
|
2018-03-24 18:30:50 -04:00 |
|
Pliable Pixels
|
a68cc79437
|
using MIT licensed ion-icons, its smaller than FA, replaced some text with icons
|
2018-03-24 18:25:39 -04:00 |
|
Pliable Pixels
|
0b31cc4d3d
|
2nd level header tweak
|
2018-03-24 17:34:46 -04:00 |
|
Pliable Pixels
|
b8f6c2277f
|
clone icons
|
2018-03-24 10:21:59 -04:00 |
|
Pliable Pixels
|
140217bef6
|
icons, muted colors, text tightening
|
2018-03-24 09:59:39 -04:00 |
|
Pliable Pixels
|
a9d6bd22bc
|
shortened monitor add
|
2018-03-24 09:59:08 -04:00 |
|
Isaac Connor
|
0bb1c5ce71
|
load groups when duping a monitor
|
2018-03-23 13:35:45 -07:00 |
|
Isaac Connor
|
85c757d2b1
|
Include group in parents list display
|
2018-03-23 13:35:02 -07:00 |
|
Isaac Connor
|
914de097db
|
Fix typo
|
2018-03-23 13:34:46 -07:00 |
|
Isaac Connor
|
4b72d4771e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-23 13:11:14 -07:00 |
|
Isaac Connor
|
c83e259160
|
revert to v3.1.0 of CRud
|
2018-03-22 12:01:38 -04:00 |
|
Isaac Connor
|
7d4652e37b
|
make group and function popups bigger
|
2018-03-21 11:33:10 -07:00 |
|
Isaac Connor
|
61d438511f
|
Fixes to delete
|
2018-03-21 11:32:54 -07:00 |
|
Isaac Connor
|
a037974e26
|
Fix automatic server selection
|
2018-03-21 11:25:42 -07:00 |
|
Isaac Connor
|
a4fee5c91c
|
further merges from cakephp 2.10.8
|
2018-03-21 13:09:55 -04:00 |
|
Isaac Connor
|
1346558d59
|
Merge branch 'cake-2.10.8' of https://github.com/knnniggett/ZoneMinder into cake-2.10.8
|
2018-03-21 11:15:11 -04:00 |
|
Isaac Connor
|
f682e1da9e
|
Merge branch 'zmtelemetry_improvements' into storageareas
|
2018-03-21 10:40:32 -04:00 |
|
Isaac Connor
|
f64ef370c9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-20 12:18:42 -07:00 |
|
Isaac Connor
|
a9f4b7899a
|
move session closing higher up before actions.php.
|
2018-03-20 12:18:29 -07:00 |
|
Isaac Connor
|
eade5316b9
|
Move Monitor delete logic to the object. Don't fixSequences when deleting monitors
|
2018-03-20 12:18:07 -07:00 |
sgunji
|
b6c0e1b834
|
update japanese php
added header
|
2018-03-19 21:37:17 +09:00 |
|
Andy Bauer
|
0afe1e0971
|
recreate bootstrap.php.in
|
2018-03-17 21:16:17 -05:00 |
|
Andy Bauer
|
f9b7f931c9
|
upgrade lib folder to cakephp 2.10.8
|
2018-03-17 20:24:15 -05:00 |
|
Isaac Connor
|
27736fb5d9
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-15 11:04:41 -04:00 |
mcdamo
|
aa0a831223
|
Update Host.php (#2062)
Remove whitespace causing problems with session authentication
|
2018-03-13 22:28:38 -04:00 |
|
Andrew Bauer
|
16a2c173cb
|
fix Column 'Method' cannot be null
|
2018-03-10 20:29:25 -06:00 |
|
Andrew Bauer
|
0df59c26b8
|
fix typo
Fix unable to enable camera
|
2018-03-10 19:48:53 -06:00 |
|
Isaac Connor
|
d1837a96b4
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-03-09 07:25:28 -05:00 |
|
Isaac Connor
|
b4c13d56d6
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-06 12:29:59 -05:00 |
tim
|
0654c7e3b2
|
Adding group handling in API
|
2018-03-04 23:01:52 -08:00 |
Steve Gilvarry
|
1c740de5dc
|
Add Return False to Event Back
|
2018-03-04 13:37:30 +11:00 |
|
Steve Gilvarry
|
db8ab28845
|
Add return false to window.history.back
Adding this makes it work in Safari
|
2018-03-04 08:37:21 +11:00 |
|
Andrew Bauer
|
ed4dac761a
|
Merge pull request #2049 from ZoneMinder/fix_2044
Fix 2044
|
2018-03-03 12:49:57 -06:00 |
|
Isaac Connor
|
3fc7ebee6c
|
Merge ../ZoneMinder.master into storageareas
|
2018-03-03 09:32:23 -08:00 |
|
Isaac Connor
|
2864876d28
|
fix spacing, add code comment
|
2018-03-03 09:25:04 -08:00 |
|
Isaac Connor
|
c53b6ffbb0
|
rework montagereview to load data faster and leave event and frame data in json objects
|
2018-03-02 18:26:50 -08:00 |
|
Andrew Bauer
|
3e77a85549
|
url to css/spinner.css should be relative
fixes http 404 not found errors for this css file
|
2018-03-02 17:19:10 -06:00 |
|
Isaac Connor
|
7e628bc3fd
|
add showing groups under Monitor Name on console
|
2018-03-01 19:23:46 -08:00 |
|
Isaac Connor
|
9a157bf4ca
|
add Type, MaxFPS, AlarmMaxFPS to field defaults
|
2018-03-01 19:23:27 -08:00 |
|
Isaac Connor
|
debe4607bc
|
add Parent and Parents functions
|
2018-03-01 19:23:03 -08:00 |
|
Isaac Connor
|
c5eec7e2fd
|
hide save button on successful form completion so we don't get a duplicate submit
|
2018-02-27 15:10:45 -08:00 |
|
Isaac Connor
|
83fad681b3
|
use button tags and hide the button content after click
|
2018-02-27 11:49:13 -08:00 |
|
Isaac Connor
|
c50627fd88
|
GroupIds needs to be an array
|
2018-02-27 11:21:04 -08:00 |
|
Isaac Connor
|
0312dc3c2d
|
Add Group saving to Monitor saving
|
2018-02-27 11:20:52 -08:00 |
|
Isaac Connor
|
67cc7dcf7c
|
Add a GroupIds function to return the groups
|
2018-02-27 11:20:41 -08:00 |
|
Isaac Connor
|
6a6eb87686
|
fix defaults
|
2018-02-26 18:00:02 -08:00 |
|
Isaac Connor
|
793e87c26d
|
Apply chosen style to group and linked monitors dropdown
|
2018-02-26 17:58:20 -08:00 |
|
Isaac Connor
|
735e36c2a8
|
split htmlSelect into htmlOptions
|
2018-02-26 17:08:30 -08:00 |
|
Isaac Connor
|
944298428a
|
break out get_groups_dropdown to call a function called get_dropdown_options to populate thje options
|
2018-02-26 16:10:10 -08:00 |
|
Isaac Connor
|
92c34f6043
|
add Groups to monitor edit
|
2018-02-26 16:09:36 -08:00 |
|
Isaac Connor
|
9d1a8b1e18
|
Add the danger css tag to cpuload > 5, freeram < 10% and freeswap < 10%
|
2018-02-26 10:39:45 -08:00 |
|
Isaac Connor
|
bfbefc4c32
|
Use our new Control object to do the saving instead of a generic function
|
2018-02-26 07:31:48 -08:00 |
|
Isaac Connor
|
c6f632325e
|
create an object for Controls entries, with appropriate defaults
|
2018-02-26 07:31:22 -08:00 |
|
Isaac Connor
|
464b588f08
|
add a case for toggle, which are booleans and default them to false
|
2018-02-26 07:29:49 -08:00 |
|
Isaac Connor
|
9480adcc31
|
include authentication info when building the link to mp4
|
2018-02-22 13:05:53 -05:00 |
|
Isaac Connor
|
c5081d1e4e
|
drop session before executing filter
|
2018-02-21 13:54:06 -05:00 |
Isaac Connor
|
7d88e25ef9
|
simplify thumbnail/snapshot usage a bit
|
2018-02-19 17:25:49 -05:00 |
|
Isaac Connor
|
505e726636
|
turn off debug
|
2018-02-14 13:51:49 -05:00 |
|
Isaac Connor
|
eeb7190812
|
fix rand replacing in image url
|
2018-02-14 13:16:30 -05:00 |
|
Isaac Connor
|
4c1abf93ba
|
fixup navbarreloader wrt auth_hash
|
2018-02-14 13:16:14 -05:00 |
|
Isaac Connor
|
002f22f685
|
generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response.
|
2018-02-14 13:15:22 -05:00 |
|
Isaac Connor
|
45bf4544ca
|
rename SetImageSource to getImageSource which is what it actually does
|
2018-02-14 11:58:47 -05:00 |
|
Isaac Connor
|
a09bf3b097
|
slightly improve auth debugging
|
2018-02-14 11:58:00 -05:00 |
|
Isaac Connor
|
2774fded57
|
add debugging and put NavBarHTML back in message
|
2018-02-14 11:57:45 -05:00 |
|
Isaac Connor
|
4df8cdc685
|
add auth_hash updating to the navbar reload.
|
2018-02-14 10:44:48 -05:00 |
|
Isaac Connor
|
c7a43a53f0
|
Sort the event records
|
2018-02-13 11:28:06 -05:00 |
|
Isaac Connor
|
535cdf6485
|
When there isn't an event for the given moment, play the previous one. If still no events found, popup live
|
2018-02-13 11:27:55 -05:00 |
|
Isaac Connor
|
9fa28106e5
|
return proper hostname when not using multiple servers
|
2018-02-12 14:44:58 -05:00 |
|
Isaac Connor
|
ad1b9699f1
|
Remove CssFileExtra
|
2018-02-11 14:18:40 -05:00 |
|
Isaac Connor
|
7abe7d6fe3
|
fix centering in buttons
|
2018-02-11 14:18:26 -05:00 |
|
Isaac Connor
|
a35ba812b7
|
fix merging conditions
|
2018-02-09 07:57:52 -08:00 |
|
Isaac Connor
|
08c359fdbc
|
add some margin to minTime and maxtime
|
2018-02-09 07:31:30 -08:00 |
|
Isaac Connor
|
63a214869e
|
rework montagereview to be more performant.
|
2018-02-09 07:31:19 -08:00 |
|
Isaac Connor
|
6518311022
|
Use Status and CaptureFPS and AnalysisFPS to do status coloration
|
2018-02-09 07:31:03 -08:00 |
|
Isaac Connor
|
4b51fed500
|
Rework order of filters. Put Monitors at the end. recalc selected_monitor_ids
|
2018-02-09 07:30:53 -08:00 |
|
Isaac Connor
|
6ee133bf6b
|
give some left margin on labels
|
2018-02-09 07:30:43 -08:00 |
|
Isaac Connor
|
c454d5355d
|
adjust column width on console
|
2018-02-09 07:30:32 -08:00 |
|
Isaac Connor
|
cb9eef8563
|
show No streams found if none were found
|
2018-02-09 07:30:12 -08:00 |
|
Isaac Connor
|
6b6fdc7cee
|
Log the sql before running it
|
2018-02-09 07:29:10 -08:00 |
|
Isaac Connor
|
6e240f669c
|
fix filtering
|
2018-02-08 14:25:58 -08:00 |
|
Isaac Connor
|
894467cdef
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-02-08 10:51:49 -08:00 |
|
Isaac Connor
|
b8b2edf847
|
close the datetime inputs
|
2018-02-08 10:50:33 -08:00 |
|
Isaac Connor
|
2a00cf852a
|
Set a type on the buttons so that they act right
|
2018-02-08 10:50:22 -08:00 |
|
Isaac Connor
|
1ed8af8aac
|
upgrade jquery-ui to 1.12.1
|
2018-02-08 13:19:16 -05:00 |
|
Isaac Connor
|
4777808cf0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-08 13:15:41 -05:00 |
|
Isaac Connor
|
95cfdb327d
|
further separate addBtn and cloneBtn, fixes
|
2018-02-08 13:15:27 -05:00 |
|
Isaac Connor
|
cdfc7f1808
|
give the buttons div an id and move the styling into the css
|
2018-02-08 09:30:48 -08:00 |
|
Isaac Connor
|
4240dc4bde
|
spacing, add a test for minTime being after maxTime
|
2018-02-08 09:30:26 -08:00 |
|
Isaac Connor
|
d857c2c98a
|
increase download popup height
|
2018-02-08 09:29:54 -08:00 |
|
Isaac Connor
|
c47c81b810
|
title is translated, so we can't use it to determine which page we are on, so use view
|
2018-02-08 09:29:42 -08:00 |
|
Isaac Connor
|
16604e3ee4
|
fix including jquery in export
|
2018-02-08 09:29:12 -08:00 |
|
Isaac Connor
|
f987bde6df
|
fix styles on montagereview. Mostly remove borders and make timelineDiv 100%
|
2018-02-08 09:28:52 -08:00 |
|
Isaac Connor
|
cfe53c0ffe
|
Explicitly set the danger class on each line because they can get out of sync when using the All toggle
|
2018-02-08 09:57:11 -05:00 |
|
Isaac Connor
|
babae4629a
|
Update and fix console buttons. Use a separate button for clone
|
2018-02-08 09:47:16 -05:00 |
|
Isaac Connor
|
f6bb3017ef
|
Use absolute patch to point-g.png. Makes the assumption that /zm always works.
|
2018-02-08 07:49:52 -05:00 |
|
Isaac Connor
|
a4c59e3e50
|
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
|
2018-02-07 09:07:57 -05:00 |
|
Isaac Connor
|
dec82ecf5c
|
Fix for when specifying page 1 and no pages
|
2018-02-07 09:07:51 -05:00 |
|
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
|
Isaac Connor
|
058b2be9a7
|
fix chosen sprites
|
2018-02-02 13:26:44 -05:00 |
|
Isaac Connor
|
93996402d9
|
turn off debug
|
2018-02-02 13:24:07 -05:00 |
|
Isaac Connor
|
515af57c56
|
Fix some styles on filter edit
|
2018-02-02 13:24:01 -05:00 |
|
Isaac Connor
|
dee843d7da
|
add All and remove default from Storage dropdown options
|
2018-02-02 12:48:49 -05:00 |
|
Isaac Connor
|
060e6893cc
|
fix Storage dropdown population and don't clear value on line type change
|
2018-02-02 12:48:22 -05:00 |
|
Isaac Connor
|
e8ace6d4dd
|
include base version of jquery-ui-theme
|
2018-02-02 12:47:51 -05:00 |
|
Isaac Connor
|
b0f755b5fc
|
put unarchive, archive, delete in a transaction for speed
|
2018-02-02 12:14:01 -05:00 |
|
Isaac Connor
|
68521aa0d4
|
spacing, remove debug lines
|
2018-02-02 10:27:50 -05:00 |
|
Isaac Connor
|
929e49c301
|
early return if there is no rows returned. Improve debug when there is a row but the specified column isn't present
|
2018-02-02 10:27:30 -05:00 |
|
Isaac Connor
|
26ac1fd695
|
Include soap version in list of onvif cameras
|
2018-02-01 11:32:13 -05:00 |
|
Isaac Connor
|
212882efb9
|
db errors should NOT BE FATAL!
|
2018-02-01 11:31:25 -05:00 |
|
Isaac Connor
|
a610d564d1
|
tweak timeouts
|
2018-01-31 15:51:12 -05:00 |
|
Isaac Connor
|
b390633f70
|
Fix authHash generation
|
2018-01-31 14:58:01 -05:00 |
|
Isaac Connor
|
132fff1931
|
An ok json return with no status is possible now
|
2018-01-31 14:35:48 -05:00 |
|
Isaac Connor
|
018523134e
|
use ZM_BASE_PROTOCOL when loading plugins. https can't load http content
|
2018-01-31 14:35:23 -05:00 |
|
Isaac Connor
|
7c3efc02cd
|
put back old add monitor popup
|
2018-01-31 11:56:57 -05:00 |
|
Isaac Connor
|
b1f2b677c3
|
remove path from source
|
2018-01-30 10:09:12 -05:00 |
|
Isaac Connor
|
7ec71868a6
|
Switch CakePHP-Enum-Behavior to my fixed version
|
2018-01-29 21:25:40 -05:00 |
|
Isaac Connor
|
b9a98d34bf
|
strip query and scheme from source
|
2018-01-29 19:03:16 -05:00 |
|
Isaac Connor
|
a60da6811b
|
revert adding custom port for status updates. It breaks in the non-multiserver case.
|
2018-01-29 15:17:22 -05:00 |
|
Isaac Connor
|
6acb555c52
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 10:42:23 -08:00 |
|
Isaac Connor
|
d19b8bc5cf
|
add default value for ServerId in new Storage Object
|
2018-01-29 10:41:59 -08:00 |
|
Isaac Connor
|
06673019f9
|
add default values for zmstats, zmaudit, zmtrigger in new Server
|
2018-01-29 10:41:43 -08:00 |
|
Isaac Connor
|
31b7deb101
|
Return NULL on error in dbQuery
|
2018-01-29 10:41:24 -08:00 |
|
Isaac Connor
|
c9e32fb344
|
Check for successful Monitor db Insertion
|
2018-01-29 10:41:09 -08:00 |
|
Isaac Connor
|
e638817cb9
|
Check for ServerId exists in MonitorObject
|
2018-01-29 10:40:50 -08:00 |
|
Isaac Connor
|
8979f14314
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-29 11:29:33 -05:00 |
|
Isaac Connor
|
a76fcb331c
|
Remove debugging. Treat can't get semaphore as a non-error
|
2018-01-29 08:25:46 -08:00 |
|
Isaac Connor
|
73d84c6b08
|
fix typo
|
2018-01-29 07:53:48 -08:00 |
|
Isaac Connor
|
4751920423
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:49:38 -08:00 |
|
Isaac Connor
|
35cda5cf17
|
Merge sjc04p1fviap02:ZoneMinder into storageareas
|
2018-01-29 07:45:55 -08:00 |
|
Isaac Connor
|
a490c0e5bf
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-29 07:45:37 -08:00 |
|
Isaac Connor
|
a782ef1db7
|
Add debug tests for loading all events
|
2018-01-29 07:45:28 -08:00 |
|
Isaac Connor
|
e672841a8d
|
Add remote server port to monitor url
|
2018-01-29 07:42:43 -08:00 |
|
Isaac Connor
|
bfbd033971
|
Fix getting stream status updates when # of files open is > 1024.
|
2018-01-29 07:41:29 -08:00 |
|
Isaac Connor
|
03122b9015
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:38:02 -08:00 |
|
Isaac Connor
|
fc4edefd81
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:35:24 -08:00 |
|
Isaac Connor
|
dc6842bfbd
|
Add remote server port to monitor url
|
2018-01-29 07:32:40 -08:00 |
|
Isaac Connor
|
b793e6659b
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:32:02 -08:00 |
|
Isaac Connor
|
984d3a2dd1
|
add Monitor Name to the response listing the available camera feeds
|
2018-01-29 07:30:46 -08:00 |
|
Isaac Connor
|
0b2d752ea4
|
Use chosen on the MonitorIds select.
|
2018-01-29 10:29:59 -05:00 |
|
Isaac Connor
|
8c4a786114
|
Move status fields out of the object fields
|
2018-01-29 10:27:46 -05:00 |
|
Isaac Connor
|
b1b8b42f2b
|
Fix getting stream status updates when # of files open is > 1024.
|
2018-01-29 07:21:31 -08:00 |
|
Isaac Connor
|
2dcb0d183f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-28 18:07:33 -08:00 |
|
Isaac Connor
|
f2b335c7b2
|
SORT auto server selection in ascending order
|
2018-01-28 18:07:01 -08:00 |
|
Isaac Connor
|
51d5fd38aa
|
scan the board for the names of the camera inputs
|
2018-01-28 18:06:13 -08:00 |
|
Isaac Connor
|
c59751713b
|
fix redirect
|
2018-01-28 17:31:00 -05:00 |
|
Isaac Connor
|
0d734a880c
|
add hack to ensure that next and previous operate on time
|
2018-01-28 17:30:49 -05:00 |
|
Isaac Connor
|
8a4b17fb50
|
turn into a url instead of boolean. Use it to refresh the options page on change so that changes are instantly noticable
|
2018-01-28 15:13:57 -05:00 |
|
Isaac Connor
|
5d4fde88d9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-27 12:17:13 -08:00 |
|
Isaac Connor
|
bc6d8623a6
|
add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets.
|
2018-01-27 15:03:22 -05:00 |
|
Isaac Connor
|
456f29fcba
|
Rename column Id OF Monitor_Statuses to simplify JOINS.
|
2018-01-26 13:39:37 -05:00 |
|
Isaac Connor
|
dc46f23af0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-26 10:17:54 -08:00 |
|
Isaac Connor
|
bb9d640c01
|
use instead of ['request'] to fix behaviour when request has been emptied due to failed auth
|
2018-01-26 12:56:38 -05:00 |
|
Isaac Connor
|
348fdafa4e
|
Update submofule
|
2018-01-26 11:34:45 -05:00 |
|
Isaac Connor
|
475c465b0d
|
define
|
2018-01-26 10:39:12 -05:00 |
|
Isaac Connor
|
d001ce467e
|
use get for status JSON requests
|
2018-01-26 10:31:55 -05:00 |
|
Isaac Connor
|
a0892b1ffc
|
Whitespace
|
2018-01-26 10:30:59 -05:00 |
|
Isaac Connor
|
1503c586d2
|
When there is an error saving, add the invalidFields() info to the error message. Only restart the daemon on success.
|
2018-01-26 10:30:29 -05:00 |
|
Isaac Connor
|
1e3cf9bbf8
|
handle no streams better
|
2018-01-25 09:14:21 -08:00 |
|
Isaac Connor
|
320f5c2083
|
Turn off error reporting in output
|
2018-01-25 09:13:44 -08:00 |
|
Isaac Connor
|
2ea2f46ec8
|
braes
|
2018-01-25 09:13:31 -08:00 |
|
Isaac Connor
|
703cd332df
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-25 08:43:53 -08:00 |
|
Isaac Connor
|
356015a492
|
Merge branch 'tesla' of https://stash.teslamotors.com/scm/~iconnor/zoneminder into tesla
|
2018-01-25 08:42:08 -08:00 |
|
Isaac Connor
|
42a27c2ca9
|
Fix Servers dropdown
|
2018-01-25 08:41:54 -08:00 |
|
Isaac Connor
|
7165f3cfd8
|
Add server auto-selection
|
2018-01-25 08:41:42 -08:00 |
|
Isaac Connor
|
57bae7cf17
|
Fix filtering
|
2018-01-25 09:14:09 -05:00 |
|
Isaac Connor
|
c35c9c4083
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-25 08:46:38 -05:00 |
|
Isaac Connor
|
0bd1ee5992
|
Merge branch 'master' into m
|
2018-01-25 08:43:31 -05:00 |
|
Isaac Connor
|
fb50f6f996
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-24 17:14:42 -08:00 |
Isaac
|
cc34a3c566
|
change button type
|
2018-01-24 23:08:12 +01:00 |
|
Isaac
|
e4c28150fe
|
cleanup, code style, quotes. Include jquery source instead of trying to link to it
|
2018-01-24 23:07:57 +01:00 |
|
Isaac
|
5865bbfb12
|
turn off debugging
|
2018-01-24 23:07:21 +01:00 |
|
Isaac
|
a331bfc494
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-24 22:50:15 +01:00 |
|
Isaac
|
e364a541d4
|
Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP
|
2018-01-24 22:21:43 +01:00 |
|
Isaac Connor
|
50fc4a2d94
|
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
|
2018-01-24 11:51:11 -05:00 |
|
Isaac Connor
|
a271f1776d
|
Fix #80 don't escape NULL value when building SQL
|
2018-01-24 10:35:22 -05:00 |
|
Isaac Connor
|
c7ecd580c1
|
Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters
|
2018-01-24 10:27:01 -05:00 |
|
Isaac Connor
|
9f89ccfa32
|
revert issue with AUTH_HASH_LOGINS
|
2018-01-24 07:46:56 -05:00 |
|
Isaac Connor
|
ea4937b75e
|
put back missing s
|
2018-01-23 17:47:24 -05:00 |
|
Isaac Connor
|
d9252e2d47
|
Merge branch 'storageareas' into tesla
|
2018-01-23 13:29:37 -08:00 |
|
Isaac Connor
|
fdf1ef795f
|
Add default value for newStorage['StorageId']
|
2018-01-23 13:28:46 -08:00 |
|
Isaac Connor
|
0742217599
|
Only populate monitorNames if query is valid
|
2018-01-23 13:28:29 -08:00 |
|
Isaac Connor
|
933259f9a5
|
fix bracket
|
2018-01-23 13:16:21 -08:00 |
|
Isaac Connor
|
447a0975c7
|
fix bracket
|
2018-01-23 13:15:48 -08:00 |
|
Isaac Connor
|
c85bb6e614
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-23 09:44:28 -08:00 |
|
Isaac
|
de08e3114e
|
more and less debug
|
2018-01-23 18:16:37 +01:00 |
|
Isaac
|
8bd1e4cec6
|
Only show groups filter if there are groups
|
2018-01-23 18:15:59 +01:00 |
|
Isaac
|
1b23f7b564
|
turn off debug
|
2018-01-23 17:34:49 +01:00 |
|
Isaac
|
b22f20cb93
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-23 15:40:07 +01:00 |
|
Isaac Connor
|
994766fd50
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-22 13:25:38 -08:00 |
|
Isaac Connor
|
8fe0e1bdc0
|
fix Debug => Logger::Debug
|
2018-01-22 15:58:01 -05:00 |
|
Isaac
|
13bfbe4f4b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-22 20:07:11 +01:00 |
|
Isaac Connor
|
8a27ea3a04
|
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
|
2018-01-22 11:42:52 -05:00 |
|
Isaac Connor
|
97595051ce
|
whitespace
|
2018-01-22 11:42:19 -05:00 |
|
Isaac Connor
|
924fa80ea6
|
When renaming a monitor, take change of storage area into account when creating dirs and symlinks
|
2018-01-22 11:42:07 -05:00 |
|
Isaac
|
c04fcfb239
|
Need a few more pixels of width to fit all preset buttons
|
2018-01-22 15:50:18 +01:00 |
|
Isaac
|
06c9266c62
|
use snapshot.jpg more
|
2018-01-22 03:27:01 +01:00 |
|
Isaac Connor
|
181a94de82
|
test for existence of port in url_parts
|
2018-01-21 11:10:34 -05:00 |
|
Isaac Connor
|
bd2da456f4
|
handle non-multi-server case when restarting monitors via API
|
2018-01-19 21:09:33 -05:00 |
|
Isaac Connor
|
9b7fee03c7
|
Add Server auto-selection
|
2018-01-19 11:00:46 -08:00 |
|
Isaac Connor
|
e26747b5cc
|
show port when it's not the standard port
|
2018-01-19 12:15:26 -05:00 |
|
Isaac Connor
|
773ed11742
|
use Object methods to restart zmc and zma. restart them on save of existing Monitor
|
2018-01-19 08:17:53 -08:00 |
|
Isaac Connor
|
d1dbf4cc31
|
Turn off debug
|
2018-01-19 08:17:33 -08:00 |
|
Isaac Connor
|
3abd873c34
|
Turn off debug
|
2018-01-19 08:17:17 -08:00 |
|
Isaac Connor
|
0f3cf33565
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-19 08:16:52 -08:00 |
|
Isaac Connor
|
2720b254ff
|
Add Triggers to Monitors field to quiet error
|
2018-01-19 08:16:41 -08:00 |
|
Isaac Connor
|
d586faf7fb
|
Fix restarting Monitor
|
2018-01-19 08:16:28 -08:00 |
|
Isaac Connor
|
95f054c1e6
|
Show entire path for ffmpeg monitors. Strip out username/password though
|
2018-01-18 12:40:41 -08:00 |
|
Isaac Connor
|
484a361af8
|
use Object methods to restart zmc and zma. restart them on save of existing Monitor
|
2018-01-18 12:40:10 -08:00 |
|
Isaac Connor
|
30b0d2c5b1
|
Turn off debug
|
2018-01-18 12:39:50 -08:00 |