DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10373 commits 96 branches 267 tags 296 MiB
Commit graph

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 31f1bce16b
Merge pull request #12958 from uberbrady/snipeit_v7_merge_develop_05_01_2022 
Snipeit v7 merge develop 05 01 2022
 2023-05-03 10:40:18 -07:00
Brady Wetherington 2f3ddaec20 Merge branch 'develop' into snipeit_v7 2023-05-01 18:09:12 -07:00
snipe 7cd37e6e95
Merge pull request #12957 from uberbrady/fix_webpack_for_v7 
Fix webpack for v7
 2023-05-01 18:08:46 -07:00
Brady Wetherington a938009074 Rebuilt assets with new Node and node_modules and package.json 2023-05-01 18:06:51 -07:00
Brady Wetherington 21d08ff742 Whoops! Forgot to commit this before 2023-05-01 18:05:06 -07:00
snipe da8b41b12a
Merge pull request #12956 from uberbrady/upgrade_node_and_packages_for_v7 
Updated Node version, and various packages to more recent
 2023-05-01 17:33:20 -07:00
Brady Wetherington 6e031727fa Updated Node version, and various packages to more recent 2023-05-01 17:05:10 -07:00
snipe 63af17da74
Merge pull request #12954 from marcusmoore/fixes/test-suite-fixes 
Clear the settings cache on app destruction
 2023-05-01 16:28:47 -07:00
Marcus Moore f7d2b62d87
Improve method name 2023-05-01 16:06:28 -07:00
Marcus Moore da08f6ef8c
Add InteractsWithSettings trait to required tests 2023-05-01 16:05:26 -07:00
Marcus Moore 6d594faae7
Clear the settings cache on app destruction 2023-05-01 16:04:43 -07:00
snipe 031c9c1204 Added nobr tag to prevent external link icon and link from breaking 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:40:40 -07:00
snipe 0222a922a1 Added tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:20:23 -07:00
snipe 8ad600085a Moved external link icon into link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:17:56 -07:00
snipe 4c27b65d45
Merge pull request #12950 from snipe/fixes/warranty_lookup_validation 
Fixed  #12946 - warranty lookup url was not nullable
 2023-04-29 13:48:54 -07:00
snipe aa814cf761 Fixed #12946 - warranty lookup url was not nullable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-29 13:47:52 -07:00
snipe 8b476e55b6
Merge pull request #12941 from akemidx/feature/sc-23153 
Created At and Updated At fields on License table view
 2023-04-27 16:59:30 -07:00
snipe b76d2973f7
Merge pull request #12928 from snipe/features/make_hashing_work_rounds_an_env 
Env-ify hashing variables, setting the normal defaults
 2023-04-27 16:57:45 -07:00
snipe 956bc41e48
Merge pull request #12942 from snipe/bug/sc-23197 
Added missing case for licenses for item_count
 2023-04-27 16:28:12 -07:00
snipe 567e19bcc0 Added missing case for licenses for item_count 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-27 16:26:50 -07:00
akemidx 67a2b796a4 requested edits 2023-04-27 19:19:53 -04:00
Brady Wetherington 381890b578 Merge branch 'develop' into laravel_v9 2023-04-27 13:56:04 -07:00
snipe e25dc42121 Switch to externalLinkFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:42:34 -07:00
snipe dcb7eadfc7
Merge pull request #12933 from snipe/features/unlink_dynamic_urls_if_variables_used 
Remove auto-link from from manufacturer warranty
 2023-04-26 18:40:33 -07:00
snipe 99ef435d40 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:32:38 -07:00
snipe e853f8b7fd Removed SR text for exporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:23:21 -07:00
snipe deff312381 Remove auto-link from from manufacturer warranty 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:16:23 -07:00
snipe 73d45bb587
Merge pull request #12932 from snipe/features/add_warranty_url_to_mfgs 
Added dynamic warranty URL to manufacturers
 2023-04-26 17:55:03 -07:00
snipe 7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe ef69df2cdf
Merge pull request #12930 from snipe/fixes/added_help_text_to_support_url 
Added help text to the now-dynamic manufacturer URLS
 2023-04-26 15:15:19 -07:00
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 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