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

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington 4dda28de9e WIP: cleaning up LDAP 2021-10-28 18:19:50 -07:00
snipe e932cdf106
Merge pull request #9799 from Toreg87/fixes/fmcs_departments 
Fixed #9798: Scope departments for FullMultipleCompanySupport
 2021-10-28 18:18:16 -07:00
Brady Wetherington 31933a56fa Trying to get the login screen working 2021-10-28 18:18:11 -07:00
snipe ea0d92c439
Merge branch 'develop' into fixes/fmcs_departments 2021-10-28 18:18:08 -07:00
snipe 5458e44a40
Merge pull request #9508 from sh1hab/feature/remove_deleted_user_from_unaccepted_assets_report 
Feature #9378 remove deleted user from unaccepted assets report
 2021-10-28 18:11:19 -07:00
snipe d36849bd41
Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report 2021-10-28 18:11:03 -07:00
snipe 84a3a85823 Fixed parse error for merge conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 18:04:03 -07:00
snipe 798f6d65de
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self 
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
 2021-10-28 17:53:24 -07:00
snipe 76cc46c419
Merge pull request #9814 from 01ste02/importMinAmt 
Improved Consumable Import: Import min_amt for consumables
 2021-10-28 17:49:44 -07:00
snipe d54434fdf7
Merge pull request #9541 from misilot/change-var-aws-public-url 
Change from ENV to config value for PUBLIC_AWS_URL
 2021-10-28 17:46:25 -07:00
snipe bdf321ecc9
Merge branch 'develop' into change-var-aws-public-url 2021-10-28 17:46:16 -07:00
snipe dc71f6ddc6
Merge pull request #9871 from jethron/patch-1 
Fixed: double slashes in branding logo URL path
 2021-10-28 17:36:43 -07:00
snipe 3ede7c7f18 Use icon and string for maintained value in license view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 17:26:03 -07:00
snipe 2d782cd31f Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-10-28 17:20:27 -07:00
snipe 645529ba78
Merge pull request #9889 from ncareau/api-licenses 
Add licenses api parameters and fix a missing variable in license view.
 2021-10-28 17:20:09 -07:00
snipe 7470fdb605
Merge pull request #9912 from snipe/snyk-upgrade-1377cc2d38a76585c814757398543f5f 
[Snyk] Upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26
 2021-10-28 17:15:10 -07:00
snipe 636dc6877b
Merge pull request #10113 from Godmartinz/bug/sc-17129/v6-integration-pie-chart-disappears-if-you 
Fixed #sc17129 - Pie chart disappears when window resizes
 2021-10-28 17:14:14 -07:00
snipe 3951de1669
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you 2021-10-28 17:13:37 -07:00
snipe 930e220cf1
Merge pull request #9915 from snipe/snyk-upgrade-b2b26cf8ec7a697fe0094f699652a345 
[Snyk] Upgrade bootstrap-table from 1.18.2 to 1.18.3
 2021-10-28 17:12:47 -07:00
snipe 2f9e5f79af
Merge pull request #10139 from FliegenKLATSCH/patch-1 
API: Do not include deleted items per default on lookup by serial
 2021-10-28 17:09:20 -07:00
snipe 3088230236
Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets 
Fixes Bug: When parent asset is assigned to other location, children assets loca…
 2021-10-28 16:49:44 -07:00
snipe 984bc501a5
Merge pull request #9906 from Toreg87/fixes/advanced_search_serial_v2 
Fixed #9904: Advanced search with serial and another field produce incorrect results (v2)
 2021-10-28 16:42:32 -07:00
snipe 371a39a118
Merge branch 'develop' into fixes/advanced_search_serial_v2 2021-10-28 16:42:10 -07:00
snipe d3d199efc3 Add @PlaneNuts as a contributor 2021-10-28 16:39:28 -07:00
snipe 7821d38e60
Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance 
Fixes asset components must return relationship instance
 2021-10-28 16:38:21 -07:00
snipe 927fba179d
Merge pull request #10241 from snipe/snyk-fix-a23047e623395f58c0f4d50feb55a3a3 
[Snyk] Security upgrade jquery-ui from 1.12.1 to 1.13.0
 2021-10-28 16:35:32 -07:00
snipe 1895dd326f
Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user 
support apache REDIRECT_* for remote user login
 2021-10-28 16:34:57 -07:00
snipe 1975afaca6
Merge pull request #10248 from snipe/features/add_requestable_to_bulk_model_edit 
Adds reqestable as model bulk edit field
 2021-10-28 16:30:55 -07:00
snipe 52ef9280ba Adds reqestable as model bulk edit field 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 15:15:54 -07:00
snipe 30cfc34ecf Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-10-28 14:42:58 -07:00
snipe 668e8a357c Fixed labels in profile form 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-28 12:57:27 -07:00
Steven Daniele efc644c960 support apache REDIRECT_* for remote user login 2021-10-28 14:23:38 -04:00
snyk-bot dfde50732b
fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767167
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767175
- https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767767
 2021-10-28 07:28:38 +00:00
Godfrey M b0da936c5c changed get to receive in the message 2021-10-27 16:41:38 -07:00
Godfrey M 8719667c44 adds info on how to nullify reorder alerts for consumables, components and accessories 2021-10-27 16:36:04 -07:00
Ivan Nieto Vivanco ee9133f722 Return the proper Asset-Components relationship 2021-10-27 16:42:51 -05:00
snipe 7455318fcf
Merge pull request #10225 from snipe/fixes/default_label_in_status_label_api 
Set default_label to 0 instead of null in API
 2021-10-25 20:18:37 -07:00
snipe 17bf899a17 Set default_label to 0 instead of null in API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-25 20:14:01 -07:00
snipe a5230319b8
Merge pull request #10223 from snipe/fixes/fixed_missing_clone_button 
Fixed #10222 - fixed permissions array to handle missing clone button
 2021-10-25 15:39:28 -07:00
snipe 8b1c60a17a Make gates a little more consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-25 15:34:22 -07:00
snipe 033c3253bb Fixed permissions array to handle missing clone button 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-25 14:10:17 -07:00
snipe 8cfa8d97b4
Merge pull request #10215 from inietov/fixes/bulk_edit_counts_more_users_selected 
Fixes bulk edit message counts more users than the actual selected users number
 2021-10-21 13:02:03 -07:00
Ivan Nieto Vivanco 9eaf89aaa7 Add a variable to better control the selected user's ids 2021-10-21 13:28:58 -05:00
snipe 31d49b5c9b Fixed merge error parse error 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-20 18:11:34 -07:00
snipe 6e0f8068b2 Fixed duplicate use statement from merge fuckery 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-20 17:54:32 -07:00
snipe 9ee13f0d2a Fixed dupe use statement from merge fuckery 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-20 17:53:43 -07:00
snipe ae1a4bb3c9 Fixed extra braces from merge fuckery 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-20 17:36:06 -07:00
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
 2021-10-20 17:26:41 -07:00
Godfrey M 9ae7d0b23a when parent asset is assigned to other location, children assets location are updated as well. 2021-10-20 17:01:25 -07:00
snipe 365349fd91 Center custom fields email icon 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-18 18:39:46 -07:00