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 |
|
snipe
|
0501c5f53c
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-24 11:15:03 +00:00 |
|
snipe
|
6a9247ba8a
|
Cast token policies to int
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-24 11:14:49 +00:00 |
|
snipe
|
fcf84bf63f
|
Fixed test namespace
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-24 11:09:54 +00:00 |
|
snipe
|
cebb9d034c
|
Merge pull request #16305 from snipe/bug/sc-28425
Fixed #16262 - Check for quantity before allowing component deletion
|
2025-02-23 14:17:36 +00:00 |
|
snipe
|
dd2b570db5
|
Added tighter constraints on deleting components
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 14:11:39 +00:00 |
|
snipe
|
2bee4532ec
|
Added qty error string
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 13:21:58 +00:00 |
|
snipe
|
96248e0023
|
Removed soft delete from test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 13:21:49 +00:00 |
|
snipe
|
157801242d
|
Added API test, renamed test to match filter
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 13:21:36 +00:00 |
|
snipe
|
7b151cf692
|
Added test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 13:17:20 +00:00 |
|
snipe
|
50c88df4cc
|
Merge pull request #16304 from snipe/security/snyk-updates-less-papaparse
Updated less and papaparse
|
2025-02-23 12:51:38 +00:00 |
|
snipe
|
d87a6868cc
|
Updated less and papaparse
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 12:50:09 +00:00 |
|
snipe
|
201f487853
|
Merge pull request #16303 from snipe/chore/sc-28493
Added tooltip for currency in table
|
2025-02-23 12:21:04 +00:00 |
|
snipe
|
069860d65f
|
Added tooltip for currency in table
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 12:19:18 +00:00 |
|
snipe
|
afa7391080
|
Merge pull request #16299 from snipe/added_checkin_checkout_indicator_for_custom_fields
Added checkin/checkout indicators on custom field table
|
2025-02-22 19:34:04 +00:00 |
|
snipe
|
07cf203018
|
Add checkin/checkout indicators on custom field table
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 19:32:34 +00:00 |
|
snipe
|
5f561452d2
|
Merge pull request #16298 from uberbrady/tooltips_custom_fields
Add tooltips to custom fields display, especially for icons
|
2025-02-22 19:17:28 +00:00 |
|
Brady Wetherington
|
cbe04e8514
|
Add tooltips to custom fields display, especially for icons
|
2025-02-22 19:13:09 +00:00 |
|
snipe
|
9b44dfd9b6
|
Merge pull request #16297 from snipe/add_field_to_checkin_checkout
Fixed #6188 - Added custom fields to checkin/checkout screens
|
2025-02-22 19:09:51 +00:00 |
|
snipe
|
9abf3029ef
|
Compact the method just a little
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 19:02:41 +00:00 |
|
snipe
|
19fb45f488
|
Refactor into method
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 18:57:18 +00:00 |
|
snipe
|
e983ee4d0f
|
Tweaked icon position
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-22 18:47:12 +00:00 |
|