DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13305 commits 101 branches 268 tags 320 MiB
Commit graph

13305 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 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 c816b960b5 Fixed stray closing paren 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 20:34:36 +01:00
snipe 4d00bb98d1 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 18:39:55 +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
snipe 0bcca99573
Merge pull request #14686 from snipe/security/upgrade_alpine_to_3.13.8 
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.8 #14646
 2024-05-06 12:16:00 +01:00
snipe 63516c4a4f [Snyk] Upgrade alpinejs from 3.13.5 to 3.13.8 #14646 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 12:12:59 +01:00
snipe 19fb79ffff
Merge pull request #14661 from ubc-cpsc/bugfix/CVE-2024-32489 
Upgrade tecnickcom/tcpdf from version 6.7.4 to 6.7.5 to address the security vulnerability CVE-2024-22640
 2024-05-06 11:58:31 +01:00
snipe 02835de13d
Merge pull request #14679 from mustafa-online/develop 
Improve RTL support
 2024-05-04 15:47:14 +01:00
Mustafa Online 55b004d53d Improve RTL support 2024-05-04 13:32:42 +02:00
Mustafa Online c1b72a8ce6 Revert "Improve RTL support" 
This reverts commit fa0bea87e6.
 2024-05-04 13:31:52 +02:00
Mustafa Online fa0bea87e6 Improve RTL support 
I'm starting to make some improvements to RTL support, more PR's to come to address other parts.
 2024-05-04 13:17:48 +02:00
snipe dab5874fd7
Merge pull request #14391 from snipe/features/add_Brother_188mm_tape_label 
Added Brother 18mm label type
 2024-05-02 13:14:04 +01:00
snipe 4850227c04
Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints 
Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI
 2024-05-02 13:11:51 +01:00
snipe eb9a654cc3 Moved settings call higher 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:37:41 +01:00
snipe 4224bc0c43 Removed extra settings param 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:36:57 +01:00
snipe f893b23129 Refactored title blade areas 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:35:52 +01:00
snipe 8c65880504 Changed badge to span in default blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:35:41 +01:00
snipe 53cadf80fa Removed assertions for factories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:24:31 +01:00
Frances Lui 8b3bfc6bc9 Fixes CVE-2024-32489 2024-04-29 16:33:00 -07:00
snipe 19cff25300
Merge pull request #14651 from marcusmoore/bug/sc-25402 
Fixed `purchase_cost` not being allowed to be a string when creating asset via api
 2024-04-27 03:39:10 +01:00
snipe 848e1fe1f6 Refactored audit alerts 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:26:00 +01:00
snipe fe147adec3 Refactor checkin alert 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:10:54 +01:00
snipe 103809b65f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:43 +01:00
snipe a398496dd4 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:27 +01:00
snipe 839db8ef44 Refactored due-or-overdue methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:27 +01:00
snipe bfd0530597 Fixed notification 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:13 +01:00
snipe 494ec5cd9c Added tests for due-or-overdue 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:04 +01:00
snipe fc61a4b88d Fixed badge HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:50:58 +01:00