DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9279 commits 101 branches 268 tags 288 MiB
Commit graph

9279 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe fb10a6f218
Merge pull request #12268 from inietov/fixes/people_count 
Fixed: Dashboard user count scoping when full company support is enabled
 2022-12-20 17:05:18 -08:00
Ivan Nieto Vivanco 3a9b8a4993 Calculate the proper amount of people in the dashboard if Full Company Support is enabled 2022-12-20 18:39:17 -06:00
snipe a6c7471bf5 Merge remote-tracking branch 'origin/develop' 2022-12-20 15:11:36 -08:00
snipe 128c21a905
Merge pull request #12266 from uberbrady/fix-select-all-bug 
Fixed: There was a bug with BS tables' select-all which showed an incorrect list of elements
 2022-12-20 15:09:30 -08:00
Brady Wetherington 75a757d6f5 There was a bug with select-all where some bits didn't quite work 2022-12-20 14:57:58 -08:00
Godfrey M e791e6592a adds notes to the accessories tab under users 2022-12-20 10:37:19 -08:00
Godfrey M 38575e93e8 fixes the rules for adding page-break and padding at the end of document 2022-12-20 09:45:41 -08:00
snipe 88291cadc1
Merge pull request #12254 from akemidx/documentating_something 
Commenting on a scope in Models/Company.php
 2022-12-19 12:41:32 -08:00
snipe cc40ecaa44
Merge pull request #12260 from snipe/dependabot/github_actions/actions/checkout-3.2.0 
Bump actions/checkout from 3.1.0 to 3.2.0
 2022-12-19 12:41:17 -08:00
akemidx 94afe2bc6a edits & typo fixes 2022-12-19 14:48:43 -05:00
dependabot[bot] 25b33d657e
Bump actions/checkout from 3.1.0 to 3.2.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.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.1.0...v3.2.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>
 2022-12-19 08:07:03 +00:00
snipe 399c7590cd
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets 
Fixed 500 when downloading the Unaccepted Assets report  [sc-19555]
 2022-12-15 14:19:41 -08:00
snipe d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column 
Added `purchase_cost` to user's default view [sc-19680]
 2022-12-15 12:42:29 -08:00
akemidx 133d6ffa50 Commenting on a scope in Models/Company.php 2022-12-15 15:18:24 -05:00
Ivan Nieto Vivanco d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
snipe 29c2ff56ec
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled 
Removed extra logging case that was very noisy
 2022-12-15 11:26:49 -08:00
snipe 3e7975b2c3
Merge pull request #12250 from akemidx/grey_out_pw_reset_button 
Fixed: Grey out pw reset button for consistency
 2022-12-15 11:25:53 -08:00
akemidx d870bc3b02 nested if loop 2022-12-15 14:19:51 -05:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00