Commit Graph

274 Commits

Author SHA1 Message Date
Isaac Connor 0623afb0ae add language entry for Monitor DefaultCodec 2019-03-19 12:19:58 -04:00
Isaac Connor 3f9564c10a Merge branch 'master' into storageareas 2019-03-19 10:37:35 -04:00
Chris ad5f6a8729 Camera reboot function (#2554)
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
2019-03-18 14:49:05 -04:00
Isaac Connor 778707c8df Merge branch 'master' into storageareas 2019-03-04 14:33:28 -05:00
Isaac Connor 96e29c0299 fix up remaining issues with cycle updates 2019-03-04 13:35:40 -05:00
Isaac Connor af9c87a112 Merge branch 'master' into storageareas 2019-02-27 10:53:19 -05:00
Isaac Connor a7ca75758b add Event Notification label 2019-02-27 09:29:00 -05:00
Isaac Connor 5060358870 Merge branch 'master' into storageareas 2018-12-29 09:56:53 -05:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Isaac Connor af2bb992e9 Merge branch 'server_path_prefix' into storageareas 2018-11-29 14:33:46 -05:00
Isaac Connor 1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor 57acb2aac6 Merge branch 'server_path_prefix' into storageareas 2018-11-28 10:41:11 -05:00
Isaac Connor 2b48b09ef5 Add entries for PathToIndex and PathToZMS 2018-11-28 09:53:35 -05:00
Isaac Connor 7ad19be0d7 Merge branch 'server_path_prefix' into storageareas 2018-11-23 13:29:01 -05:00
Isaac Connor c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -05:00
Andrew Bauer f790eacc92
Merge pull request #2273 from connortechnology/fix_rce
use json_encode/decode instead of serialize/unserialize to pass onvif…
2018-10-30 07:06:45 -05:00
Isaac Connor 461ce3c1f8 Merge branch 'master' into storageareas 2018-10-29 12:52:06 -04:00
Damir Merdan d0080684b8 Bosnian translation (#2266)
* Zoneminder bosnian translation

Hi,

this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too

* Delete BA_ba.php

* Bosnian translation

80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
2018-10-24 13:52:32 -04:00
Isaac Connor ca8770bd5a Merge branch 'fix_rce' into storageareas 2018-10-24 10:17:16 -04:00
Isaac Connor 2024df4393 use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272 2018-10-24 09:49:56 -04:00
Isaac Connor 98579fc02a Merge branch 'master' into storageareas 2018-10-19 11:27:43 -04:00
Isaac Connor 4fdac25ae1 remove blank last line 2018-10-18 09:20:15 -04:00
Isaac Connor 9c437b0303 Merge branch 'add_export_to_filter' into storageareas 2018-09-25 14:35:19 -04:00
Isaac Connor 60b952ab86 Merge branch 'master' into storageareas 2018-09-13 16:20:36 -04:00
Isaac Connor e21a7a769b add ExportCompress 2018-09-05 11:13:32 -04:00
Isaac Connor d5cab088d6 Merge branch 'master' into add_export_to_filter 2018-09-05 10:33:10 -04:00
Isaac Connor f4c2d8adea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-03 12:29:09 -04:00
Isaac Connor b1fe80a0bd Add JSON/MaybeXS to dependencies, replacing JSON/Any 2018-08-30 18:30:33 -04:00
Isaac Connor 4e32089a48 Merge branch 'master' into storageareas 2018-08-30 14:51:27 -04:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
Isaac Connor b7c86ef3d4 remove escapes that mess up the quoting 2018-08-30 12:26:18 -04:00
Isaac Connor d3e089e3ce remove an escape that messed up the quoting 2018-08-30 11:18:48 -04:00
Isaac Connor 6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor d768f5f7fc Merge branch 'master' into storageareas 2018-08-13 15:35:55 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179)
This reverts commit 56f4d768c2.
2018-08-13 15:33:43 -04:00
Isaac Connor 026390ccd8 Merge branch 'master' into storageareas 2018-08-13 15:26:29 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176)
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
2018-08-13 15:23:44 -04:00
Isaac Connor 8a936cdcc9 Merge branch 'master' into add_export_to_filter 2018-07-11 16:43:02 -04:00
Isaac Connor e6a9422636 Add entry for StorageArea 2018-07-10 12:26:25 -04:00
Isaac Connor a0992baa16 Add entry for SignalCheckPoints 2018-07-10 12:25:36 -04:00
Isaac Connor ee017a1ef7 Add PathPrefix to language 2018-07-09 14:29:40 -04:00
Isaac Connor 26b2887d6b Add Export Matches 2018-07-08 15:21:07 -04:00
Carlos R. Pasqualini 5e43cd99bc Change langfile's charset to UTF-8 as in #583 2018-06-19 20:38:55 -03:00
Isaac Connor 348468a98d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-26 22:09:48 -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 bb924ee078 add report_event_audit 2018-04-10 13:06:01 -07:00
Isaac Connor 85bb26668e translate Statuses beter 2018-04-03 12:30:57 -07:00
Pliable Pixels b8f6c2277f clone icons 2018-03-24 10:21:59 -04:00
Pliable Pixels a9d6bd22bc shortened monitor add 2018-03-24 09:59:08 -04:00