DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10470 commits 101 branches 268 tags 288 MiB
Commit graph

10470 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 7c0ef581c5 Added help text to the now-dynamic manufacturer URLS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 15:12:36 -07:00
snipe 0c5837e4a0
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given 
Use the asset tag instead of asset name if no name is given
 2023-04-26 14:49:38 -07:00
snipe 5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
snipe b5b335a2ca Use the asset tag instead of asset name if no name is given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 14:41:19 -07:00
akemidx 497d17835f requested edits 2023-04-26 17:06:08 -04:00
snipe 68417a4c15 Env-ify hashing variables, setting the normal defaults 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 13:01:42 -07:00
akemidx aab53cf683 remove regex, add in starts_with 2023-04-26 15:18:13 -04:00
snipe 4c16dcf5d0
Merge pull request #12922 from snipe/fixes/12918_route_name_for_clone_locations 
Fixed #12918 - wrong route for clone location
 2023-04-26 09:54:18 -07:00
snipe b6889ff399 Fixed #12918 - wrong toite for clone location 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 09:52:13 -07:00
snipe 19554a7dc2
Merge pull request #12917 from snipe/fixes/applies_pr_12868 
Applies #12868 - fixes EOL date on asset creation
 2023-04-25 23:40:43 -07:00
snipe 8f0b823fb3 Applies #12868 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 23:39:32 -07:00
snipe 2299771e10 Add @zacharyfleck as a contributor 2023-04-25 22:37:17 -07:00
snipe 37b881b906 Add @dboth as a contributor 2023-04-25 22:32:45 -07:00
snipe 22d73f503a
Merge pull request #12756 from dboth/develop 
Fixed #8208, #8896, #8985 and #9789:  Currency issues when using non-english locales (resubmission)
 2023-04-25 22:32:13 -07:00
snipe 970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034 
Fixes sending webhook notifications for checkout and checkin
 2023-04-25 22:22:58 -07:00
snipe 17275cbeb8
Merge pull request #12905 from marcusmoore/fixes/checkout-via-artisan 
Fixes where clause operator in artisan checkout command
 2023-04-25 22:21:59 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe 470a36a7c9 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 22:12:56 -07:00
snipe b7632cdbb7 Updated js packages 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 22:12:47 -07:00
snipe c8c6f879d4
Merge pull request #12912 from Godmartinz/ldap_location_sync 
added ldap_location to settings
 2023-04-25 21:54:28 -07:00
snipe 31a3be4c6a Small refactor of HTML, added top submit button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:51:59 -07:00
snipe 27477085fe Merge branch 'develop' into features/auto_add_to_fieldset 2023-04-25 21:31:50 -07:00
snipe 45f22e7561 Updated the sync to disassociate if all boxed are unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:31:23 -07:00
snipe 5759d2c948 Added a check to fail validation if the associated fieldsets are not value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:30:47 -07:00
snipe 15dc4e4779 Added fieldset sync 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:29:57 -07:00
snipe 5eeca937cb Added logic for syncing fieldset info 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:08:26 -07:00
snipe 662b7787a1 Updated redirect return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:07:50 -07:00
snipe 28d9cec1e3 Added auto_add_to_fieldsets to API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:48 -07:00
snipe 67212f9d57 Changed layout, added fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:29 -07:00
snipe 6cd3cfe1ea Added new field to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:57:03 -07:00
snipe 4a063d23b9 We don’t actually use this test? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 19:36:52 -07:00
snipe 705bb7375a
Merge pull request #12914 from marcusmoore/fixes/fix-test-cases 
Fixes state leak between tests
 2023-04-25 17:22:56 -07:00
snipe 4e3ccb74bc Fixed slightly weird padding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:59:19 -07:00
snipe 4954b50280 Added new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:57:46 -07:00
snipe 07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00
snipe 0e73923c24
Merge pull request #12913 from uberbrady/fix_scim_id_string 
Change from a standard Eloquent mapping for ID to a custom setRead
 2023-04-25 12:02:36 -07:00
Marcus Moore a528ebeab0
Use superuser instead of admin state 2023-04-25 11:53:47 -07:00
Brady Wetherington 3da5df0127 Change from a standard Eloquent mapping for ID to a custom setRead 2023-04-25 11:50:55 -07:00
Godfrey M 20d8ff2a4f removed a typo 2023-04-25 11:49:33 -07:00
snipe a7e2182ec9
Merge pull request #12904 from zacharyfleck/develop 
Fixed #8342: Add ARM64 architecture to Docker Builds
 2023-04-25 11:45:27 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Zachary Fleck af0a0276e0
Merge branch 'snipe:develop' into develop 2023-04-25 14:43:41 -04:00
Zachary Fleck ef07f39ccf
remove space 2023-04-25 14:43:34 -04:00
Zachary Fleck aa223359d4
remove space 2023-04-25 14:42:09 -04:00
snipe efc0929bbc
Merge pull request #12910 from snipe/fixes/finer_permissions_for_bulk_assets 
Added more granular permissions on bulk actions for assets
 2023-04-25 08:09:30 -07:00
snipe 66ce02fc48 Added permission on restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:09:16 -07:00
snipe 6e7f0728fd Added more granular permissions on bulk actions for assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:06:45 -07:00
Marcus Moore b4f162f316
Fix operator in where clause 2023-04-24 17:26:06 -07:00
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
zacharyfleck 63ade327a5
add ARM64 architecture 2023-04-24 16:24:44 -04:00