DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14352 commits 97 branches 266 tags 291 MiB
Commit graph

14352 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Godfrey M eda2eb2283 fixes all dark modes 2024-06-25 10:24:35 -07:00
Godfrey M a7123a04ba fixes importer background color 2024-06-25 10:19:18 -07:00
Marcus Moore 8a562f1d15
Bump Livewire to 3.5.1 2024-06-25 10:16:44 -07:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe 8971cc4b8b
Merge pull request #14963 from snipe/fixes/updated_translation_string 
Added avif to translation string
 2024-06-25 13:45:10 +01:00
snipe bca6dd41d2 Added avif to translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-25 13:39:36 +01:00
snipe 221c4eeb0c Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 21:59:27 +01:00
snipe bbb1fbfbe8 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 21:59:09 +01:00
snipe 5a874a90ac
Merge pull request #14951 from snipe/features/disallow_profile_editing 
Added ability to disallow profile editing
 2024-06-24 14:11:48 +01:00
snipe 1c14c2fdef Added gates to controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:05:21 +01:00
snipe 73a038afd4 Save new setting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:03:01 +01:00
snipe 4d55765e28 Added checkbox to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:53 +01:00
snipe 2b43f3cb84 Added gate to auth service provider 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:40 +01:00
snipe 52c4885335 Added method for checking if the user can edit their own profile 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:17 +01:00
snipe aa5fe52e89 Added gate in blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:56 +01:00
snipe ce107dd688 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:39 +01:00
snipe 72affd7a5b Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:31 +01:00
snipe ba4c51dd68 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:25 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe a846afe733
Merge pull request #14950 from snipe/localization/updated_strings_20240621 
Updated translations
 2024-06-24 11:44:06 +01:00
snipe 5fb3cea0bb Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:41:20 +01:00
snipe 4ae89c23cd
Merge pull request #14947 from snipe/dependabot/github_actions/develop/docker/build-push-action-6 
Bump docker/build-push-action from 5 to 6
 2024-06-24 11:27:04 +01:00
snipe 3d32fe662b
Merge pull request #14949 from snipe/fixes/depreciation_format 
Check that there is a depreciation date before formatting
 2024-06-24 11:11:43 +01:00
snipe 468674a517 Check that there is a depreciation date before formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:07:41 +01:00
dependabot[bot] ebe4354a85
Bump docker/build-push-action from 5 to 6 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 08:14:34 +00:00
snipe f47bc5ea7d Updated hardware checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 19:40:52 +01:00
snipe 427615f627 Fiest start at switching to regular html labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 18:24:23 +01:00
snipe 829b560794
Merge pull request #14941 from snipe/updates/updated_phpunit 
Updated PHPunit
 2024-06-23 17:43:29 +01:00
snipe f97a15c5c3 Updated PHPunit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 17:33:01 +01:00
snipe 25fcf523e3
Merge pull request #14937 from snipe/fixes/user_improvements 
Fixed #14935 - improvements and more tests around user deletion
 2024-06-22 21:41:07 +01:00
snipe c1be94c4ad Added another base test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:37:49 +01:00
snipe 3a05d72124 Based restore API test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:35:40 +01:00
snipe 7ec44e46ce Added ability check for restoring users at all 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:35:28 +01:00
snipe 060b17df01 Pulled duplicated test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:34:49 +01:00
snipe 74c78d7577 Added back in commented out test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:09:04 +01:00
snipe 1ef0c1adac Fixed tests! And added more!! 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:07:46 +01:00
snipe c2e649e2bf Fixed small permissions issue 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:07:37 +01:00
snipe 196db9718e Use class name instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:55:58 +01:00
snipe 9f5b264e04 Normalize the tests between UI and API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:51:56 +01:00
snipe 3825f5fb61 Added more permissions tests to user delete UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:47:59 +01:00
snipe e60dbc883c Removed test code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:42:34 +01:00
snipe bbbfa91db9 Fixed wonky rule 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:40:26 +01:00
snipe 5ec8e2da66 Breaking tests :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:44 +01:00
snipe 9e59bd5687 Cleaned up controller code a bit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:36 +01:00
snipe 1d26ccac4e Check for the additional auth for that user 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:06 +01:00
snipe 0e2526f627 Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:32:49 +01:00
snipe dd9e9c7a6d Fixed return types 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:49:49 +01:00
snipe e19922abd0 Cleaned up UI controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:49:35 +01:00
snipe d27bde6047 Added deleted factory for tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:36:24 +01:00