DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14843 commits 97 branches 267 tags 296 MiB
Commit graph

14843 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe cd6f6ee8ff Bumped version to 6.1.1-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 13:47:46 -07:00
akemidx 526c089424 Buttons on the accessory view page 2023-05-03 16:40:06 -04:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
akemidx 12f0c42545 buttons added 2023-05-03 16:31:56 -04:00
slong753 815c77f943 wip 2023-05-03 14:49:31 -05:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset 
Fixed Error 500 after sign and accept asset
 2023-05-03 11:43:14 -07:00
akemidx 889be83762 replacing route. sorry! 2023-05-03 14:14:18 -04:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import 
Location importer via Livewire Importer
 2023-05-03 11:02:06 -07:00
snipe f5cd58e9b7 Unmix return type variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:57:02 -07:00
snipe da4841987e Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:55:30 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe cdbd68012f
Merge pull request #12878 from joelpittet/patch-2 
Use environment variable and default to PHP's sendmail_path
 2023-05-03 10:48:39 -07:00
snipe 577fff7d65 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:45:36 -07:00
snipe 79a27085c9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-05-03 10:43:45 -07:00
snipe 27600e1553 Snyk webpack upgrade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:43:05 -07:00
snipe 914b2658cc
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report 
Remove the loading of asset maintenances that are not used by view
 2023-05-03 10:41:52 -07:00
snipe 6a12d5d9a0
Merge pull request #12964 from marcusmoore/fixes/restrict-php-version 
Restrict PHP version to <8.2
 2023-05-03 10:40:52 -07:00
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
snipe 466c2fd47c
Merge pull request #12966 from Godmartinz/bug/sc-23161 
fixed color differences in dark themes
 2023-05-03 10:38:54 -07:00
slong753 cdda4a56d8 aha, ok thisd kind of works 2023-05-02 19:11:43 -05:00
slong753 b2c2097e8b just more troubleshooting stuff, still no solution 2023-05-02 18:54:20 -05:00
Godfrey M 87d1a82e35 moar changes to red 2023-05-02 15:15:02 -07:00
Godfrey M 1d494252ef corrections for dark red 2023-05-02 14:05:29 -07:00
Godfrey M 786e8deb91 removed dead space 2023-05-02 13:54:14 -07:00
Godfrey M 0a3cb5286d fixes dark red 2023-05-02 12:37:05 -07:00
Godfrey M f91e76e0f2 fixes dark blue and btn-warning bg 2023-05-02 12:33:40 -07:00
Godfrey M af2f288286 fixes dark orange theme 2023-05-02 12:17:22 -07:00
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