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 |