Isaac Connor
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
Roman Dissertori
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Pliable Pixels
0ff9002adf
2156 api login ( #2157 )
...
* error can be due to bad user or password
* added login/logout and related private functions
* handle case when userLogin fails, current code returns PHP error for and API throw is not called
* formatting
* converted login params to POST, removed user=&pass= for other APIs
* formatting
* add auth check back but leave out login/out
* fixes to make it work across zmN, postman and curl
* added back enabled check
2018-07-15 21:17:35 -04:00
Isaac Connor
4aa289cd66
fix reCaptcha failure still allowing login
2018-07-12 11:44:20 -04:00
Isaac Connor
0acad44b4a
test for existence of Storage path before trying things like disk_total_space which will fill the html output with php errors.
2018-07-11 17:21:44 -04:00
Isaac Connor
05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -04:00
Isaac Connor
b8691e4654
Don't need global cookies. Only open session if needed in userLogin
2018-07-11 11:45:19 -04:00
Isaac Connor
c6ded845d0
Return the user db row ifrom userLogin instead of assuming it will be accessed as a global. Add is_session_started function and use it to detect when we need to start/stop the session in generateAuthHash
2018-07-11 10:34:45 -04:00
Isaac Connor
3ecf0055b5
spacing
2018-07-09 13:07:16 -04:00
Isaac Connor
7ef43a0684
Merge ../ZoneMinder.master into server_path_prefix
2018-07-09 12:10:48 -04:00
Isaac Connor
62f45b430e
Add PathPrefix and use it in Url. Make Url() smarter so it can do more of the heavy lifting.
2018-07-09 12:09:57 -04:00
Isaac Connor
661876b998
Use Server->Url() more,, moving the logic into Server->Url()
2018-07-09 12:09:29 -04:00
Isaac Connor
90e4c2632d
Use Server->Url() more,, moving the logic into Server->Url()
2018-07-09 12:08:50 -04:00
Isaac Connor
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00
Isaac Connor
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
Andrew Bauer
741267bd6c
Merge pull request #2135 from connortechnology/fix_auth_hash_with_zmu
...
Rework generateAuthHash to take a force parameter so that it can be u…
2018-06-25 13:01:20 -05:00
Isaac Connor
99a97543f1
Rework generateAuthHash to take a force parameter so that it can be used to generate auth hashes for zmu
2018-06-25 13:43:08 -04:00
Andrew Bauer
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
Isaac Connor
67155e98eb
add debug message when no changes are being made to a monitor
2018-06-11 16:34:40 -04:00
Isaac Connor
73555edfdc
Add Error message when a monitor has no server assigned in a multi-server setup
2018-06-11 16:34:23 -04:00
Isaac Connor
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -04:00
Andrew Bauer
c30992be3f
fixes #2105
...
A more simplified approach to fixing #2105 , compared to previous attempts.
2018-06-06 08:18:33 -05:00
Isaac Connor
af3ce3660f
Only unlink if file exists, removing warning. Always return a Storage object in Monitor->Storage() fixes Monitor Delete.
2018-05-24 09:54:45 -04:00
Isaac Connor
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
Isaac
af63619ce6
Fix Messages=>Messaged
2018-05-15 21:56:17 +02:00
Isaac Connor
49d75ce039
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
2018-05-15 10:45:47 -07:00
Isaac Connor
63e6cb1d62
remove parenthesis that confuse older php
2018-05-14 13:56:55 -04:00
Isaac Connor
47ba435471
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-12 19:44:40 -04:00
Isaac Connor
b20cb5d0ae
Add all the other Event columns to fields
2018-05-11 10:36:14 -04:00
Isaac Connor
8b8bcbd1e2
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-10 17:47:12 -04:00
Isaac Connor
62edca6dcb
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
2018-05-08 13:33:56 -07:00
Isaac Connor
da7c953e3d
adda blank line
2018-05-07 14:08:32 -07:00
Isaac Connor
9127eb63dc
Implement file_exists function to determine either locally or through remote api calls whether the file for an event exists.
2018-05-07 14:07:30 -07:00
Isaac Connor
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
Isaac Connor
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
Isaac Connor
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
Isaac Connor
f76827a450
redo thumbnail code. Always link to server they event is located on
2018-05-03 09:36:50 -07:00
Isaac Connor
bbe0025641
correct sort order default
2018-05-01 09:43:09 -04:00
Isaac Connor
3bb1a5b544
Whitespace
2018-04-30 13:02:53 -04:00
Isaac Connor
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
Isaac Connor
348468a98d
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-26 22:09:48 -04:00
Isaac Connor
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
Andrew Bauer
86b2f6a12e
New Monitor Type - Website ( #2065 )
...
* implement website monitor
* don't check certain fields when using website monitor
* continue to fix javascript errors for website monitors
* check $monitor, not $new_monitor here
* add website monitor documentation
was somehow left out of the initial commit
* fix corruption of functions.php
* add missing comma
* remove errors by testing for existence of key. If it's a new monitor, then none of the keys will be valid
* If the monitor type is WebSite, then default Status to Running.
* put back start function that got lost in merge. Don't start StreamCmd's if it's a WebSite
* Add midding comma
* Hide unrelated tabs when type is WebSite. Put back input fields for Type=WebSite
* Don't show control or any of the status fields for WebSite type monitors
* add some parenthesis to ensure order of operations, seems to fix fps and status fields not being shown for regular monitors
2018-04-26 17:18:36 -04:00
Isaac Connor
00e82fb751
Implement MonitoServerId,StorageServerId,FilterServerID in Filters
2018-04-25 13:05:19 -07:00
Isaac Connor
dd6683f0be
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 10:31:47 -07:00
Isaac Connor
117555a857
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-25 09:39:10 -04:00
Isaac Connor
161fc94496
remove useless ()
2018-04-25 09:33:12 -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
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -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
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
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
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
bbee7fd0f2
fix array_key_exists
2018-04-18 14:17:41 -07: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
88a2c0d953
spacing
2018-04-18 12:30:32 -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
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
ef70ff86e9
cleanup zmaControl
2018-04-17 11:36:14 -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
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
47b871ed9f
implement MIN_STREAMING_PORT for Multi-server
2018-04-11 13:50:35 -07:00
Isaac Connor
03ff2fcde4
add caching and find_one to Storage and Groups
2018-04-10 13:05:37 -07: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
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
Mike Brown
c4a00e0657
changing the querySep in Event.php to allow gapless playback
2018-04-05 20:42:15 -05: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
6faf9b5c35
fix including auth on remote restart
2018-04-05 11:24:47 -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
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
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
914de097db
Fix typo
2018-03-23 13:34:46 -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
f64ef370c9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-20 12:18:42 -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
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -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
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
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
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
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
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
a09bf3b097
slightly improve auth debugging
2018-02-14 11:58:00 -05:00
Isaac Connor
9fa28106e5
return proper hostname when not using multiple servers
2018-02-12 14:44:58 -05:00
Isaac Connor
6b6fdc7cee
Log the sql before running it
2018-02-09 07:29:10 -08:00
Isaac Connor
93996402d9
turn off debug
2018-02-02 13:24:07 -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
212882efb9
db errors should NOT BE FATAL!
2018-02-01 11:31:25 -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
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
73d84c6b08
fix typo
2018-01-29 07:53:48 -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
8c4a786114
Move status fields out of the object fields
2018-01-29 10:27:46 -05: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
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
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
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
fb50f6f996
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-24 17:14:42 -08:00
Isaac Connor
a271f1776d
Fix #80 don't escape NULL value when building SQL
2018-01-24 10:35:22 -05:00
Isaac Connor
9f89ccfa32
revert issue with AUTH_HASH_LOGINS
2018-01-24 07:46:56 -05:00
Isaac Connor
994766fd50
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-22 13:25:38 -08: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
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
Isaac Connor
9b7fee03c7
Add Server auto-selection
2018-01-19 11:00:46 -08: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
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
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
a8dde207e1
Warning should be a debug
2018-01-16 12:33:50 -05:00
Isaac Connor
9f42871c86
Fix Zone Triggers, bump version
2018-01-16 11:49:17 -05: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
4b37c6fc42
Change the Group dropdown to a single indented dropdown, and use chosen on it
2018-01-12 11:25:15 -08:00
Isaac
3c55557c77
Handle to val in a filter term
2018-01-11 22:53:53 +01: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
5792021ee3
Merge branch 'storageareas' into fugro
2018-01-10 15:08:28 -05: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
0d7fff761c
upgrade find_all to take parameters
2017-12-22 11:38:42 -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
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
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
Isaac Connor
5f4b2ca53f
don't close the session when logging in
2017-12-18 14:35:11 -05:00
Isaac Connor
dcfae11fc7
fix typos
2017-12-18 13:16:54 -05:00
Isaac Connor
c93de992c2
add Scheme to the list of fields
2017-12-18 13:04:57 -05:00
Isaac Connor
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
digital-gnome
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
Isaac Connor
7d7e73977f
use stored session group
2017-12-13 16:51:56 -05:00
Isaac Connor
abad266c5b
introduce chosen to use it to make the filtering dropdowns awesome
2017-12-13 16:15:03 -05:00
Isaac Connor
e364641d7b
on initial page hit, the cookie might not be set. Use global instead.
2017-12-13 11:21:50 -05:00
Isaac Connor
2643ac9f97
fix a quoting problem that prevented saving config
2017-12-12 11:16:08 -05:00
Isaac Connor
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
Isaac Connor
d741cc1a72
fix saving Groups
2017-12-04 22:02:56 -05:00
digital-gnome
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
digital-gnome
fb952179cd
Fix delete filter ( #2010 )
...
Delete filter didn't work because the request does not include 'object'.
2017-12-04 21:26:21 -05:00
Isaac Connor
0171d532fc
fix the test for DB_DEBUG
2017-12-04 16:50:56 -05:00
Isaac Connor
6270408c8f
rework group MonitorIds and add GroupId filters to api
2017-12-04 15:52:16 -05:00
Isaac Connor
1ccd344bf5
implement Storage Area move
2017-12-04 11:05:50 -05:00
Isaac Connor
cb70a3627f
Fixes to montagereview and only load event data when in History mode
2017-11-28 14:50:21 -05:00
Isaac Connor
dd3f9492ba
fix dulicate logic
2017-11-26 15:12:35 -05:00