snipe
86661e79d1
Merge pull request #14702 from Toreg87/fixes/total_asset_count
...
Fixes #14701 - wrong total asset count
2024-05-08 11:52:46 +01:00
Tobias Regnery
b2a5d86e30
Fixes #14701 - wrong total asset count
...
The total asset count in the sidenav shows the ready to deploy count instead of the total count.
Fix this by adjusting the query to all assets. Also respect the setting for archived assets.
Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process.
While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2024-05-08 09:34:35 +02:00
Marcus Moore
d7f0ee49b7
Update Alpine to 3.13.10
...
Includes fix to new label engine.
2024-05-07 17:08:05 -07:00
spencerrlongg
5b86ee7291
a couple more tests
2024-05-07 17:19:00 -05:00
spencerrlongg
ad2ba252ee
two new test
2024-05-07 15:11:33 -05:00
spencerrlongg
17ef20ea92
alright, in a working place
2024-05-07 14:08:47 -05:00
snipe
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 19:16:56 +01:00
snipe
386b2839e8
Added tests
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 18:59:24 +01:00
snipe
934593e0b6
Updated icon
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 18:09:55 +01:00
snipe
a7aa178f24
Used localized strings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:56:07 +01:00
snipe
69122034e7
Fixed icon table headers
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:55:33 +01:00
snipe
1117f4289d
Added string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:55:10 +01:00
snipe
97bc4a092f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:40:48 +01:00
snipe
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:40:35 +01:00
snipe
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 15:54:43 +01:00
snipe
482965197d
Added users, locations to presenter, transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:41 +01:00
snipe
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:28 +01:00
snipe
f769e8247f
Added ManagedUsers method, additional checks in isDeletable()
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:15 +01:00
snipe
2b4a536f85
Added CSS for users, locations
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:06:54 +01:00
snipe
92ae069629
Disable button in UI if user cannot be deleted
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:06:35 +01:00
snipe
6f40b21986
Merge remote-tracking branch 'origin/develop'
2024-05-07 08:38:09 +01:00
snipe
3084521521
Merge pull request #14693 from snipe/fixes/14692_view_share_undefined
...
Fixes #14692 - set default variables for sidebar totals
2024-05-07 08:37:10 +01:00
snipe
4f12c86e74
Fixes #14692 - set default variables for sidebar totals
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 08:34:22 +01:00
snipe
204de99a64
Merge remote-tracking branch 'origin/develop'
2024-05-07 08:12:31 +01:00
snipe
fd929f5dd9
Merge pull request #14690 from marcusmoore/import-settings-properly
...
Load settings in `SendUpcomingAuditReport` command
2024-05-07 07:42:34 +01:00
Marcus Moore
7e9c8ba290
Remove duplicate settings call
2024-05-06 17:08:16 -07:00
Marcus Moore
6f639f7bf0
Load settings properly in SendUpcomingAuditReport command
2024-05-06 16:44:14 -07:00
snipe
3594ed67d1
Removed back buttons on settings index
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 20:48:32 +01:00
snipe
d36a06d8e1
Merge remote-tracking branch 'origin/develop'
2024-05-06 20:34:49 +01:00
snipe
c816b960b5
Fixed stray closing paren
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 20:34:36 +01:00
Brady Wetherington
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
snipe
4913e56086
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2024-05-06 18:43:48 +01:00
snipe
4d00bb98d1
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 18:39:55 +01:00
snipe
db2baae758
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-05-06 18:37:52 +01:00
snipe
fdecdf4b15
Merge pull request #14689 from KorvinSzanto/develop
...
Capitalize `N` instead of `y` since no is default
2024-05-06 17:48:16 +01:00
Korvin Szanto
5c1d4aff23
Capitalize N instead of y since no is default
2024-05-06 09:00:33 -07:00
snipe
bf0edcb92e
docs: add @gitgrimbo as a contributor
2024-05-06 12:59:26 +01:00
snipe
39fa8ef3c0
docs: add @chandanchowdhury as a contributor
2024-05-06 12:55:47 +01:00
snipe
9e8a369bc8
docs: add @PP-JN-RL as a contributor
2024-05-06 12:54:35 +01:00
snipe
3f3fe8935f
docs: add @jeffclay as a contributor
2024-05-06 12:54:20 +01:00
snipe
82387630c7
docs: add @squintfox as a contributor
2024-05-06 12:54:06 +01:00
snipe
16c5033514
docs: add @Q4kK as a contributor
2024-05-06 12:53:34 +01:00
snipe
46ffaee1e4
docs: add @franceslui as a contributor
2024-05-06 12:53:06 +01:00
snipe
d936f92a7d
docs: add @mustafa-online as a contributor
2024-05-06 12:52:46 +01:00
snipe
b424ddf42d
docs: add @koiakoia as a contributor
2024-05-06 12:51:40 +01:00
snipe
b3d5a893fc
Fixed text
...
via (@koiakoia )
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 12:49:54 +01:00
snipe
69ea6eebae
Merge pull request #14688 from snipe/security/Upgrade-tableexport.jquery.plugin-from-1.28.0-to-1.30.0
...
[Snyk] Upgrade tableexport.jquery.plugin from 1.28.0 to 1.30.0 #14656
2024-05-06 12:47:01 +01:00
snipe
0892c34125
[Snyk] Upgrade tableexport.jquery.plugin from 1.28.0 to 1.30.0 #14656
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 12:45:33 +01:00
snipe
52e14d501f
Merge pull request #14687 from snipe/security/upgrade_fontawesome_from-6.5.1-to-6.5.2
...
Upgrade fontawesome from 6.5.1 to 6.5.2
2024-05-06 12:22:50 +01:00
snipe
4d093160fc
Upgrade @fortawesome/fontawesome-free from 6.5.1 to 6.5.2 #14647
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-06 12:21:34 +01:00
