a45118c977
Fix orphan check at startup
2022-08-12 22:03:08 -07:00
a02313ba77
Allow Importing ZoneMinder Zones with Monitor Configurations
2022-08-12 09:54:59 -07:00
ceda85e5db
Update ZoneMinder Monitors Import+
2022-08-11 16:43:29 -07:00
5d5c4a9682
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-11 16:38:03 -07:00
850b49e635
Update ZoneMinder Monitors Import
2022-08-11 16:37:59 -07:00
f10ebdcfb5
Merge branch 'cron-as-worker-process' into 'dev'
...
Make cron.js a Worker Process
See merge request Shinobi-Systems/Shinobi!364
2022-08-11 05:50:27 +00:00
15f6eb8616
remove cron key warning
2022-08-10 22:42:02 -07:00
511fa91354
startup with a clean monitor object
2022-08-10 22:41:41 -07:00
5c2a83b91d
Fix bg from old merge
2022-08-10 21:38:59 -07:00
02e2244123
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-09 17:19:13 -07:00
38c128a4f1
Merge branch 'fix-camera-progress-bar' into 'dev'
...
UI: Fix camera progress bar
See merge request Shinobi-Systems/Shinobi!371
2022-08-10 00:18:59 +00:00
54f0ef3674
Changes from !223 updated
2022-08-09 17:06:38 -07:00
637754e8c7
Changes from !223
...
Had to be manually merged because of Dashboard v3 framework change
2022-08-09 17:05:17 -07:00
870c65d277
Merge branch 'dev' into 'dev'
...
Name Monitors in PowerVideoViewer by name not ID
See merge request Shinobi-Systems/Shinobi!315
2022-08-09 23:36:10 +00:00
693764e8a5
Add Czech Language file
2022-08-09 16:34:21 -07:00
ae9cd98636
Manually add changes from !329
...
- Had to manually add them because part of it already existed in the repository in a different method. Portions have been rewritten since as well; which required a manual merge.
2022-08-09 16:33:44 -07:00
5d9db1124b
Merge branch 'dev' into 'cron-as-worker-process'
...
# Conflicts:
# libs/socketio.js
2022-08-09 23:22:54 +00:00
87914222e6
Update socketio.js
2022-08-09 16:19:58 -07:00
55b850c6f7
add basic restrictor for cloud file delete
2022-08-09 08:24:49 -07:00
e3b1a9b4a4
Add getting Cloud Timelapse Frames through API
2022-08-08 15:16:59 -07:00
220c55449d
Add Toggle for Cloud Videos set in Videos Table
2022-08-08 14:10:20 -07:00
428666cc64
Add Permission checks for Live Stream block buttons
2022-08-08 11:53:35 -07:00
69d3392b15
Fix selecting Trigger Camera Groups
2022-08-08 11:18:05 -07:00
9f1bbca9b1
Update WebDAV uploader
...
+ timelapse frame uploads
+ proxy video data through Shinobi server on video GET for security and consistency
2022-08-08 10:15:58 -07:00
92ef41401a
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-08 07:18:23 -07:00
73cc0a0e83
change toggleSubstream permission to view instead of edit
2022-08-08 07:18:17 -07:00
e9b47f8da5
Add requestetd changes
2022-08-08 10:08:42 +02:00
eadeca8753
Merge branch 'fix/api-auth' into 'dev'
...
User details parsing fixed in editSession #362
See merge request Shinobi-Systems/Shinobi!360
2022-08-08 05:07:13 +00:00
c4627b3c62
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-07 21:26:35 -07:00
1dcf5607e2
fix selector bug on login page
2022-08-07 21:26:26 -07:00
cb31a0ee61
Merge branch 'dev' into 'dev'
...
Cleanup and Jquery update
See merge request Shinobi-Systems/Shinobi!376
2022-08-08 03:50:43 +00:00
e6400611e0
Quick fix to splash image
2022-08-08 12:57:47 +10:00
3b17bc733a
Changed login splash image to a local avif
2022-08-08 12:45:00 +10:00
c3c97ce80b
Merge branch 'fix-sub-account-permissions' into 'dev'
...
Refactor Sub Account Permissions
See merge request Shinobi-Systems/Shinobi!377
2022-08-08 02:12:40 +00:00
f4a5d4bc20
minor touch up to super user panel
2022-08-07 19:04:54 -07:00
6b3f2fc82e
Add API Key Manager for Super User
2022-08-07 18:57:16 -07:00
428d17cf87
add some UI fixes for displaying Unauthorized features for Sub-Acc
2022-08-07 16:27:03 -07:00
2c9a510068
Update en_CA.json
2022-08-07 12:09:44 -07:00
e11edc7c89
cleanup and proxy video data for cloud videos (s3based, amazonS3)
2022-08-07 12:09:28 -07:00
55f2567976
Add Permission checks to Scheduler, Probe, and ONVIF Device Man
2022-08-06 11:18:46 -07:00
b39f84269a
Adding <html>/<body> tags
2022-08-06 18:54:23 +10:00
72c6ea3ff1
Add doctype to login page
2022-08-06 18:43:14 +10:00
4e8300f3f9
Refactor Permission check for Sub-Accounts and API Keys
2022-08-05 23:20:08 -07:00
bfb65a811f
Cleanup and Jquery update
...
Deleted old Bootstrap scripts
Updated to Jquery 3.6.0
Removed call to vis.js map file
Removed pre-Doctype comment that triggered IE9 quirks mode
2022-08-06 14:05:09 +10:00
b07e3ce400
Merge branch 'dev' into 'dev'
...
Winter cleaning
See merge request Shinobi-Systems/Shinobi!375
2022-08-05 15:01:01 +00:00
f634ab394e
Status bar - Dynamic update of Active monitors
2022-08-05 12:07:39 +02:00
ed02aa8d5d
Matched package-lock.json
...
Fixed console typo
Removed empty div breaking the normal-view header for Chrome and blocking favicon load
Removed call for non-existent stylesheet
2022-08-05 18:13:10 +10:00
f63bb5b47d
Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
2022-08-04 14:56:24 -07:00
1112eb7284
minor cleanup to UI
2022-08-04 11:17:53 -07:00
0d211e7fce
Merge branch 'dev' into 'dev'
...
Updating npm packages
See merge request Shinobi-Systems/Shinobi!374
2022-08-04 16:31:28 +00:00
Moe
Antonín Skala
Gamertech