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

10715 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 7fdbc10122 Merge remote-tracking branch 'origin/develop' 2023-04-29 13:49:14 -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
Marcus Moore 3cae32b236
Eager load default locations 2023-04-27 17:13:09 -07:00
Marcus Moore 429c4cb99f
Remove the loading of asset maintenances that are not used by view 2023-04-27 17:12:53 -07:00
snipe e250d4c884 Merge remote-tracking branch 'origin/develop' 2023-04-27 17:00:29 -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 b001f6771d Merge remote-tracking branch 'origin/develop' 2023-04-27 16:28:42 -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
snipe 1384ca658a Merge remote-tracking branch 'origin/develop' 2023-04-26 18:42:58 -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 7bffe30fae Merge remote-tracking branch 'origin/develop' 2023-04-26 17:55:48 -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 27de5c62c5 Merge remote-tracking branch 'origin/develop' 2023-04-26 15:15:43 -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 75fdd0ac96 Merge remote-tracking branch 'origin/develop' 2023-04-26 09:54:44 -07: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 12cc576b52 Merge remote-tracking branch 'origin/develop' 2023-04-25 23:41:45 -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 42f0975414 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-25 22:19:27 -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 9529cd8235
Merge pull request #12891 from snipe/snyk-upgrade-38ca074c3dd0aada16ad8b85f20ebaa8 
[Snyk] Upgrade bootstrap-table from 1.21.3 to 1.21.4
 2023-04-25 22:04:40 -07:00
snipe fcddd0827c
Merge pull request #12888 from snipe/snyk-upgrade-4c8ffc584b299eb1e71d6be555624f4e 
[Snyk] Upgrade webpack from 5.76.2 to 5.77.0
 2023-04-25 22:03:49 -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