ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,685 Commits
98 Branches
6 Tags
76 MiB
Commit Graph

775 Commits (ceda85e5dbc54b81affc3e1cc453672eda03a821)

Author SHA1 Message Date
Moe ceda85e5db Update ZoneMinder Monitors Import+ 2022-08-11 16:43:29 -07:00
Moe 850b49e635 Update ZoneMinder Monitors Import 2022-08-11 16:37:59 -07:00
Moe 5c2a83b91d Fix bg from old merge 2022-08-10 21:38:59 -07:00
Moe 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
Moe 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
Moe 220c55449d Add Toggle for Cloud Videos set in Videos Table 2022-08-08 14:10:20 -07:00
Moe 428666cc64 Add Permission checks for Live Stream block buttons 2022-08-08 11:53:35 -07:00
Moe 69d3392b15 Fix selecting Trigger Camera Groups 2022-08-08 11:18:05 -07:00
Antonín Skala e9b47f8da5
Add requestetd changes 2022-08-08 10:08:42 +02:00
Moe c4627b3c62 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-08-07 21:26:35 -07:00
Moe 1dcf5607e2 fix selector bug on login page 2022-08-07 21:26:26 -07:00
Moe 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
Gamertech e6400611e0 Quick fix to splash image 2022-08-08 12:57:47 +10:00
Gamertech 3b17bc733a Changed login splash image to a local avif 2022-08-08 12:45:00 +10:00
Moe 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
Moe f4a5d4bc20 minor touch up to super user panel 2022-08-07 19:04:54 -07:00
Moe 6b3f2fc82e Add API Key Manager for Super User 2022-08-07 18:57:16 -07:00
Moe 428d17cf87 add some UI fixes for displaying Unauthorized features for Sub-Acc 2022-08-07 16:27:03 -07:00
Gamertech b39f84269a Adding <html>/<body> tags 2022-08-06 18:54:23 +10:00
Gamertech 72c6ea3ff1 Add doctype to login page 2022-08-06 18:43:14 +10:00
Gamertech 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
Antonín Skala f634ab394e
Status bar - Dynamic update of Active monitors 2022-08-05 12:07:39 +02:00
Gamertech 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
Moe 1112eb7284 minor cleanup to UI 2022-08-04 11:17:53 -07:00
Gamertech 2acf9ca998 Update /super logout icon and remove unused stylesheet. 2022-08-01 12:13:17 +00:00
Moe 2deb91bd9a Fix saving Trigger Camera Groups 2022-07-31 23:04:28 -07:00
Moe a61868fbb9 time-lapse viewer untick master checkbox if not all are selected 2022-07-30 18:44:50 -07:00
Moe 3f9ca074b7 minor tweak to time-lapse ui 2022-07-30 15:08:37 -07:00
Moe 3f783f826d Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-07-30 12:20:57 -07:00
Moe 2b334de481 make getAdminApiPrefix always available 2022-07-30 12:10:44 -07:00
Moe fbacafdd94 Add bulk deletion to time-lapse viewer and some minor cleanup 2022-07-30 12:09:10 -07:00
Moe 64679ea99b Merge branch 'swap-cpu-ram-icons' into 'dev' 
UI: Swap cpu/ram icons

See merge request Shinobi-Systems/Shinobi!372
 2022-07-30 16:03:32 +00:00
Antonín Skala d0f4374909
Swap cpu/ram icons 2022-07-30 10:04:04 +02:00
Moe 169d72f683 Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev 2022-07-29 21:22:44 -07:00
Antonín Skala 5d660c4def
improve camera count readability 2022-07-29 23:12:52 +02:00
Antonín Skala e0319d2a62
Fix camera progress bar 2022-07-29 23:11:30 +02:00
Antonín Skala 3bfe1ff5c4
Fix disk indicator-percent 2022-07-26 17:08:04 +02:00
Antonín Skala 962a38bdc0
Add box-wraper to keep same layout 2022-07-26 17:00:39 +02:00
Moe e708488894 Hide options if P2P is disabled 2022-07-25 12:55:19 -07:00
Moe 1750f79757 Make Easy Remote Access status blocks only connect if enabled 2022-07-25 12:14:41 -07:00
Moe 9fd866bbbf Fix username overflowing in side menu 2022-07-24 09:53:32 -07:00
Moe e5b23fa2fe Fix label for No Trigger event in MQTT outbound 2022-07-24 08:51:15 -07:00
Moe c173ebf326 Make Super User login page appear with Green shade 2022-07-22 22:14:34 -07:00
Moe e6d3f6e0dc Update Appearance for Super User panel 
- a Refactor for the actual code may be coming soon, however the goal with this is only to convert the appearance to match the style of Dashboard v3
 2022-07-22 22:14:06 -07:00
Moe 70401b5631 Add uiVisibilityConditions for niche field visibility requirements 
+ fixes the missing settings for Stream Types that require encoding but did not swap the Video Codec when it was visible before selecting.
 2022-07-21 17:11:08 -07:00
Moe b52269b6b8 fix video appear upon completion for live grid blocks 2022-07-20 20:21:39 -07:00
Moe b1a5ad7c2c set super page logout button redirection to main login 2022-07-19 13:35:50 -07:00
Moe 17e7fdc15a Add Accuracy Mode for Motion Detection 2022-07-17 23:48:10 -07:00
Moe 5724c88a2e Fix double click to full screen live stream 2022-07-14 22:11:32 -07:00
Moe 1a65bb5627 fix drawing day cards with no frames 2022-07-14 11:06:04 -07:00