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 |
|
Isaac Connor
|
c08cbdb9dd
|
Turn off debug
|
2018-01-18 12:39:39 -08:00 |
|
Isaac Connor
|
f9d8c349e1
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-18 12:39:08 -08:00 |
|
Isaac Connor
|
04eef58883
|
Add Triggers to Monitors field to quiet error
|
2018-01-18 12:38:48 -08:00 |
|
Isaac Connor
|
cdfa565579
|
Fix restarting Monitor
|
2018-01-18 12:38:26 -08:00 |
|
Isaac Connor
|
ecd5e01b92
|
Show port when using Remote Method and Port is non-standard
|
2018-01-18 10:21:05 -08:00 |
|
Isaac Connor
|
55fa86c7be
|
Add a few more extensions to the list of files to include in export
|
2018-01-17 16:57:38 -05:00 |
|
Isaac Connor
|
ace66cf977
|
show port in source column
|
2018-01-17 13:33:22 -08:00 |
|
Isaac Connor
|
494d080740
|
show port in source column
|
2018-01-17 13:27:44 -08:00 |
|
Isaac Connor
|
4fecdbd0fa
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-17 12:28:33 -08:00 |
|
Isaac Connor
|
212bfd4a2c
|
add Monitor to info shown on event
|
2018-01-17 12:20:15 -08:00 |
|
Isaac Connor
|
93623f3fd8
|
fix filtering by monitor in montagereview
|
2018-01-17 11:59:54 -08:00 |
|
Isaac Connor
|
1fbb5bc0f8
|
Fix zmaudit.pl => zmaudit, etc.
|
2018-01-17 14:22:04 -05:00 |
|
Isaac Connor
|
fe7c54bc26
|
Fix Debug
|
2018-01-16 17:54:37 -05:00 |
|
Isaac Connor
|
7b452f6937
|
Fix Debug -> Logger::Debug
|
2018-01-16 11:15:59 -08:00 |
|
Isaac Connor
|
e78a40b45f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 11:02:20 -08:00 |
|
Isaac Connor
|
27ebf1a4aa
|
Comment out debug code
|
2018-01-16 14:02:04 -05:00 |
|
Isaac Connor
|
a8dde207e1
|
Warning should be a debug
|
2018-01-16 12:33:50 -05:00 |
|
Isaac Connor
|
9c184bcb42
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 08:50:13 -08:00 |
|
Isaac Connor
|
9f42871c86
|
Fix Zone Triggers, bump version
|
2018-01-16 11:49:17 -05:00 |
|
Isaac Connor
|
b09bb528a5
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 08:42:41 -08:00 |
|
Isaac Connor
|
004fdbad9b
|
We don't need to update ZoneCount manually anymore
|
2018-01-16 09:31:23 -05:00 |
|
Isaac Connor
|
9284e26512
|
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
|
2018-01-13 15:15:14 -05:00 |
|
Isaac Connor
|
bfa31297be
|
Merge branch 'storageareas' into tesla
|
2018-01-12 11:26:19 -08:00 |
|
Isaac Connor
|
4b37c6fc42
|
Change the Group dropdown to a single indented dropdown, and use chosen on it
|
2018-01-12 11:25:15 -08:00 |
|
Isaac Connor
|
c139f7a1bf
|
we don't need the group setting in the url
|
2018-01-12 11:24:52 -08:00 |
|
Isaac Connor
|
5f8756d7ad
|
Set Tesla defaults for new monitors
|
2018-01-12 08:11:37 -08:00 |
|
Isaac Connor
|
ff9f43b5a1
|
put back code to switch to add_monitors
|
2018-01-12 08:11:25 -08:00 |
|
Isaac Connor
|
95c3c26eda
|
cleanup old Add Monitr button
|
2018-01-12 08:11:07 -08:00 |
|
Isaac Connor
|
e2ac13d03e
|
pretty up the add_monitors interface a bit, add some instructions
|
2018-01-12 08:10:46 -08:00 |
|
Isaac
|
3c55557c77
|
Handle to val in a filter term
|
2018-01-11 22:53:53 +01:00 |
|
Isaac Connor
|
666005fb5d
|
fix single event replay by fixing the reference to player which should be vid
|
2018-01-11 14:42:00 -05:00 |
|
Isaac Connor
|
b013da6b95
|
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
|
2018-01-11 13:14:11 -05:00 |
|
Isaac Connor
|
6a36db0b6d
|
move flat skin to base.
|
2018-01-11 12:24:53 -05:00 |
|
Isaac Connor
|
3ba6760f1b
|
increase logout popup size
|
2018-01-11 10:58:06 -05:00 |
|
Isaac Connor
|
3b81cb9eed
|
Replace ZoneMinder with ZM_WEB_TITLE
|
2018-01-11 10:57:43 -05:00 |
|
Isaac Connor
|
b1e8963da9
|
add header to the login page
|
2018-01-11 10:57:29 -05:00 |
|
Isaac Connor
|
399907a9f0
|
Always load a base css style. Only show navbar contents when logged in, so we can use it on the login page
|
2018-01-11 10:57:07 -05:00 |
|
Isaac Connor
|
5792021ee3
|
Merge branch 'storageareas' into fugro
|
2018-01-10 15:08:28 -05:00 |
|
Isaac Connor
|
64f9118e46
|
remove debug line
|
2018-01-10 13:47:03 -05:00 |
|
Isaac Connor
|
4442c571fb
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-10 13:15:20 -05:00 |
|
Isaac Connor
|
156bdbd089
|
Add zmstats, zmaudit, zmtrigger flags to Server object listing/editing
|
2018-01-10 12:59:27 -05:00 |
|
Isaac Connor
|
4047d0ffc8
|
add No Server as an option is Server filter
|
2018-01-09 07:13:03 -08:00 |
Andrew Bauer
|
36ab7b01e8
|
Merge pull request #2018 from connortechnology/robots
add a robots.txt to the docroot to tell bots to not scrape our ZM install
|
2018-01-04 20:42:15 -06:00 |
|
Isaac Connor
|
10133073de
|
Check for SaveJPEGs being set to snapshot instead of hitting the fs to check for a snapshot file
|
2018-01-04 12:31:20 -05:00 |
|
Isaac Connor
|
a33cba9989
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-02 09:17:16 -08:00 |
|
Isaac Connor
|
1b1b93f811
|
use CakePHP-Enum-Behavior to add support for ENUMs to the Monitor model. This should fix #48
|
2018-01-01 14:43:02 -05:00 |
|
Isaac Connor
|
109a24ed4d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-01-01 10:37:24 -08:00 |
|
Isaac Connor
|
1cd69c69b9
|
add defining ZM_SERVER_ID after loading config
|
2018-01-01 13:10:39 -05:00 |
|
Isaac Connor
|
b219f76588
|
add togglebuttons to select all checbox
|
2017-12-23 12:58:48 -08:00 |
|
Isaac Connor
|
cc3b65b5fd
|
add default value for ServerId in Storage
|
2017-12-23 12:07:13 -08:00 |
|
Isaac Connor
|
74269fea73
|
make montagereview load event images from the server that the storage is located on
|
2017-12-22 12:33:30 -08:00 |
|
Isaac Connor
|
2c361de9d3
|
add Server Storage Areas
|
2017-12-22 11:39:43 -08:00 |
|
Isaac Connor
|
c6bf502ee7
|
only show each Storage area if there are less than 4.
|
2017-12-22 11:39:27 -08:00 |
|
Isaac Connor
|
0d7fff761c
|
upgrade find_all to take parameters
|
2017-12-22 11:38:42 -08:00 |
|
Isaac Connor
|
bb8e326392
|
Fix not restarting a monitor if it has moved to a different server
|
2017-12-22 09:16:56 -08:00 |
|
Isaac Connor
|
cc8ed75eb9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-12-22 09:03:11 -08:00 |
|
Isaac Connor
|
f51259443c
|
fix disk_used_percentage to use db calculated used size
|
2017-12-22 09:02:49 -08:00 |
|
Isaac
|
9dfad4886d
|
fix saving Monitors
|
2017-12-22 16:13:00 +01:00 |
|
Isaac Connor
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -05:00 |
|
Isaac Connor
|
915ea93348
|
source remote server when streaming event
|
2017-12-21 16:53:46 -08:00 |
Isaac Connor
|
efc7b7d85a
|
Merge pull request #71 from digital-gnome/storageareas-datpickerfixes
Fix missing change to StartDateTime
|
2017-12-20 15:56:17 -05:00 |
digital-gnome
|
8bfdb73d24
|
Fix missing change to StartDateTime
Fixes filter loading from events if clicked from last hour link.
|
2017-12-20 15:46:03 -05:00 |
|
Isaac Connor
|
89d284b4ea
|
Merge pull request #70 from digital-gnome/storageareas-datpickerfixes
Allow nondate values
|
2017-12-20 15:25:52 -05:00 |
|
digital-gnome
|
b4c0f13adf
|
Allow nondate values
Supports -# days/hours/etc
|
2017-12-20 15:23:14 -05:00 |
|
Isaac Connor
|
e9141ca3e8
|
re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes
|
2017-12-20 10:19:24 -05:00 |
|
Isaac Connor
|
85b7baa131
|
Fix event Groups associations
|
2017-12-19 18:09:41 -05:00 |
|
Isaac Connor
|
e47c8fad88
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-12-19 11:01:42 -05:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
digital-gnome
|
d034ae9ab2
|
Default value for new brackets
|
2017-12-18 22:58:38 -05:00 |