DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9391 commits 101 branches 268 tags 320 MiB
Commit graph

9391 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 7a19da4f64 Removed unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
Ivan Nieto Vivanco 07f501408f Add migration to fix already escaped formats in the database 2023-02-15 11:33:08 -08:00
Ivan Nieto Vivanco 53e449899b Remove e() function from customfield format input 2023-02-15 11:33:08 -08:00
Godfrey M b2f1ca95df missing things like mr magoo 2023-02-15 11:33:08 -08:00
Godfrey M f3ab384e70 simplified to an else instead of elseif 2023-02-15 11:33:08 -08:00
Godfrey M 61bf1e91e7 adds the red x icon to a false deployable status 2023-02-15 11:33:08 -08:00
Godfrey M 1c54feea5b adds a red icon next to broken- not fixable status label 2023-02-15 11:33:08 -08:00
Marcus Moore 7423570e6b Add comment 2023-02-15 11:33:08 -08:00
Marcus Moore b946a6066d Use name if provided by asset checkout request 2023-02-15 11:33:07 -08:00
Marcus Moore 9c25dd4eb6 Improve error message wording 2023-02-15 11:33:07 -08:00
Marcus Moore e69fcf10b7 Use translation strings for importer exceptions 2023-02-15 11:33:07 -08:00
akemidx 937e2813e9 fixing external if statement 2023-02-15 11:33:07 -08:00
akemidx a84081068d functionality to Apple Warranty link 2023-02-15 11:33:07 -08:00
akemidx d9857d955b translations for the layout setup 2023-02-15 11:33:07 -08:00
akemidx 66251bfd8a sweedish chef fixes up your typos 2023-02-15 11:33:07 -08:00
akemidx 677f7a446e manufacturer marker removal 2023-02-15 11:33:07 -08:00
Marcus Moore fdce6f98ff Return 422 instead of 500 when import is invalid 2023-02-15 11:33:07 -08:00
Marcus Moore 5a00685c81 Fix return type 2023-02-15 11:33:07 -08:00
Marcus Moore 18f0b1cc3d Formatting 2023-02-15 11:33:07 -08:00
Marcus Moore 6da43bc940 Catch json encoding exceptions and display them to the user 2023-02-15 11:33:07 -08:00
Ivan Nieto Vivanco 98187773f7 Adds translation strings to theinventory report sent to users 2023-02-15 11:33:07 -08:00
snipe 2dd7690d2d
Merge pull request #12464 from snipe/dependabot/github_actions/docker/build-push-action-4 
Bump docker/build-push-action from 3 to 4
 2023-02-13 14:45:21 -08:00
snipe 201728989f
Merge pull request #12486 from svpernova09/patch-1 
Don't auto assign feature requests to Snipe
 2023-02-08 07:59:58 -08:00
Joe Ferguson dea175bd40
Don't auto assign feature requests to Snipe 2023-02-08 09:57:54 -06:00
snipe 23b1e8da27 Merge remote-tracking branch 'origin/develop' 2023-02-07 18:46:30 -08:00
snipe e883a61a48
Merge pull request #12480 from snipe/fixes/ui_fix_for_user_files 
Fixed UI bug where download button was missing for non-images
 2023-02-07 18:46:07 -08:00
snipe 16fcc6dc44 Fixed UI bug where download button was missing for non-images 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 18:40:00 -08:00
snipe 4f9587da57 Merge remote-tracking branch 'origin/develop' 2023-02-07 13:34:57 -08:00
snipe 4b2d35e05d
Merge pull request #12474 from snipe/fixes/destroy_method_for_fieldsets 
Fixed mismatched field/fieldset
 2023-02-07 13:33:38 -08:00
snipe c1d484b5df Fixed mismatched field/fieldset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 13:31:50 -08:00
dependabot[bot] ea0f505db7
Bump docker/build-push-action from 3 to 4 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
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>
 2023-02-06 08:07:13 +00:00
snipe b37c4553ef Merge remote-tracking branch 'origin/develop' 2023-02-02 23:41:05 -08:00
snipe b0f4015bb4
Merge pull request #12459 from snipe/fixes/broken_route_in_deleted_models 
Updated model restore route
 2023-02-02 23:40:39 -08:00
snipe dc414d3552 Updated model restore route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 23:38:59 -08:00
snipe 41b0756286 Merge remote-tracking branch 'origin/develop' 2023-02-02 15:35:41 -08:00
snipe f9ef49f886
Merge pull request #12457 from snipe/fixed/regression_on_field_associations 
Fixed regression in fieldset -> field association
 2023-02-02 15:35:22 -08:00
snipe 51f3857a31 Fixed something I think I broke 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 15:32:45 -08:00
snipe bbf6e5e69e
Merge pull request #12421 from akemidx/hardware_blades_translations 
Fixed: translations added for the hardware blades
 2023-02-02 13:02:46 -08:00
akemidx 37ce68af5b once again fixing an apostrophe 2023-02-02 15:54:05 -05:00
snipe 1f60afa8e3 Merge remote-tracking branch 'origin/develop' 2023-02-02 11:28:41 -08:00
snipe 64aea8d374
Merge pull request #12456 from snipe/features/add_notes_to_user_history 
Fixed #12449 - Added checkout/checkin  note to user history
 2023-02-02 11:28:08 -08:00
snipe 7344bbdd7f Added checkout/checkin note to user history 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 11:26:33 -08:00
snipe 782abe1cf3 Merge remote-tracking branch 'origin/develop' 2023-02-02 11:09:18 -08:00
snipe 2d3318feb6
Merge pull request #12454 from snipe/fixes/fixed_500_when_userfile_does_not_exisy 
Handle missing userfiles more gracefully
 2023-02-02 11:08:54 -08:00
snipe 78dca7fd32 Handle missing userfiles more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-02 10:49:36 -08:00
snipe 2a8851bbd7
Merge pull request #12342 from marcusmoore/fix/dusk-test-suite 
Fixed Dusk Test Suite
 2023-02-02 09:50:34 -08:00
snipe 4bc804e876 Merge remote-tracking branch 'origin/develop' 2023-02-01 16:50:19 -08:00
snipe 2997de2a66
Merge pull request #12445 from snipe/fixes/exit_out_ldap 
Added an exit for the LDAP disabled sync short-circuit
 2023-02-01 16:48:00 -08:00
snipe 0cfeab8c50 Added an exit for the LDAP disabled sync short-circuit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:46:58 -08:00
snipe c706759b5c Merge remote-tracking branch 'origin/develop' 2023-02-01 16:42:11 -08:00