snipe
|
6eab83a85a
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-23 15:22:53 +01:00 |
|
snipe
|
aa86e07cd2
|
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 15:22:39 +01:00 |
|
snipe
|
cce1f87da6
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-23 15:18:30 +01:00 |
|
snipe
|
d92fa5de65
|
fa-fw on settings icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 15:17:25 +01:00 |
|
snipe
|
b460e8dc83
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-23 08:42:32 +01:00 |
|
snipe
|
c589140ea0
|
Merge pull request #15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
|
2024-08-23 08:42:04 +01:00 |
|
snipe
|
52894615ce
|
More specific gate for checkin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 08:40:41 +01:00 |
|
snipe
|
8546bbdd65
|
Fixed gate for checkout button
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 08:38:47 +01:00 |
|
snipe
|
50cb7e65c9
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-23 07:32:39 +01:00 |
|
snipe
|
cc2c8f76d0
|
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
|
2024-08-23 07:31:29 +01:00 |
|
snipe
|
1ffa69c43c
|
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
|
2024-08-23 07:28:20 +01:00 |
|
snipe
|
f85ebd7ffd
|
Added pull-right to angle bracket
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-23 07:27:39 +01:00 |
|
snipe
|
78d355f136
|
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
|
2024-08-23 07:20:23 +01:00 |
|
snipe
|
ec0346e4a8
|
Add @setpill as a contributor
|
2024-08-23 07:19:08 +01:00 |
|
snipe
|
fc5eb37776
|
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
fixed #15374: load TrustProxies middleware in Kernel.php
|
2024-08-23 07:18:41 +01:00 |
|
setpill
|
1d7853cbfe
|
fixed #15374: load TrustProxies middleware in Kernel.php
|
2024-08-22 23:41:27 +02:00 |
|
Marcus Moore
|
af0a95be12
|
Simplify assertions
|
2024-08-22 10:18:23 -07:00 |
|
Marcus Moore
|
d67975cb62
|
Implement fix
|
2024-08-22 10:18:23 -07:00 |
|
Marcus Moore
|
663b2fd844
|
Add test case
|
2024-08-22 10:18:23 -07:00 |
|
Marcus Moore
|
bcace9d019
|
Point test to correct endpoint
|
2024-08-22 10:18:23 -07:00 |
|
Marcus Moore
|
b59bf3e7dc
|
Add failing test
|
2024-08-22 10:18:23 -07:00 |
|
Godfrey M
|
3957d670d0
|
fixes send acceptance reminder query
|
2024-08-22 10:04:46 -07:00 |
|
snipe
|
821dd158d1
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-08-22 15:50:20 +01:00 |
|
snipe
|
833dace2b4
|
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
|
2024-08-22 15:00:16 +01:00 |
|
snipe
|
56e31d2303
|
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 14:58:09 +01:00 |
|
snipe
|
ec365b0804
|
Merge pull request #15372 from StarlessNights/update-docker-compose-files
Fixed #15371: docker-compose files updated.
|
2024-08-22 14:49:13 +01:00 |
|
Iisakki Jaakkola
|
aef0ac68c3
|
Need to use the long format for redis too in docker-compose file.
|
2024-08-22 16:10:00 +03:00 |
|
Iisakki Jaakkola
|
f12f9a816f
|
Update the official docker-compose file too while at it.
|
2024-08-22 15:47:12 +03:00 |
|
Iisakki Jaakkola
|
a000d6454f
|
Fix non-functional development docker-compose file.
|
2024-08-22 15:46:40 +03:00 |
|
snipe
|
ca8864c061
|
Fixed small layout quirks in asset view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 13:28:52 +01:00 |
|
snipe
|
423f4f9126
|
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
|
2024-08-22 13:25:41 +01:00 |
|
snipe
|
456c7d8d91
|
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
|
2024-08-22 13:20:56 +01:00 |
|
snipe
|
54cfe3f6e6
|
Merge pull request #15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
|
2024-08-22 13:20:10 +01:00 |
|
snipe
|
5e0b18104d
|
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
|
2024-08-22 12:59:20 +01:00 |
|
snipe
|
8b5d3f7fbd
|
Fixed extra closing p tag
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 12:56:32 +01:00 |
|
snipe
|
744f43676d
|
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 12:53:16 +01:00 |
|
snipe
|
ec0b9b198f
|
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-22 12:43:07 +01:00 |
|
snipe
|
6c9a402685
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 11:20:52 +01:00 |
|
snipe
|
1b310f3a24
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-08-22 11:20:42 +01:00 |
|
snipe
|
94300d81d6
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 11:19:32 +01:00 |
|
snipe
|
bc9ea5a2ec
|
Merge pull request #15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
|
2024-08-22 11:18:06 +01:00 |
|
snipe
|
4635a6efc3
|
Merge pull request #15360 from snipe/more_print_fixes
More print fixes for asset view
|
2024-08-22 11:17:49 +01:00 |
|
snipe
|
9608414eae
|
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
|
2024-08-22 11:06:13 +01:00 |
|
snipe
|
5efddf6f5b
|
Allow clear on country dropdown
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 11:01:39 +01:00 |
|
snipe
|
305dc049a4
|
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 11:01:28 +01:00 |
|
snipe
|
3ac0702094
|
Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 10:13:22 +01:00 |
|
snipe
|
47d8e2f8b9
|
Add @Scarzy as a contributor
|
2024-08-22 09:42:05 +01:00 |
|
snipe
|
83dd9ce20e
|
Merge pull request #15362 from r-xyz/model-files-api
Added #9413: AssetModel files endpoints to API
|
2024-08-21 23:15:24 +01:00 |
|
r-xyz
|
a8eb76fd8d
|
Fixed model files API routes.
|
2024-08-21 22:25:41 +02:00 |
|
r-xyz
|
cd7db5c4a8
|
Fix some typos in models file handler.
|
2024-08-21 22:24:08 +02:00 |
|