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
16998 commits 59 branches 275 tags 321 MiB
Commit graph

16998 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington bce2007b97 Fixes #16331 - Don't make passport:install command require user input 2025-02-25 16:38:40 +00:00
Brady Wetherington 09a5e5b1bd Whoops! Need minimum 8.2, not 8.1 (probably mis-merge?) 2025-02-25 14:40:45 +00:00
snipe 7b4f4b6b7f
Merge pull request #16337 from joakimbergros/develop 
Fixed #16173: `useraccountcontrol` was not included in the ldap query attributes
 2025-02-25 13:49:38 +00:00
Joakim Bergros 5c66334017 Added a check to see if the user has specified that is an ActiveDirectory server in the configuration before adding the useraccountcontrol attribute to the ldap query. 2025-02-25 14:22:22 +01:00
Joakim Bergros ae82051b73 Fixed #16173: useraccountcontrol was not included in the ldap query attributes. 
`$results` did not include the `useraccountcontrol` and thus rendered the fallback logic void when `active_flag` was blank.

 Added a condition to check if `active_flag` is blank and only then add `useraccountcontrol` to the ldap query since it is then a requirement in accordance with "we respect the userAccountControl attribute" text in the `admin/ldap` route.

[`elseif' will become true when `active_flag` is blank](b141945add/app/Console/Commands/LdapSync.php (L364))
 2025-02-25 13:55:53 +01:00
snipe c3a2e81afd Updated version 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 12:18:22 +00:00
snipe 18c7cbbbbb
Merge pull request #16336 from snipe/change_order_in_upgrade_script 
Fixed #16334 - Changed composer order in upgrade script
 2025-02-25 12:09:15 +00:00
snipe 3718f08c72 Changed composer order in upgrade script 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 12:05:00 +00:00
snipe b7821a69b6 Added link to the google apps script repo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 11:07:04 +00:00
snipe 8049f21068 Updated laravel version in readme 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 11:02:00 +00:00
snipe 8140110bf9 Chnage dev docker env to en-US from en 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 10:57:38 +00:00
snipe a4587f6322
Merge pull request #16335 from snipe/added_label_test 
Added label test
 2025-02-25 10:40:46 +00:00
snipe 163e19f1e9 Added label test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-25 10:37:06 +00:00
snipe 8a40c3ecb4
Merge pull request #16325 from spencerrlongg/bug/sc-28520 
Remove remaining hardware references in favor of new RMB
 2025-02-25 10:09:35 +00:00
spencerrlongg d949a9689f fix all 2025-02-24 22:35:47 -06:00
snipe 27a7c6fd10
Merge pull request #16324 from marcusmoore/chore/migrate-checkbox-helpers-p2 
Replace calls to Form::checkbox pt2
 2025-02-25 02:33:02 +00:00
Marcus Moore 4d55a67628
Merge branch 'develop' into chore/migrate-checkbox-helpers-p2 2025-02-24 16:37:59 -08:00
snipe 9d453226bd
Merge pull request #16321 from spencerrlongg/bug/sc-28515 
Changed Parameter Name for RMB
 2025-02-25 00:17:37 +00:00
snipe cd26694767
Merge pull request #16322 from marcusmoore/fixes/fix-test-edit-route 
Fixed edit routes in tests
 2025-02-25 00:17:10 +00:00
Marcus Moore a26cc2ced1
Use .edit routes instead of .update 2025-02-24 15:55:05 -08:00
spencerrlongg 1fd81d17a3 route model binding change 2025-02-24 17:53:41 -06:00
snipe 134045f1ec Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-02-24 23:46:55 +00:00
snipe b6b6a3eec7 Remove req for 0 min 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 23:46:50 +00:00
snipe b62714d702
Merge pull request #16062 from snipe/remove_mcrypt 
Removed references to mcrypt
 2025-02-24 23:22:32 +00:00
Brady Wetherington 271bcc66bf Remove lib-mcrypt as a dependency 2025-02-24 23:19:08 +00:00
snipe ced560daa9 Add @jostrander as a contributor 2025-02-24 23:16:27 +00:00
snipe b395c9130a Merge remote-tracking branch 'origin/master' into develop 2025-02-24 23:06:46 +00:00
snipe ed46a757fa
Merge pull request #16320 from jostrander/fix/location-edit 
Fixed: fix 500 on edit locations page by referencing current location
 2025-02-24 23:03:01 +00:00
Jesse Ostrander 6a8a41b389
fix: reference to item location on location edit method 2025-02-24 17:34:18 -05:00
snipe 4800f4c853
Merge branch 'develop' into remove_mcrypt 2025-02-24 22:12:56 +00:00
snipe c79ff49c85 Add @addex12 as a contributor 2025-02-24 20:30:04 +00:00
snipe ee85a392e7
Merge pull request #16316 from snipe/v8_final_merge 
V8 final merge
 2025-02-24 19:18:12 +00:00
Brady Wetherington 6c2d367124 Tweak version number and hashes 2025-02-24 18:38:53 +00:00
Brady Wetherington 982cfeca32 Merge branch 'develop' 2025-02-24 18:37:41 +00:00
snipe 5fa4f85c20
Merge pull request #16106 from marcusmoore/bug/sc-27960 
Fixed asset show page erroring when asset not associated with model
 2025-02-24 17:16:12 +00:00
snipe 43b8c0bf7b
Merge pull request #16313 from snipe/localizations/2024-02-24 
Updated strings, added Oromo
 2025-02-24 14:51:45 +00:00
snipe 54b664d679 Updated strings, added Oromo 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:50:23 +00:00
snipe bf2355a297 Fixed showfile path 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:34:10 +00:00
snipe 2bf4ec0ae8 A few more small tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:24:15 +00:00
Brady Wetherington 9555825a67 Update minimum PHP version 2025-02-24 14:03:57 +00:00
snipe 0bea07e2f9
Merge pull request #16312 from snipe/small_cleanups 
Small cleanups before release
 2025-02-24 13:53:28 +00:00
snipe 22f7a9ddd4 Fixed stray tag 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:46:33 +00:00
snipe 77b417bcea Passed user to showfile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:43:39 +00:00
snipe 76e3c00d2d Removed footer on tables that didn’t need it 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:41:49 +00:00
snipe 77add8abbc Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:39:07 +00:00
snipe b53957268a Added warning if deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:55 +00:00
snipe ba49fc554d Moved warning to be consistent with other FCOs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:47 +00:00
snipe e60462b751 Added/updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:28 +00:00
snipe a5009aa7df Added withTrashed() to handle soft deletes with RMB 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:06 +00:00
snipe e589adbe80 Updated model route 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:31:09 +00:00