ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,777 Commits 84 Branches 293 Tags
21ff0e748c46a5c4acdff3cc6f41bae791b9f7b2
Commit Graph

13777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brady Wetherington 21ff0e748c Got a chunk of Custom Fields for Users worked out, still needs cleanup 2024-06-06 13:45:35 +01:00
Brady Wetherington d2b7828569 This is a squashed branch of all of the various commits that make up the new HasCustomFields trait. 
This should allow us to add custom fields to just about anything we want to within Snipe-IT.

Below are the commits that have been squashed together:

Initial decoupling of custom field behavior from Assets for re-use

Add new DB columns to Custom Fields and fieldsets for 'type'

WIP: trying to figure out UI for custom fields for things other than Assets, find problematic places

Real progress towards getting to where this stuff might actually work...

Fix the table-name determining code for Custom Fields

Getting it closer to where Assets at least work

Rename the trait to it's new, even better name

Solid progress on the new Trait!

WIP: HasCustomFields, still working some stuff out

Got some basics working; creating custom fields and stuff

HasCustomFields now validates and saves

Starting to yank the other boilerplate code as things start to work (!)

Got the start of defaultValuesForCustomField() working

More progress (squash me!)

Add migrations for default_values_for_custom_fields table

WIP: more towards hasCustomFields trait

Progress cleaning up the PR, fixing FIXME's

New, passing HasCustomFieldsTrait test!

Fix date formatter helper for custom fields

Fixed more FIXME's
 2024-06-06 13:35:38 +01:00
snipe e19d2d6ec9 Merge pull request #14832 from snipe/fixes/added_consumables_to_inventory_email 
Fixed #14812 - added consumables to individual inventory report
 2024-06-05 20:42:35 +01:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +01:00
snipe de7b8940fe Merge pull request #14828 from fe80/fix/controller-signature-s3 
fix(ActionlogController): add missin class Illuminate\Support\Facades…
 2024-06-05 09:58:03 +01:00
fe80 ea7c3c8485 fix(ActionlogController): add missing class Illuminate\Support\Facades\Storage 2024-06-05 10:55:27 +02:00
snipe bc36c8074e Merge pull request #14807 from bryanlopezinc/AddTestToCheckEnvVisibility 
Added test for .env visibility for setup page
 2024-06-05 09:50:54 +01:00
snipe fa083098fc Merge pull request #14819 from snipe/localization/new_strings_2024_06_03 
Updated strings
 2024-06-05 09:46:41 +01:00
snipe 7688c437c0 Merge pull request #14824 from Godmartinz/select-2-redirect-fix 
Fixed select 2 Behavior
 2024-06-05 09:46:25 +01:00
snipe 697ac83040 Merge pull request #14825 from marcusmoore/chore/test-organization 
Re-organized test suite
 2024-06-05 09:46:08 +01:00
snipe a742105c21 Merge pull request #14827 from fe80/fix/controller-signature-s3 
fix(ActionlogController): correct signature image for s3 bucket
 2024-06-05 09:40:21 +01:00
fe80 7a76ec9e02 fix(ActionlogController): correct signature image for s3 bucket 2024-06-05 10:08:15 +02:00
Marcus Moore e98c3f92c1 Update domain name 2024-06-04 10:49:29 -07:00
Marcus Moore d202dfc225 Organize API tests into domains 2024-06-04 10:48:53 -07:00
Godfrey M 6202f6157a fix select2 behavior 2024-06-04 08:41:00 -07:00
Marcus Moore b1e8e5389b Make most test names singular 2024-06-03 16:54:59 -07:00
Marcus Moore 95f6381da4 Update tests names to VerbNounTest 2024-06-03 16:53:15 -07:00
Marcus Moore b07e3b4a91 Remove API from test class name 2024-06-03 16:50:56 -07:00
Marcus Moore 86bd9a2674 Move test method to existing test 2024-06-03 16:49:44 -07:00
Marcus Moore 29a36839aa Move existing API checkin and checkout tests under domain directory 2024-06-03 16:29:53 -07:00
snipe 85cb7c92e7 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 20:44:40 +01:00
snipe a6f19a1657 docs: add @U-H-T as a contributor 2024-06-03 17:06:43 +01:00
snipe 6229d0c616 Merge pull request #14758 from U-H-T/features/add_logo_support_for_Brother_TZe24 
add logo support for Brother TZe24mm labels
 2024-06-03 17:02:18 +01:00
snipe bc6c969f21 Merge pull request #14814 from snipe/dependabot/github_actions/develop/crowdin/github-action-2 
Bump crowdin/github-action from 1 to 2
 2024-06-03 16:58:10 +01:00
dependabot[bot] f767a94c84 Bump crowdin/github-action from 1 to 2 
Bumps [crowdin/github-action](https://github.com/crowdin/github-action) from 1 to 2.
- [Release notes](https://github.com/crowdin/github-action/releases)
- [Commits](https://github.com/crowdin/github-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: crowdin/github-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-03 08:18:51 +00:00
bryanlopezinc 89e50b94d3 Fix Failing sqlite test 2024-06-03 08:09:05 +01:00
snipe c4d97d095f Merge pull request #14809 from snipe/features/more_tests 
Added a few more tests
 2024-06-01 04:25:19 +01:00
snipe 67fb3f10d5 Tightened up tests with better checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:24:47 +01:00
snipe ea8d390596 MOAR TESTS 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:09 +01:00
snipe cff382605c Fixed some missing strings and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:04 +01:00
snipe 52af8afac2 Added company scoping test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 03:10:29 +01:00
snipe 03b0268dc2 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 03:00:45 +01:00
snipe c09e93e288 Updated delete users API tests, moved non-API tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 02:59:04 +01:00
snipe 694e3b7f3a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 00:42:16 +01:00
snipe 46be0f6610 Merge pull request #14808 from snipe/fixes/small_redirect_tweaks 
Small UI tweaks and redirects when asset model is invalid
 2024-05-31 20:46:07 +01:00
snipe dd0a16c3d5 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 20:42:32 +01:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe 3005565bba Slight tweak to language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:12 +01:00
snipe cf45e7536f Redirect with error if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:51:58 +01:00
snipe 1d97d95c10 UI and styling tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:34 +01:00
snipe 4a1b1675cb Use storage helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:09 +01:00
snipe 8c5249ba4b Disable buttons on view page if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:53 +01:00
snipe b936591240 Warn and disable on checkout if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:34 +01:00
snipe 76e664d647 Warn and disable the checkout button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:18 +01:00
snipe 0253c2a756 Lauout tweaks, warn and disable button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:57 +01:00
snipe d27613f55c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:41 +01:00
snipe ca8d478e87 Redirect if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:32 +01:00
bryanlopezinc c63c17d49f Added test for .env visibility for setup page 2024-05-31 17:33:57 +01:00
snipe 45cfec5b29 Merge pull request #14797 from bryanlopezinc/AddTestsForSettings 
Added test for setup page
 2024-05-31 02:31:35 +01:00
snipe ee8931f886 Merge pull request #14799 from marcusmoore/chore/remove-unused-component 
Removed unused Livewire component
 2024-05-31 00:54:43 +01:00