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
|
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
|
26ac1fd695
|
Include soap version in list of onvif cameras
|
2018-02-01 11:32:13 -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
|
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
|
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
|
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
|
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
|
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
|
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
|
2dcb0d183f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-28 18:07:33 -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
|
5d4fde88d9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-27 12:17:13 -08: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
|
d001ce467e
|
use get for status JSON requests
|
2018-01-26 10:31:55 -05:00 |
|
Isaac Connor
|
1e3cf9bbf8
|
handle no streams better
|
2018-01-25 09:14:21 -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
|
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 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
|
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
|
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
|
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
|
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
|
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
|
e26747b5cc
|
show port when it's not the standard port
|
2018-01-19 12:15:26 -05: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
|
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
|
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
|
b09bb528a5
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 08:42:41 -08: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 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 |
|
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
|
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
|
148e21d707
|
fugro
|
2017-12-21 21:46:21 -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 |
|
digital-gnome
|
b4c0f13adf
|
Allow nondate values
Supports -# days/hours/etc
|
2017-12-20 15:23:14 -05:00 |
|
digital-gnome
|
d034ae9ab2
|
Default value for new brackets
|
2017-12-18 22:58:38 -05:00 |
Isaac Connor
|
46673bafdb
|
Merge pull request #68 from digital-gnome/montagereview-datepicker
Montagereview datepicker
|
2017-12-18 13:39:58 -05:00 |
|
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -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
|
a6b136ed40
|
dark theme fixes
Overrides bootstrap input colors for dark theme and more chosen
|
2017-12-18 09:50:08 -05:00 |
|
digital-gnome
|
88a1e3eb4d
|
Fix bad copy
|
2017-12-17 22:29:56 -05:00 |
|
digital-gnome
|
de6ebfc341
|
Remove chosen from some filter dropdowns and restyle to match
|
2017-12-17 22:04:10 -05:00 |
|
digital-gnome
|
804339f54f
|
Limit date range and only reload page after change is done
|
2017-12-17 16:44:57 -05:00 |
|
digital-gnome
|
5d190dedff
|
Set brackets width and allow blank
|
2017-12-17 14:25:50 -05:00 |
|
digital-gnome
|
bb75e6a6ea
|
Disallow future dates
|
2017-12-17 14:24:58 -05:00 |
|
digital-gnome
|
173ad4f75a
|
Add datepicker to montagereview
|
2017-12-17 09:22:31 -05:00 |
|
digital-gnome
|
6ffa96dea3
|
Add chosen to filters
|
2017-12-16 23:10:20 -05:00 |
|
digital-gnome
|
c8cfb47f9f
|
More bootstrap in datepicker
|
2017-12-16 23:10:19 -05:00 |
|
digital-gnome
|
9d87f7fe18
|
Use bootstrap icons in datepicker
|
2017-12-16 20:10:02 -05:00 |
|
digital-gnome
|
a091153929
|
Use seperate structure and theme jquery ui
|
2017-12-16 20:04:12 -05:00 |
|
digital-gnome
|
b6917d8b71
|
Fix initial time parsing
|
2017-12-16 09:08:50 -05:00 |
|
digital-gnome
|
d7532b0340
|
Add dateTime picker to filter
|
2017-12-15 22:57:42 -05:00 |
|
digital-gnome
|
2e56210007
|
Fix row highlighting
|
2017-12-15 22:56:49 -05:00 |
|
digital-gnome
|
eec174750e
|
Default for conjunction
|
2017-12-15 09:06:40 -05:00 |
|
digital-gnome
|
c0fcfe6eb6
|
Combine possible sort inputs to one in sortQuery, output limitQuery
|
2017-12-15 08:47:08 -05:00 |
|
digital-gnome
|
ce0a8c4486
|
Add sort/limit to filter object on pageload
|
2017-12-15 08:47:07 -05:00 |
|
digital-gnome
|
e192d664fd
|
WIP pass sort and limit
|
2017-12-15 08:47:07 -05:00 |
|
digital-gnome
|
dee976cf1a
|
parseRows just needs to recreate the php logic
|
2017-12-15 08:47:06 -05:00 |
|
digital-gnome
|
2cba20ab46
|
Make form validation not reload page
|
2017-12-15 08:47:05 -05:00 |
|
digital-gnome
|
2ddb380d0d
|
Remove submitToFilter
|
2017-12-15 08:47:05 -05:00 |
|
digital-gnome
|
db59f06520
|
Weekday needs to detect start or end as well
|
2017-12-15 08:47:04 -05:00 |
|
digital-gnome
|
86af2269b2
|
Move arrays out of ifs, pass to js
|
2017-12-15 08:47:03 -05:00 |
|
digital-gnome
|
a2c785f7eb
|
Move validateForm
|
2017-12-15 08:47:03 -05:00 |
|
digital-gnome
|
04efff699a
|
Set url when adding terms
Saves changes if reloaded or using back button
|
2017-12-15 08:47:02 -05:00 |
|
digital-gnome
|
f8da9a1c1b
|
Cleanup filter appearance
Tighten up fields and reduce jumping when adding terms.
|
2017-12-15 08:47:01 -05:00 |
|
digital-gnome
|
c936e9e2a9
|
No longer need line
|
2017-12-15 08:47:00 -05:00 |
|
digital-gnome
|
c1cf356974
|
Montagereview filter passing in wrong block
|
2017-12-15 08:47:00 -05:00 |
|
digital-gnome
|
51b4ddb0e4
|
Add js for filter handling
|
2017-12-15 08:46:59 -05:00 |
|
digital-gnome
|
d5ec45eed7
|
Include all DateTime possibilities
|
2017-12-15 08:46:58 -05:00 |
|
digital-gnome
|
d2b9614ce7
|
Change reset to not reload form
|
2017-12-15 08:46:57 -05:00 |
|
digital-gnome
|
fe6a6bec7c
|
Use disabled button rather than remove
Reduces page jumping
|
2017-12-15 08:46:57 -05:00 |
|
digital-gnome
|
8515e77d67
|
Add text type to text fields
|
2017-12-15 08:46:56 -05:00 |
|
digital-gnome
|
9eb03a881d
|
Always have a full line on filter page.
This allows javascript to copy easily
|
2017-12-15 08:46:55 -05:00 |
|
digital-gnome
|
ee5552d9f9
|
Redirect Events when post
Fixes broken back due to form resubmit
|
2017-12-13 22:25:28 -05:00 |
|
digital-gnome
|
c87d170972
|
Pass montagereview filter
|
2017-12-13 22:25:28 -05:00 |
|
Isaac Connor
|
8909184e2c
|
fix
|
2017-12-13 18:14:14 -05:00 |
|
Isaac Connor
|
046a0dd6e9
|
need a line break
|
2017-12-13 16:45:51 -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
|
4a1a9c48d5
|
Merge pull request #66 from digital-gnome/storageareas-fixBack
Storageareas fix back Redux
|
2017-12-13 12:40:11 -05:00 |
|
digital-gnome
|
0743a283da
|
Remove back/close if opened in new tab
|
2017-12-13 12:34:31 -05:00 |