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

11054 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 5de30db0a9 fixes dark green theme 2023-05-02 12:10:55 -07:00
Marcus Moore 48ef8443f5
Restrict PHP to >=7.4.3 <8.2 2023-05-02 12:01:09 -07:00
Godfrey M 47370da924 adds fixes to dark black theme 2023-05-02 11:08:37 -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
akemidx 2cb1545b83 removing route 2023-05-01 19:51:52 -04: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
Godfrey M 7711938f4b fixes dark yellow 2023-05-01 16:27:21 -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
Ivan Nieto Vivanco 6936d76661 Prevent hard fail when retrieving acceptance data 2023-05-01 16:50:18 -06:00
Ivan Nieto Vivanco 1b2d830380 Check if model exists before create asset via API 2023-05-01 16:05:03 -06:00
akemidx ad7a1d6c3b edits from Github comments 2023-05-01 15:50:48 -04:00
snipe 609b1646e9 Merge remote-tracking branch 'origin/develop' 2023-04-30 18:40:52 -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 77b51136cf Merge remote-tracking branch 'origin/develop' 2023-04-30 18:38:19 -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 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
akemidx 1c60d686bd Merge remote-tracking branch 'origin/delete_asset_from_view_page' into delete_asset_from_view_page 
# Conflicts:
#	resources/views/hardware/view.blade.php
 2023-04-27 19:08:51 -04:00
akemidx cd389368f7 adding in script 2023-04-27 19:00:17 -04:00
akemidx d3675831bb snippet rewrite 2023-04-27 18:58:59 -04:00
akemidx 84134b45e6 form work 2023-04-27 18:58:59 -04:00
akemidx b1e68be545 delete button progress 2023-04-27 18:58:59 -04:00
akemidx d94bed3f57 push for testing 2023-04-27 18:58:59 -04:00
akemidx aabcf22b40 commiting 2023-04-27 18:58:59 -04:00
akemidx af549a0be9 Mock Up of the Buttons 2023-04-27 18:58:59 -04:00
Brady Wetherington 381890b578 Merge branch 'develop' into laravel_v9 2023-04-27 13:56:04 -07: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