|
|
5950ec27ab
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-05-03 13:49:36 -07:00 |
|
|
|
cd6f6ee8ff
|
Bumped version to 6.1.1-pre
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 13:47:46 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ea17fdeba5
|
Merge pull request #12846 from snipe/features/livewire_location_import
Location importer via Livewire Importer
|
2023-05-03 11:02:06 -07:00 |
|
|
|
f5cd58e9b7
|
Unmix return type variables
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:57:02 -07:00 |
|
|
|
da4841987e
|
Use translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:55:30 -07:00 |
|
|
|
4a643c1252
|
Merge pull request #12880 from Godmartinz/asset_total_cost
Added component costs to asset view
|
2023-05-03 10:49:03 -07:00 |
|
|
|
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 |
|
|
|
577fff7d65
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:45:36 -07:00 |
|
|
|
79a27085c9
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2023-05-03 10:43:45 -07:00 |
|
|
|
27600e1553
|
Snyk webpack upgrade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:43:05 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
466c2fd47c
|
Merge pull request #12966 from Godmartinz/bug/sc-23161
fixed color differences in dark themes
|
2023-05-03 10:38:54 -07:00 |
|
|
|
87d1a82e35
|
moar changes to red
|
2023-05-02 15:15:02 -07:00 |
|
|
|
1d494252ef
|
corrections for dark red
|
2023-05-02 14:05:29 -07:00 |
|
|
|
786e8deb91
|
removed dead space
|
2023-05-02 13:54:14 -07:00 |
|
|
|
0a3cb5286d
|
fixes dark red
|
2023-05-02 12:37:05 -07:00 |
|
|
|
f91e76e0f2
|
fixes dark blue and btn-warning bg
|
2023-05-02 12:33:40 -07:00 |
|
|
|
af2f288286
|
fixes dark orange theme
|
2023-05-02 12:17:22 -07:00 |
|
|
|
5de30db0a9
|
fixes dark green theme
|
2023-05-02 12:10:55 -07:00 |
|
|
|
48ef8443f5
|
Restrict PHP to >=7.4.3 <8.2
|
2023-05-02 12:01:09 -07:00 |
|
|
|
47370da924
|
adds fixes to dark black theme
|
2023-05-02 11:08:37 -07:00 |
|
|
|
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 |
|
|
|
7711938f4b
|
fixes dark yellow
|
2023-05-01 16:27:21 -07:00 |
|
|
|
f7d2b62d87
|
Improve method name
|
2023-05-01 16:06:28 -07:00 |
|
|
|
da08f6ef8c
|
Add InteractsWithSettings trait to required tests
|
2023-05-01 16:05:26 -07:00 |
|
|
|
6d594faae7
|
Clear the settings cache on app destruction
|
2023-05-01 16:04:43 -07:00 |
|
|
|
6936d76661
|
Prevent hard fail when retrieving acceptance data
|
2023-05-01 16:50:18 -06:00 |
|
|
|
1b2d830380
|
Check if model exists before create asset via API
|
2023-05-01 16:05:03 -06:00 |
|
|
|
609b1646e9
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:40:52 -07:00 |
|
|
|
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 |
|
|
|
77b51136cf
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:38:19 -07:00 |
|
|
|
0222a922a1
|
Added tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:20:23 -07:00 |
|
|
|
8ad600085a
|
Moved external link icon into link
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:17:56 -07:00 |
|
|
|
7fdbc10122
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-29 13:49:14 -07:00 |
|
|
|
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 |
|
|
|
aa814cf761
|
Fixed #12946 - warranty lookup url was not nullable
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-29 13:47:52 -07:00 |
|
|
|
3cae32b236
|
Eager load default locations
|
2023-04-27 17:13:09 -07:00 |
|
|
|
429c4cb99f
|
Remove the loading of asset maintenances that are not used by view
|
2023-04-27 17:12:53 -07:00 |
|
|
|
e250d4c884
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-27 17:00:29 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b001f6771d
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-27 16:28:42 -07:00 |
|
|
|
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 |
|
|
|
567e19bcc0
|
Added missing case for licenses for item_count
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-27 16:26:50 -07:00 |
|
|
|
67a2b796a4
|
requested edits
|
2023-04-27 19:19:53 -04:00 |
|
|
|
1384ca658a
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-26 18:42:58 -07:00 |
|
