3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-04-02 14:01:08 +00:00
Commit Graph

4038 Commits

Author SHA1 Message Date
33a104f142 Fixes #18512 temporarily 2026-02-17 14:11:14 +00:00
d6592819e8 Show only active licenses 2026-02-17 13:17:49 +00:00
8f34c06196 Added order_number to API for accessories, consumables, components 2026-02-17 13:08:09 +00:00
9cdc73917b Merge pull request #18537 from grokability/more-refactoring-tables-and-tabs
WIP - More refactoring of tabs, tab panes, and tables
2026-02-17 12:39:31 +00:00
92a641f01a Added snipe_component because wtf laravel 2026-02-13 17:21:59 +00:00
4d73894cd2 Merge pull request #18542 from marcusmoore/fixes/fd-53577-reminder-subject-2
Updated subject line of acceptance reminder emails
2026-02-12 21:22:55 +00:00
05f3bf633e Fixed typeError for isManagerOf in manager view of EULAs 2026-02-12 20:21:15 +00:00
00408f0103 Revert "Put checkout_qty on checkoutable so accessory and consumable emails are formatted correctly"
This reverts commit 548cceee18.
2026-02-11 16:06:27 -08:00
548cceee18 Put checkout_qty on checkoutable so accessory and consumable emails are formatted correctly 2026-02-11 13:39:37 -08:00
6cca24be8e Fixed typo 2026-02-11 07:27:16 +00:00
e946c4bf8c Consolidated custom fieldset edit/show 2026-02-10 15:20:57 +00:00
f3cc3ed682 Merge pull request #18470 from bilias/pr-clean
Do not delete asset name if update request does not have a name
2026-02-09 20:57:07 +00:00
f8cfb8833f Merge pull request #18514 from grokability/update-models-with-new-components
Update models with new components
2026-02-09 19:53:40 +00:00
c2c2332e83 Removed erroneous icon 2026-02-09 13:05:22 +00:00
9f69c36426 Added depreciations and departments 2026-02-09 13:03:07 +00:00
6d9bbe1ddf Small tweaks to EULA API 2026-02-07 15:41:51 +00:00
fb8586f186 Properly pass parameter for asset emails 2026-02-05 16:59:49 -08:00
4ee378bf8e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	resources/views/blade/table/index.blade.php
#	resources/views/models/custom_fields_form.blade.php
2026-02-05 13:24:27 +00:00
8ff34baafa wrap $files in isset to avoid null errors 2026-01-26 15:44:23 -06:00
ab02b67d3c Merge remote-tracking branch 'origin/develop' 2026-01-22 20:34:51 +00:00
aaf9372474 move helper query to eager load in the asset api 2026-01-22 11:12:49 -08:00
ca99f525c9 Do not delete asset name if update request does not have a name 2026-01-22 12:40:59 +02:00
d9ef7b43b0 Merge remote-tracking branch 'origin/develop' 2026-01-21 19:59:59 +00:00
62dbd400a4 Use asset_eol_date in custom asset report 2026-01-20 15:07:19 -08:00
4043df1d02 Sort groups by name, asc 2026-01-20 20:13:22 +00:00
41450b6e1b Merge pull request #18368 from marcusmoore/feature/group-create-edit-load-improvement
Improved loading speeds on group create and edit page
2026-01-19 11:38:00 +00:00
e667cd20a8 Set require_signature to default to 0 2026-01-14 13:30:54 +00:00
26347ac41e Add display name to bulk user edit 2026-01-13 12:00:46 +00:00
406951fc84 Set $files only if there are results 2026-01-05 22:17:06 +00:00
a19c391aa1 Check can edit on demo in bulk user edit 2026-01-05 14:58:14 +00:00
0af45a53a9 Merge pull request #18359 from marcusmoore/17816-qty-in-activity-report
Fixed #17816 - added quantity to activity reports
2026-01-05 13:03:56 +00:00
d85b25d683 Merge pull request #18363 from ubc-cpsc/task/request-get
fix: replace deprecated Symfony Request::get() usage
2025-12-21 08:09:50 +00:00
755bb8f189 Merge pull request #18326 from dylang3/fix/users-groups-sync
Fixes #18325: Ensure existing permission group users are maintained when editing a group
2025-12-19 06:26:44 +00:00
f53dcbc64f Only pull needed fields from database 2025-12-18 13:37:56 -08:00
0f215bbcf8 fix: replace deprecated Symfony Request::get() usage 2025-12-17 18:44:04 -08:00
03116f5ece Fixed tests 2025-12-17 16:16:58 +00:00
da1ca24190 Remove avatar delete - should be done in purge 2025-12-17 15:29:07 +00:00
18c639e6c0 WIP - adding qty to more event calls 2025-12-15 14:38:13 -08:00
06224371b3 Begin passing qty in CheckoutableCheckedOut event 2025-12-15 12:47:36 -08:00
c978be5cab send associated_users to view as collection 2025-12-09 19:47:42 -06:00
7c7375ed43 Undo temp delete commented out 2025-12-09 23:48:34 +00:00
a350b9bc3d Handle redirect if the user does not have permission to view results 2025-12-09 23:46:33 +00:00
7854543122 Added import-download controller 2025-12-09 23:46:13 +00:00
9ae68f0000 More color tweaks 2025-12-06 00:58:32 +00:00
8b4387ec32 Fixed weird indenting 2025-12-05 19:52:31 +00:00
07e1f67e13 Disallow fill for sensitive fields 2025-12-05 19:27:01 +00:00
bc796498a3 Moved setup controller methods out of settings controller 2025-12-05 17:01:24 +00:00
621ce1777f Fixed #18288: Allow users to change preferences even if profile editing is not permitted 2025-12-04 13:21:04 +00:00
d22d70dd92 Merge pull request #18257 from iryadifarhan/fix/manager-view-not-displaying-subordinates-eulas-properly
Fixes Manager View not displaying subordinates EULAs properly in View Assets page
2025-12-03 09:49:35 +00:00
7ec5606ce4 Merge pull request #18247 from uberbrady/multi_create_fixes
Fixed #18160 - Multi-create fixes
2025-12-03 09:49:14 +00:00