DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
16751 commits 59 branches 275 tags 321 MiB
Commit graph

16751 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M eaacf29d57 fix tests 2025-02-19 15:11:16 -08:00
Godfrey M a534b488b2 prevents deletion of assigned assets in bulk deletion 2025-02-19 10:09:02 -08:00
snipe e814cd5a9e
Merge pull request #16235 from marcusmoore/chore/migrate-form-open-pt1 
Replace Form::open and Form::close pt1
 2025-02-18 20:23:47 +00:00
Marcus Moore e5f426ec64
Remove unneeded multipart/form-data 2025-02-18 12:19:32 -08:00
snipe a1b0a30351
Merge pull request #16225 from marcusmoore/chore/remove-cols-from-textarea 
Removed cols property from textarea component
 2025-02-18 19:56:40 +00:00
snipe c0f0f43dd7
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap 
Adds translations to LDAP  and Label settings pages
 2025-02-18 19:56:14 +00:00
snipe 57c07a3687
Merge pull request #16270 from snipe/feature/sc-28365_ldap_text_update 
Updated LDAP sync text
 2025-02-18 19:28:18 +00:00
snipe 6de08f46fd Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:26:36 +00:00
snipe 3554270366 Updated LDAP sync text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:25:40 +00:00
snipe 029450bcbf
Merge pull request #16269 from snipe/bug/sc-28437_fix 
Scope API results by location ID
 2025-02-18 19:05:29 +00:00
snipe 329fbf6a7c Scope results by location ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:01:16 +00:00
snipe b7d0fccabc
Merge pull request #16268 from snipe/fixed_16259_archived_assets_in_company_scope 
Fixed #16259 - mismatch in asset count if archived assets are hidden
 2025-02-18 16:35:01 +00:00
snipe 48ab94c15b Fixed query duplication for AssetsForShow scope 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 16:18:12 +00:00
snipe ac907add83
Merge pull request #16082 from marcusmoore/chore/sc-28173 
Replace calls to Form::text
 2025-02-18 14:58:40 +00:00
snipe 3d47a8ba50 Fixed name format tests (#16236) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 14:52:52 +00:00
snipe 452185be45
Merge pull request #16199 from akemidx/feature/sc-28271 
Adding <Last Name.First Initial> as an option for usernames
 2025-02-18 14:42:54 +00:00
snipe 02a8e17704
Merge pull request #16260 from snipe/fix_for_qr_on_old_label_engine 
Fix for QR code on old label engine
 2025-02-17 10:45:51 +00:00
snipe 7553ec3e27 Fixed equals 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-17 10:44:58 +00:00
snipe c8f82cbc2b
Merge pull request #16250 from uberbrady/improve_tls_client_side_file_caching 
Instead of saving TLS cache-files on save, cache them when used
 2025-02-13 15:46:22 +00:00
Brady Wetherington b7bd56daf7 Instead of saving TLS cache-files on save, cache them when used 2025-02-13 15:09:28 +00:00
snipe 393118f083
Merge pull request #16249 from snipe/flatten_api_return 
Return flat JSON instead of transformed data
 2025-02-13 14:28:41 +00:00
snipe d3210c6d40 Return flat JSON instead of transformed data 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-13 14:16:32 +00:00
snipe ff1157a95e
Merge pull request #16232 from Godmartinz/adds-expiring-notifications 
Expiration notifcation switched to use Mailable
 2025-02-12 20:07:24 +00:00
Godfrey M e66b690c93 removed unnecessary base_path changes 2025-02-12 12:01:43 -08:00
Godfrey M 242fd00e8a remove commented dd 2025-02-12 11:55:28 -08:00
Godfrey M c77a1faa69 moar unnecssary changes removed 2025-02-12 11:54:34 -08:00
Godfrey M 4cbc751dad removed unnecessary changes 2025-02-12 11:49:36 -08:00
Godfrey M bd03d70937 adds test for expiring licenses 2025-02-12 11:43:22 -08:00
Godfrey M 6873244e7e adds test for expiring asset notifications 2025-02-12 11:28:36 -08:00
akemidx 1e07927e78 test created and passing 2025-02-11 19:35:55 -05:00
Marcus Moore 6263d01c73
Migrate Form::close in previously changed views 2025-02-11 14:10:52 -08:00
Marcus Moore 967e646989
Migrate Form::open in depreciations view 2025-02-11 14:10:52 -08:00
Marcus Moore e9d3b9dcde
Migrate Form::open and Form::close in manage custom fields view 2025-02-11 14:10:52 -08:00
Marcus Moore 3065ba851e
Migrate Form::open in custom fieldset view 2025-02-11 14:10:52 -08:00
Marcus Moore 80522a2505
Migrate Form::open in custom field view 2025-02-11 14:10:52 -08:00
Marcus Moore 532e6c1c1d
Migrate Form::open in profile view 2025-02-11 14:10:52 -08:00
Marcus Moore 5cf314a314
Migrate Form::open in change password view 2025-02-11 14:10:52 -08:00
snipe c08cfb9b73
Merge pull request #16226 from snipe/add_notes_to_locations_companies_etc 
Fixed #16184 - added notes to locations, companies, categories, manufacturers and groups
 2025-02-11 19:25:10 +00:00
snipe 61591633f8 Fixed layout sorta 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 19:23:04 +00:00
Godfrey M 9b5b58687d removed unused 2025-02-11 11:02:25 -08:00
Godfrey M fb7bec4be4 adds expiring asset and license mail 2025-02-11 10:55:56 -08:00
snipe 9dba03646b Pointless rename 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 18:32:51 +00:00
snipe ddd2ce07f3 Fixed branch from weird merge down 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 01:14:35 +00:00
snipe 3de5f5882c Added/updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 01:07:41 +00:00
Marcus Moore 73e010434e
Remove cols property 2025-02-10 16:43:39 -08:00
snipe a9d6a5f618 Updated note partial to use generic notes text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:39:46 +00:00
snipe ef9cc4fceb Added notes to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:39:26 +00:00
snipe e104decf77 Added placeholder translation array 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:35:03 +00:00
snipe 96e38da875 Created migration 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:34:50 +00:00
snipe ff95049f7c Added notes to factories 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:34:30 +00:00