DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
9361 commits 96 branches 267 tags 295 MiB
Commit graph

9361 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe ace73acba1
Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment 
Fixed: page-break and padding at the end of document for labels
 2023-01-05 09:59:35 -08:00
Godfrey M 301c4fda6e fixes conflicts 2023-01-05 09:55:25 -08:00
snipe 5898e384f8
Merge pull request #12308 from snipe/fixes/missing_translation_string 
Fixed missing translation string
 2023-01-04 15:13:36 -08:00
snipe 9c63f426d9 Added missing translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 14:09:14 -08:00
snipe c575798b56
Merge pull request #12307 from snipe/fixes/update_less_and_css_loader 
Updated less-loader and css-loader libraries
 2023-01-04 14:01:03 -08:00
snipe 7123e7327f Updated less-loader and css-loader libraries 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 14:00:04 -08:00
snipe b36e81836f
Merge pull request #12306 from snipe/fixes/weird_sentence_in_translations 
Fixed incomplete sentence in translation file for audit interval
 2023-01-04 13:57:14 -08:00
snipe b77d5801fa English is hard, apparently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-04 13:56:16 -08:00
snipe 818db58a7b
Merge pull request #12305 from uberbrady/fix_license_seat_reporting 
Fixed: Change license_seat changing method to properly 'true up' license seats
 2023-01-04 13:22:03 -08:00
Brady Wetherington c4f900e9af Change license_seat changing method to properly 'true up' license seats 2023-01-04 13:02:53 -08:00
snipe baf14c43ee
Merge pull request #12298 from snipe/fixes/db_seeder_company_id 
Fixed db seeder when company id is not present
 2023-01-03 14:50:25 -08:00
snipe fa439a1928 Check that the array key exists before trying to seed it 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-03 14:45:23 -08:00
snipe d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator 
Added: validation for department names at Company locations
 2022-12-22 11:29:12 -08:00
snipe 6d3c5e0659
Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories 
Added: notes to the accessories tab for user detail view
 2022-12-21 19:04:11 -08:00
snipe c49d69c911 Merge branch 'develop' 2022-12-20 17:27:17 -08:00
snipe 685cc86d71 Sets the ldap_default_group field to nullable and default null 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-20 17:24:01 -08:00