05615c5cf4
We should not use a hard path in cache bust
2018-07-11 15:48:01 -04:00
7db1fabbe1
Removed "chosen" web site; "prism.js" is not distributable. ( #2154 )
2018-07-11 15:46:43 -04:00
115e554d94
Remove erroneous t and convert tabs to spaces
2018-07-11 15:46:11 -04:00
18c3618e28
Arp tool ( #2155 )
...
* let cmake set path to arp
* declare cameras array
* fix probeV4L function
* typo
* fix another typo - my machine is possessed.
* update redhat, debian, ubuntu build dependencies
2018-07-11 15:43:59 -04:00
fe5ebe094d
More work just using auth.php instead of cake code. Don't reload the User object
2018-07-11 11:45:49 -04:00
b8691e4654
Don't need global cookies. Only open session if needed in userLogin
2018-07-11 11:45:19 -04:00
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
4f80ca6871
Use userLogin function from auth.php instead of cake code.
2018-07-11 10:33:49 -04:00
983e3c45be
Fix spacing and quotes
2018-07-11 09:54:25 -04:00
f10509690b
add username and passwordHash to Session so that generateAuthHash works
2018-07-11 09:54:15 -04:00
f56d751661
join multiple echos into 1
2018-07-10 13:47:30 -04:00
21438d17ac
Fix authenticating User
2018-07-10 13:19:51 -04:00
930d929427
Merge branch 'storageareas' into api_auth
2018-07-10 12:46:30 -04:00
d9f5d5fe4c
Merge branch 'master' into storageareas
2018-07-10 12:46:09 -04:00
e6a9422636
Add entry for StorageArea
2018-07-10 12:26:25 -04:00
a0992baa16
Add entry for SignalCheckPoints
2018-07-10 12:25:36 -04:00
d05ad12b48
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:54:30 -04:00
46a496aefa
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:54:16 -04:00
7ed316d3a5
We no longer base64_encode the probe data, we just use htmlspecialchars, so don't base64_decode it. Fixes #2148
2018-07-10 11:49:45 -04:00
13055bdda6
rework monitorprobe to be more logical, and not use Fatal.
2018-07-10 11:49:02 -04:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
a26ab59c30
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-10 11:01:47 -04:00
831fe57025
Spacing and google code style
2018-07-10 11:00:52 -04:00
77fbfccee0
fix #2149
2018-07-10 10:31:43 -04:00
8db6561030
Add missing ;
2018-07-09 13:08:20 -04:00
3ecf0055b5
spacing
2018-07-09 13:07:16 -04:00
0824f740ae
Make video 100% width in cycle. Also fix monitors filtering by putting it in a form
2018-07-09 12:50:57 -04:00
65564fa480
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:39:08 -04:00
12a673169f
spacing
2018-07-09 12:33:37 -04:00
ba8dc2059d
spacing
2018-07-09 12:33:21 -04:00
afa31842b5
spacing
2018-07-09 12:28:39 -04:00
9561401a44
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-09 12:02:14 -04:00
62946578c6
Use to determine export filename
2018-07-09 12:02:05 -04:00
e29ed9bc54
add Export button to Filter
2018-07-09 12:01:40 -04:00
4c916e880b
Pass event_ids when reloading after export generation.
2018-07-09 12:01:25 -04:00
4de7ae8edc
Pass event_ids when reloading after export generation.
2018-07-09 12:01:09 -04:00
5ea2edb2ee
Convert export from a popup to a full page.
2018-07-09 12:00:10 -04:00
8ca35fa5ab
add Export button to Filter
2018-07-09 11:59:44 -04:00
24a5b78f4c
Convert export from a popup to a full page. Add loading events by filter.
2018-07-09 11:59:08 -04:00
e85c16aba6
Cleanups, add video viewing
2018-07-09 11:58:30 -04:00
fd5cf07bfb
Make server name and hostname full width.
2018-07-09 10:48:14 -04:00
639f916156
spacing
2018-07-09 09:59:03 -04:00
2c0a119186
Merge ../ZoneMinder.master into add_export_to_filter
2018-07-09 09:56:21 -04:00
6cf336cc33
Always use a /zm in urls to zm assets
2018-07-09 09:47:20 -04:00
4a4e845e9c
Fix stupid code that defaulted minTimeSecs to 2010 instead of the first event
2018-07-08 16:24:53 -04:00
ade8d078df
Define minTimeSecs and maxTimeSecs
2018-07-08 15:28:55 -04:00
2be217aaaf
Merge ../ZoneMinder.master into add_export_to_filter
2018-07-08 15:21:42 -04:00
26b2887d6b
Add Export Matches
2018-07-08 15:21:07 -04:00
d8a4acf319
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-08 15:08:54 -04:00
d257b53e82
Add missing ) to frame sql when no min/max time specified
2018-07-08 15:08:49 -04:00
b5ca671103
Misc JS hygiene ( #2150 )
...
* fixed "jquery-ui.js" symlink.
* Bootstrap source, matching minified version.
Also origin URL.
* moment.js: added missing source and URL of origin.
* video-js: replaced bad case of source-less minified binary.
Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
i.e. it was modified in unknown way without sources. Very bad.
* jQuery: renamed URL file for consistency
* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.
* mootools-more: rename file to properly reflect version.
This is a default build without any options.
* prism.js.FIXME: note about outdated source-less file.
2018-07-07 10:30:16 -04:00
f5dce7e863
Merge pull request #2145 from onlyjob/arp_regex
...
fix regex to match IP and first numbers of MAC in the `arp -a` output (Closes : #2144 )
2018-07-07 08:24:47 -05:00
015013f247
Center WEB_CONSOLE_BANNER
...
Center WEB_CONSOLE_BANNER under the server stats
2018-07-06 15:59:10 -05:00
dcb9999398
fix regex to match IP and first numbers of MAC in the `arp -a` output ( Closes : #2144 );
...
fixes probing of network cameras.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2018-07-06 16:16:36 +10:00
084f1ab1d6
Add missing reloadWebSite js function
...
Somehow this went missing when the new website monitor type was merged
2018-07-05 08:43:21 -05:00
cf4a1c73fd
Always us /zm in cache_bust
2018-07-04 14:46:22 -04:00
32d103c216
fix submodule again
2018-07-01 08:23:00 -05:00
5d0719f18d
fixes #2137
2018-07-01 08:16:06 -05:00
29f0747895
Merge branch 'master' into storageareas
2018-06-25 16:15:46 -04:00
e04eac57ae
Include values in /etc/zm files in viewByName
2018-06-25 15:43:01 -04:00
4f0c56d731
Merge branch 'master' into include_fs_config_in_api_config
2018-06-25 15:10:52 -04:00
10531df543
Merge ../ZoneMinder.connortechnology
2018-06-25 14:51:53 -04:00
6bbd4f1083
google code style
2018-06-25 14:51:46 -04:00
d271d8bf1d
Fix my botched change to generateAuthHash
2018-06-25 14:50:54 -04:00
e98a4b1562
Merge branch 'master' into storageareas
2018-06-25 14:31:00 -04:00
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
54e7b0ac16
create ZM_EXPORT_DIR if needed ( #2136 )
2018-06-25 13:57:00 -04:00
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
24ceb75936
Merge branch 'master' into include_fs_config_in_api_config
2018-06-21 21:41:54 -04:00
3ffd30ffbd
Allow selection of different source column filtering on the console ( #2132 )
2018-06-20 11:12:43 -04:00
5e43cd99bc
Change langfile's charset to UTF-8 as in #583
2018-06-19 20:38:55 -03:00
b0411cbfd2
Merge branch 'master' into storageareas
2018-06-16 16:47:53 -04:00
09aa3afaac
Fix capitalisation of Ffmpeg
2018-06-16 16:47:09 -04:00
55f2e7c6a2
Fix #2124 . Always allow selection of checkboxes, include canEdit(Events) in button disabling.
2018-06-15 15:21:10 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
f2d00b6af5
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:39:13 -04:00
7520d20751
update Storage Video Writer options to only allow Passthrough for FFmpeg
2018-06-14 13:36:32 -04:00
37badbfb17
fix #2123
2018-06-12 08:58:19 -04:00
67155e98eb
add debug message when no changes are being made to a monitor
2018-06-11 16:34:40 -04:00
73555edfdc
Add Error message when a monitor has no server assigned in a multi-server setup
2018-06-11 16:34:23 -04:00
e88c73195d
Merge branch 'fix_perl_logging' into storageareas
2018-06-08 09:30:16 -04:00
aa055c147b
classic skin - fix dvr control buttons
...
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05:00
05a434893e
We should be able to edit zones even if zm isn't running
2018-06-06 16:59:07 -04:00
0937bfdf84
consoleTableBody needs to be an id in order for dragndrop sorting to work
2018-06-06 13:37:12 -04:00
9050ffaf92
spacing, remove some debug lines
2018-06-06 12:57:35 -04:00
cd64619743
Fix controlling daemon when the monitor is Local
2018-06-06 12:56:33 -04:00
3109536dda
Alternate fix for video generation under csrf. Now we just turn off output buffering (discarding contents before sending the avi
2018-06-06 11:55:51 -04:00
2aac2e1e05
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-06-06 11:41:36 -04:00
b4e0cb5eab
WHen we are storing jpgs we don't generate a snapshot, so handle that
2018-06-06 11:41:28 -04:00
d961b74084
spacing and double to single quotes
2018-06-06 11:41:00 -04:00
db6bd67f59
just fix structure/spacing
2018-06-06 11:40:38 -04:00
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
c30992be3f
fixes #2105
...
A more simplified approach to fixing #2105 , compared to previous attempts.
2018-06-06 08:18:33 -05:00
5d772f16f6
fix closing td
2018-06-01 16:18:07 -04:00
405b1f92ed
add a .fail to log the errors given when a navbar ajax call fails
2018-05-31 10:25:53 -04:00
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
be424f46f0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-18 12:07:22 -04:00
77b144a13e
must specify type=button or else some browsers treat it as a submit button
2018-05-18 16:07:58 +02:00
337db8bb18
Include Content-Length so we get a download progress
2018-05-18 15:52:30 +02:00
7ad6b01310
double to single quotes and spacing
2018-05-18 15:52:12 +02:00
d8a62e0ede
Show total size for non-montage review downloads as well
2018-05-18 15:51:42 +02:00
cfbbc238c9
remove extra spaces and parenthesis
2018-05-18 15:51:12 +02:00
cc27ce7ee9
Turn off csrf for archive downloading, which prevents out of memeory
2018-05-18 15:50:45 +02:00
2a8ea98249
remove blank space at end of line
2018-05-18 09:12:10 -04:00
4815162bea
fix extra }
2018-05-18 09:11:15 -04:00
8276386a44
We always return an associative array now
2018-05-18 09:06:17 -04:00
25703fb2d4
Speed up log query response by generating the options out of the log rows instead of hitting the db again.
2018-05-18 09:05:25 -04:00
fdaf992156
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-16 14:18:48 -04:00
93dd943fec
Fix some spacing
2018-05-16 20:17:57 +02:00
780cb693c2
google code style
2018-05-16 11:14:11 -04:00
81c4542a94
correct use of getValue. Use standard ddm element value instead
2018-05-16 11:13:59 -04:00
af63619ce6
Fix Messages=>Messaged
2018-05-15 21:56:17 +02:00
49d75ce039
handle Width and Height not being in ->{} and returnining defaults. Include Path in Source
2018-05-15 10:45:47 -07:00
f16e1953d9
Make Source filter apply to Path as well
2018-05-15 10:45:10 -07:00
88b66fe5dd
Merge ../ZoneMinder.master into storageareas
2018-05-14 14:07:51 -04:00
63e6cb1d62
remove parenthesis that confuse older php
2018-05-14 13:56:55 -04:00
485f292943
fix php 5.4 compatibility - remove calls to empty
2018-05-14 12:32:48 -05:00
47ba435471
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-12 19:44:40 -04:00
bb76079d54
fix logic when snapshot.jpg doesn't exist. We need an actual frame, to get a Delta to tell ffmpeg which frame to use. So load the Frame with Score=MaxScore
2018-05-11 10:37:00 -04:00
b20cb5d0ae
Add all the other Event columns to fields
2018-05-11 10:36:14 -04:00
230a59cd8e
fix case where it wouldn't generate the snapshot.jpg because we hadn't specified whether to show a capture or analysis image
2018-05-11 09:53:24 -04:00
8b8bcbd1e2
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-10 17:47:12 -04:00
571b27a025
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-10 14:39:16 -04:00
c61deb422f
update to -zm versions
2018-05-10 14:38:49 -04:00
2a5f05499e
Munge the config in the global configvals into the configs array before returning it.
2018-05-10 13:44:46 -04:00
b2115f9dcf
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-08 13:34:03 -07:00
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
3c4befc73a
improve Name and Source filtering. Default to case insensitive text search.
2018-05-08 14:07:24 -04:00
e7bd5900bc
rough in a Storage Model
2018-05-07 14:09:05 -07:00
da7c953e3d
adda blank line
2018-05-07 14:08:32 -07:00
a4911d8f39
use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events
2018-05-07 14:08:17 -07:00
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
1a012c62ff
Add fileExists to event view
2018-05-07 14:07:03 -07:00
9c44f56f37
Add Storage to belongsTo. Implement Relative_Path and fileExists functions
2018-05-07 14:06:48 -07:00
5772ff9161
return default values for Width and Height
2018-05-05 12:49:00 -04:00
f2c099f1e4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-05-04 16:01:25 -04:00
dbdf937a56
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-04 06:47:23 -07:00
2076508374
add Source and Name filters
2018-05-04 06:47:02 -07:00
3fd953a4eb
Move code to generate Source from console into Monitor Object
2018-05-04 06:46:46 -07:00
84c94efaa8
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
2018-05-04 02:26:25 +02:00
e953a04f61
naming consistency of attribute ( #2096 )
2018-05-03 14:03:49 -04:00
769d4a8693
DB connect can die, so put it in an eval
2018-05-03 09:50:54 -07:00
d43cd322f4
Make event count a link to a filter to list them.
2018-05-03 09:42:14 -07:00
81758fab38
use new Thumbnail code
2018-05-03 09:39:23 -07:00
e64de07560
spacing
2018-05-03 09:39:09 -07:00
dbf760d8af
cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent
2018-05-03 09:38:56 -07:00
f76827a450
redo thumbnail code. Always link to server they event is located on
2018-05-03 09:36:50 -07:00
a3158fcc97
auth_key api for different situations ( #2090 )
...
* auth_key api for different situations
* added new flag to indicate if password needs to be appended
* pure json view
2018-05-02 12:26:28 -04:00
4e7bf6efe7
remove duplicated css for watch view in dark skin
2018-05-02 11:39:16 -04:00
bbe0025641
correct sort order default
2018-05-01 09:43:09 -04:00
Isaac Connor
Dmitry Smirnov
Andrew Bauer
Isaac Connor
Andrew Bauer
Isaac Connor
Carlos R. Pasqualini
Isaac Connor
Isaac
Isaac Connor
Isaac
Pliable Pixels