eace112b2b
fix embed paths and super confirm path
2022-08-21 08:44:28 -07:00
230549c823
move js files to assets vendor/js
2022-08-13 20:36:24 -07:00
05ba5a2353
remove some more old files
2022-08-13 20:25:39 -07:00
ed1d317a68
confirm window library moved
2022-08-13 20:24:15 -07:00
ad9abdd253
remove remote link to font-awesome and fix some icons
2022-08-13 20:10:52 -07:00
473bdb5798
remove old admin libs/asset loaders
2022-08-13 19:59:14 -07:00
e79071bdb8
add custom asset loaders for js
2022-08-13 19:59:01 -07:00
70ce26d660
prepare for customAutoLoad assets
2022-08-13 19:54:45 -07:00
db4c4a655e
move old core css dependencies, prepare for customAutoLoad assets
2022-08-13 19:49:59 -07:00
a4e0e024b7
Delete daterangepicker.scss
2022-08-13 15:47:21 -07:00
de49b2117b
move leaflet to assets/vendor
2022-08-13 13:53:55 -07:00
63b994ae42
remove unused fonts
2022-08-13 13:45:34 -07:00
a2639dc6b0
move Super User libraries to assets folder
2022-08-13 13:41:00 -07:00
77b033934c
remove some css and js files
2022-08-13 12:57:39 -07:00
54c5709509
failed theme load defaults to Ice-v3
2022-08-13 11:27:45 -07:00
17985499b2
remove less, sass, and scss
2022-08-13 11:22:37 -07:00
97daf7fa02
minor cleanup
2022-08-12 22:03:30 -07:00
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
Moe
Antonín Skala
Gamertech