DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9177 commits 101 branches 268 tags 288 MiB
Commit graph

9177 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 39ab545cf5
Update alter statement to use correct suffix for column 
This is brittle...
 2023-01-10 17:08:28 -08:00
Marcus Moore e5cb68cc5e
Move drop column command to correct migration 2023-01-10 17:06:16 -08:00
Marcus Moore b8b2543b0d
Reference the correct table in migration down method 2023-01-10 17:04:21 -08:00
Marcus Moore bc0f666906
Create Setting in test to avoid being redirected to the setup screen 2023-01-10 17:03:09 -08:00
Marcus Moore 581655f756
Run database migrations for all Dusk tests 2023-01-10 17:02:11 -08:00
Marcus Moore 2aa50859b3
Bump Dusk version to fix broken macOS chrome driver link 2023-01-10 17:01:03 -08:00
snipe 17c308f3ca Merge remote-tracking branch 'origin/master' into develop 2023-01-10 02:08:23 -08:00
snipe 35136cea07 Add @subdriven as a contributor 2023-01-10 02:07:48 -08:00
snipe 0db83ad8cb
Merge pull request #12158 from subdriven/master 
Updated installer script for multiple fixes and features
 2023-01-10 02:04:29 -08:00
snipe 62bf7b1bce Merge remote-tracking branch 'origin/develop' 2023-01-10 01:56:27 -08:00
snipe 50fdf9c33b
Merge pull request #12330 from snipe/fixes/custom_status_label_sidenav 
Fixed UX issue where assets sidenav would collapse if custom status label is selected
 2023-01-10 01:55:52 -08:00
snipe c5c37fa95f Fixed copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:54:26 -08:00
snipe 9dc016aecc Fixed issue where assets sidenav would collapse if custom status label is selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:31:00 -08:00
snipe 60dcaa9e94 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-01-09 21:11:29 -08:00
snipe 2e75bd6960 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:11:00 -08:00
snipe 799c9c910e Merge remote-tracking branch 'origin/develop' 2023-01-09 21:09:46 -08:00
snipe 005d6d3b62
Merge pull request #12328 from snipe/fixes/revert_to_old_behavior_on_byserial 
Fixed bySerial endpoint to always return a list
 2023-01-09 21:09:25 -08:00
snipe 529b005d1e We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:05:51 -08:00
snipe dd55aedb87 Merge remote-tracking branch 'origin/develop' 2023-01-09 20:47:46 -08:00
snipe be16fe948a
Merge pull request #12327 from snipe/fixes/formatting_regression_with_bytag_api_response 
Determine which transformer to use based on number of assets
 2023-01-09 20:46:49 -08:00
snipe 7846251d25 Re-added return for no results (derp) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:43:57 -08:00
snipe cc665d50ed One more refactor, hopefully simplifying 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:40:12 -08:00
snipe ae76d46f87 Small refactor to ALWAYS return deleted assets in a collection transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 20:23:05 -08:00
snipe bf849128fc Replicate the response behavior in the bySerial endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:57:47 -08:00
snipe 44be8c8f60 Determine which transformer to use based on number of assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 19:54:21 -08:00
snipe bad1253682 Merge remote-tracking branch 'origin/develop' 2023-01-09 17:15:44 -08:00
snipe 20a9be2f6c
Merge pull request #12326 from uberbrady/uncache_settings 
The cache system in getSettings() cached values "forever." That's bad.
 2023-01-09 17:14:22 -08:00
Brady Wetherington 39b1a5a8a0 Remove old cache key for settings 2023-01-09 16:19:25 -08:00
Brady Wetherington 2d0ac5b48b The cache system in getSettings() cached values "forever." That's bad. 2023-01-09 16:16:09 -08:00
snipe e67bd5a275 Merge remote-tracking branch 'origin/develop' 2023-01-09 16:00:33 -08:00
snipe 8d35583634
Merge pull request #12324 from snipe/features/add_username_to_asset_list 
Added username to display in asset listings
 2023-01-09 16:00:01 -08:00
snipe b39a9e0fe1 Merge remote-tracking branch 'origin/develop' 2023-01-09 15:54:04 -08:00
snipe ae04a8c872
Merge pull request #12325 from uberbrady/ldap_permissions_fix 
Fixed #12288 - LDAP default group feature refactor
 2023-01-09 15:52:02 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe a57315aed5 Added username to display in asset listings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 12:58:58 -08:00
snipe e1263155b1
Merge pull request #12323 from snipe/translations/updated_strings 
Updated language strings
 2023-01-09 11:10:19 -08:00
snipe 014eab3abc Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 11:09:26 -08:00
snipe f1bc183043
Merge pull request #12320 from snipe/dependabot/github_actions/actions/checkout-3.3.0 
Bump actions/checkout from 3.2.0 to 3.3.0
 2023-01-09 10:17:06 -08:00
dependabot[bot] 2f20945516
Bump actions/checkout from 3.2.0 to 3.3.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.2.0...v3.3.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-09 08:06:28 +00:00
snipe 91d0c383df Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:47:55 -08:00
snipe 886f2a0dec
Merge pull request #12317 from snipe/fixes/shorten_url_display_on_view 
Truncate URL with ellipsis if too long
 2023-01-05 18:44:44 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
snipe a916c68f95 Merge remote-tracking branch 'origin/develop' 2023-01-05 18:07:59 -08:00
snipe 19e703980d
Merge pull request #12316 from snipe/features/chunk_data_in_sync_script 
Chunk sync script
 2023-01-05 18:07:30 -08:00
snipe 6e42bce409 Removed $start variable from calback 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:04:06 -08:00
snipe 1a3c947b14 Chunk sync script 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 17:57:52 -08:00
snipe 4d0fc99773 Merge remote-tracking branch 'origin/develop' 2023-01-05 14:19:51 -08:00
snipe bd3f730cb2
Merge pull request #12315 from snipe/features/added_default_values_to_model_api 
Features/added default values to model api
 2023-01-05 14:11:24 -08:00
snipe 381f89c5a8 Added format to array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 13:15:30 -08:00
snipe db43628bdc Added default field info to models API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 13:12:54 -08:00