1039149866
fix buttons on events page. data-onclick-this to data-on-click-this
2019-02-07 08:56:48 -05:00
d33e094526
Merge branch 'master' into storageareas
2019-02-06 17:03:41 -05:00
0783802d0c
fix CSP violations on events
2019-02-06 13:31:34 -05:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
6eb4d7ae27
Filter improvements ( #2438 )
...
* Put back code to close the popup when view is none
* clean up and reduce depth of some logic
* Increase width of user popup
* fix code style
* Make execute_filter work on a filter Id instead of name
* rework logic to reduce code depth. Change view to events to display the results of execute.
* Change the redirect to stay on the new view. When redirecting from executing a filter, it was redirecting to filter.
* Set a form action for correctness. Change execute button to a button instead of a submit. Stay on the filter view when executing
2019-01-23 11:30:51 -05:00
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
d7ebc85d81
Replace remaining `console` inline event handlers ( #2432 )
...
* Use a hidden submit button in _monitor_filters rather than onkeydown
* events/console: Convert checkbox header toggle inline event listeners
2019-01-21 11:11:40 -05:00
552e14a971
Merge branch 'master' into storageareas
2019-01-18 10:36:59 -05:00
6bb5aa1b87
More inline JS / nonce conversions ( #2415 )
...
* monitor.php: Add nonce and move <script> inside </body>
* export_functions.php: Untested: Add @nonce to <script>
* blank.php: Add @nonce to <script> and add to CSP enforced views
* Enforce CSP on login and privacy views
* group.php: Add nonce and move <script> inside </body>
* filter.php: Add @nonce to <script>
* Fix updateButtons argument on the filter page upon change and page load
* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
98579fc02a
Merge branch 'master' into storageareas
2018-10-19 11:27:43 -04:00
f7de3a87e2
show event notes in same event view ( #2259 )
2018-10-16 12:11:25 -04:00
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
7ffb46302f
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:49 -04:00
2399615a0a
When events have the same starttime, sort secondly by Id
2018-09-26 14:10:21 -04:00
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
05f0338219
use a unique connection key for downloads
2018-07-12 14:07:19 -04:00
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
81758fab38
use new Thumbnail code
2018-05-03 09:39:23 -07:00
98b54f87f2
make thumbnail code more readable
2018-04-15 10:27:08 -04:00
70c7eaef0e
fix using wrong array. Should use StorageById
2018-04-04 20:29:01 -04:00
2f6adff1b2
handle when storage area is gone
2018-04-04 20:27:21 -04:00
614170c181
Add EndTime to event list
2018-04-03 06:57:22 -07:00
db8ab28845
Add return false to window.history.back
...
Adding this makes it work in Safari
2018-03-04 08:37:21 +11:00
7d88e25ef9
simplify thumbnail/snapshot usage a bit
2018-02-19 17:25:49 -05:00
dec82ecf5c
Fix for when specifying page 1 and no pages
2018-02-07 09:07:51 -05:00
a782ef1db7
Add debug tests for loading all events
2018-01-29 07:45:28 -08:00
de08e3114e
more and less debug
2018-01-23 18:16:37 +01:00
8fe0e1bdc0
fix Debug => Logger::Debug
2018-01-22 15:58:01 -05:00
06c9266c62
use snapshot.jpg more
2018-01-22 03:27:01 +01:00
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
c0fcfe6eb6
Combine possible sort inputs to one in sortQuery, output limitQuery
2017-12-15 08:47:08 -05:00
ee5552d9f9
Redirect Events when post
...
Fixes broken back due to form resubmit
2017-12-13 22:25:28 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
3e7c573da5
Add download video option to events view
...
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
e6568d01a3
Remove timeline popup
2017-12-02 12:28:05 -05:00
725814d41d
Remove unused code from events
2017-12-02 12:28:05 -05:00
b3ef499e46
remove event popup
2017-12-02 12:28:04 -05:00
adc1b924da
Remove events popup
2017-12-02 12:25:53 -05:00
e34b8abaca
Cleanup events view header
2017-12-02 12:25:53 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
6eb542f0e2
Merge branch 'storageareas' into LookandFeel
2017-11-20 20:19:27 -05:00
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
ab87848899
Add visual cue to archived events
...
The asterisk didn't do it for me. Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
32c79f8d23
Add a disk space total to event list
2017-10-18 09:43:51 -07:00
2fb0acfcc3
remove cellspacing=
2017-10-16 12:20:26 -07:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
c372787882
fix typo
2017-07-06 10:50:56 -04:00
e892841d7e
Fix typo
2017-07-06 10:49:54 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
0b4a2b41cc
fix scale on initial montage load. Replace calls to functions.php/getStreamSrc with object based call
2017-07-05 14:20:50 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
502cb6a7d8
fix spacing
2017-05-31 21:34:38 -04:00
8b3b9eb30e
more merges/fixes from SA
2017-05-30 13:47:30 -04:00
355eb1beef
when mouseover the thumbnail, stream the video
2017-05-05 14:25:25 -04:00
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
0a90dbac9f
require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path.
2017-01-02 10:35:51 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
708f52beda
Merge branch 'disk_space_in_events' into storageareas
2016-12-13 13:36:18 -05:00
a9548d3f6b
Add a config entry to turn event disk space on/off
2016-12-13 13:34:56 -05:00
cd43d1fa7a
Rough in Event disk space reporting
2016-07-19 17:34:01 -04:00
8c8461a88e
Update to use Event object and object based createListThumbnail function
2016-07-20 15:20:51 -04:00
bce7369984
Merge branch 'disk_space_in_events' into storageareas
2016-07-19 17:36:15 -04:00
550fdc9295
change thumbnail path to specify eid and fid instead of path to the jpg.
2016-05-02 13:42:15 -04:00
59406fd03a
Merge branch 'master' into storageareas
2016-04-28 09:24:36 -04:00
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
5f6d140de5
Load all event fields, so we know we have them deeper in the code.
2016-04-01 14:07:27 -04:00
5a2a4baa89
Must load StorageId as well when loading event
2016-02-19 09:47:19 -05:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
2c47a15f9b
Use event dimensions instead of monitor ones as they may have changed.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
9b31bf29e8
Added in image view to allow event root to be able web root
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3031 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-23 09:12:12 +00:00
1fad2d7ec9
Changed query separator to & and miscellaneous html fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2982 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-16 17:09:16 +00:00
012ac787f6
Fixed filter execution issues.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2669 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-20 08:25:24 +00:00
1080485c33
Motage and event list issues, fixes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2642 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:29:14 +00:00
ef8f7b85fd
Continuing development and bugfixes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2632 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:47:20 +00:00
106882c161
Updated copyright notices
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
2824cb7355
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 13:54:50 +00:00
Isaac Connor
Isaac Connor
Matt N
Pliable Pixels
Isaac Connor
Steve Gilvarry
Isaac Connor
Isaac Connor
Isaac
digital-gnome
Isaac Connor
Andy Bauer
Isaac Connor
Andrew Bauer
SteveGilvarry
stan