DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
14381 commits 90 branches 265 tags 290 MiB
Commit graph

14381 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 276950072f This may be more work than we want to do here tbh 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 14:14:40 +01:00
snipe 52344c5574 Better 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 13:02:22 +01:00
snipe 8cfca8bff7 Ack 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 12:56:28 +01:00
snipe f400b38c9c First stab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 11:53:30 +01:00
snipe ee589ca112
Merge pull request #15088 from mauro-miatello/develop 
Added EULAs in print user's assets
 2024-07-18 09:09:34 +01:00
snipe 1eb16cdb02
Merge pull request #15111 from marcusmoore/fixes/optimize-test 
Undo `optimize` command in test after it is completed
 2024-07-17 21:03:01 +01:00
Marcus Moore a56f3f85f8
Clear the config and route caching done by optimize command after test 2024-07-17 12:21:46 -07:00
snipe 239824681d
Merge pull request #15075 from akemidx/checkintranslation 
FIXED: Missing Translation on a Tooltip
 2024-07-17 18:16:02 +01:00
snipe 0ac82fbbe1
Merge pull request #15084 from snipe/fixes_ldap_sync_locale 
Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`
 2024-07-17 18:15:32 +01:00
snipe 8c5a9fa38f
Merge pull request #15089 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.5 
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5
 2024-07-17 16:47:28 +01:00
snipe 65dcb2a9bd
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page 
Small layout tweaks to oauth page
 2024-07-16 21:36:17 +01:00
snipe a0d461d3e2
Merge pull request #15099 from snipe/fixes/15094_wrong_translation_string 
Fixed #15094 - wrong translation string for model on checkout
 2024-07-16 17:23:46 +01:00
snipe eb9e276ba7 Fixed #15094 - wrong translation string for model on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 17:14:13 +01:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
dependabot[bot] 0ddb447c4c
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5 
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.4.1 to 4.4.5.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.4.1...v4.4.5)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-15 08:39:24 +00:00
MrM e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
snipe 2d1aeca949 Re-use existing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:24:56 +01:00
snipe e06e4db4b7 Small layout tweaks to oauth page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 18:16:03 +01:00
snipe 51242fcbb2 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-13 16:09:03 +01:00
snipe 99be9ddb47 Add @dbakan as a contributor 2024-07-13 16:08:56 +01:00
snipe be4317361d
Merge pull request #15082 from dbakan/fix/optimize-command 
Fixed #10224: fix route names for optimize command
 2024-07-13 16:08:32 +01:00
Daniel Albertsen a175b6a38b fix routes and tests 2024-07-13 16:36:14 +02:00
Daniel Albertsen 431da6c903 add test to ensure artisan optimize works 2024-07-13 16:36:14 +02:00
snipe ab6b8f520e Fixed field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:25:37 +01:00
snipe 24e58d1455 Do not update users who already exist since that locale may have been overirrden manually 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:20:04 +01:00
snipe f91ad6b2db Use app()->getLocale() to determine imported user’s language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:44 +01:00
snipe eed253bd2f Use app helped instead of facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:18 +01:00
snipe b68fcf1de5 Added unaccepted asset test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 12:19:40 +01:00
snipe d21ebc6f0d Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 11:04:56 +01:00
akemidx ad818cf886 missing translation 2024-07-11 17:13:47 -04:00
snipe fb7d533ff7
Merge pull request #15073 from marcusmoore/feature/livewire-url-prefix 
Allow setting a prefix for Livewire's update and asset urls
 2024-07-11 21:04:50 +01:00
Marcus Moore 9dd3827222
Allow setting a prefix for Livewire's update and asset urls 2024-07-11 12:43:29 -07:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
snipe 5132aa0254 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 19:07:30 +01:00
snipe aebe96913a Add @FlorentDotMe as a contributor 2024-07-11 17:31:20 +01:00
snipe 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets 
Fixed inconsistent attributes order in Print All Assigned report
 2024-07-11 17:30:41 +01:00
snipe c5c5ac58e5
Merge pull request #15071 from snipe/fixes/small_consumables_optimizations 
Small consumables optimizations
 2024-07-11 17:27:41 +01:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe c2fe3b5459 Use the observer to delete associated files and detach users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:38 +01:00
snipe d4a66f9b6c Use better icon for deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:12 +01:00
snipe 23f1489b2b Added history tab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:46:49 +01:00
snipe 5108b1f3ed Capture the log meta for what was changed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:35:16 +01:00
snipe 58bc84436c Fixed incorrect jquery validation class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:41 +01:00
snipe 00d7b36c36 Eager load suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:22 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:04 +01:00
snipe 42dbc894e0 Better handle numRemaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:21:45 +01:00
snipe 94bfe7d9c8 Require the user exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:42 +01:00
snipe d9a114090b Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:33 +01:00
snipe b10441c928 Detach associated pivot records 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:01:18 +01:00