6971 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alex Janes	bc4fe88ac0	First version of bulk checkin	2021-12-19 16:53:31 -05:00
snipe	4ca2252e3b	Switches GET to POST for request assset ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:32:29 -08:00
snipe	8c5dce5dcf	Merge pull request #10450 from snipe/master_into_develop ... Master into develop	2021-12-16 14:45:53 -08:00
snipe	398180dc59	Small merge unmagling ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 14:38:04 -08:00
snipe	6be98638ed	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 14:29:38 -08:00
snipe	c3d55ee27e	Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
snipe	a05fe9c1f7	Add @exula as a contributor	2021-12-15 09:30:36 -08:00
snipe	395401e9db	Merge pull request #10439 from exula/exula-fix-slack-settings ... Update SettingsController.php to save Slack Settings	2021-12-15 08:36:18 -08:00
Bradley Coudriet	dbdc1c7f3f	Update SettingsController.php to save Slack Settings ... This goes with #10438 that I just submitted about Slack Settings not saving. This adds the necessary code to actually save the Slack Settings, As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.	2021-12-15 10:38:51 -05:00
snipe	52322806fa	Merge pull request #10434 from inietov/fixes/v6_components_error ... Fix route to checkout components from the details page	2021-12-14 10:41:24 -08:00
Ivan Nieto Vivanco	d083f89f30	Delete extra character remaining from previous tests :(	2021-12-14 12:32:30 -06:00
snipe	ace4a00e29	Merge pull request #10433 from inietov/features/adding_title_to_custom_report_master ... Add title column to custom reports on master branch	2021-12-14 10:28:18 -08:00
snipe	59555483f3	Merge pull request #10432 from inietov/features/adding_title_to_custom_report ... Add title column to custom reports	2021-12-14 10:28:02 -08:00
Ivan Nieto Vivanco	2402f00a2e	Fix route to checkout components from the details page	2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
snipe	25e2e7ecc6	Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected ... Fixes bulk edit message counts more users than the actual selected users number	2021-12-13 14:13:14 -08:00
snipe	02be4773de	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 12:07:34 -08:00
snipe	c988d84271	Merge pull request #10426 from snipe/fixes/added_escape_to_asset_api_assigned_to ... Added escape to assigned_to API response	2021-12-13 12:06:08 -08:00
snipe	9d5d1a9f9a	Added escape to assigned_to API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 12:03:03 -08:00
snipe	3a7cef15bd	Merge pull request #10423 from misilot/automated-image-build-github-actions ... Automatic Building of Docker Images and Pushing to DockerHub	2021-12-13 11:32:57 -08:00
snipe	44d3a425cb	Merge pull request #10422 from misilot/docker-alpine-build-automatic ... Adds an automatic build for Alpine Linux based Image	2021-12-13 11:32:42 -08:00
snipe	1854d7d668	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 11:28:01 -08:00
snipe	e5f4048e9e	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 11:01:02 -08:00
Thomas Misilo	5e58f60845	Adds an automatic build for Alpine Linux based Image ... This Fixes #10339, and allows for automatic building of the Alpine Linux image, and push to docker-hub. This will push a "latest-alpine" based on the master branch, a "develop-alpine" based on the develop branch, and a v##.##.##-alpine image based on any released version. `DOCKER_USERNAME` and `DOCKER_ACCESS_TOKEN` do both need to be added to the repository as secrets.	2021-12-13 10:39:55 -06:00
Thomas Misilo	a7760b331b	Automatic Building of Docker Images and Pushing to DockerHub ... This allows for building and pushing of the Snipe-IT docker images directly from GitHub to DockerHub. This will push a "latest" based on the master branch, a "develop" based on the develop branch, and a v##.##.## image based on any released version. `DOCKER_USERNAME` and `DOCKER_ACCESS_TOKEN` do both need to be added to the repository as secrets.	2021-12-13 10:39:04 -06:00
Ivan Nieto Vivanco	a419a690d4	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
snipe	39b0dc136c	Added LDAP strings back ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-11 10:14:35 -08:00
snipe	d0e7879c89	Merge pull request #10415 from uberbrady/fix_actionlog_memory_exhaustion ... Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 19:10:40 -08:00
snipe	503c802d70	Merge pull request #10416 from uberbrady/yank_assetlogs_from_asset_api ... Yank assetlog from eager-load clause in API query for develop	2021-12-10 19:09:55 -08:00
Brady Wetherington	ea71086dfc	Yank assetlog from eager-load clause in API query for develop	2021-12-10 18:50:34 -08:00
Brady Wetherington	acfb41f129	Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 18:42:56 -08:00
snipe	5381aa3fbd	Merge branch 'master' of https://github.com/snipe/snipe-it	2021-12-10 15:17:45 -08:00
snipe	e20a10a6a1	Add @Haxatron as a contributor	2021-12-10 15:17:26 -08:00
snipe	949141a8e7	Merge pull request #10414 from snipe/added_model_to_accessory_report ... Added model number to accessory report	2021-12-10 15:10:02 -08:00
snipe	e1bf3b50f4	Added model number to accessory report ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-10 15:09:29 -08:00
snipe	cf5e3da3a5	Merge pull request #10406 from Haxatron/fix-access-control ... security fix	2021-12-09 11:23:35 -08:00
Haxatron	1699c09758	Update AssetModelsController.php	2021-12-09 21:42:18 +08:00
Haxatron	918e7c8dae	Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/	2021-12-09 12:57:04 +08:00
snipe	86afe6c4b1	Cleanup slack validation ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 18:03:56 -08:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	81b66d0039	Change validation failure to 422 to make it consistent with Laravel's default ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:35 -08:00
snipe	8fa690b635	Reverting form request because it doesn't seem to work (????!!) ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:15 -08:00
snipe	8c1cd87831	Added slacksettingsrequest as use statement ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:22 -08:00
snipe	cde2bad297	Small mods to slack jquery ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:05 -08:00
snipe	80d36cd72b	Added slack settings request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:53:05 -08:00
snipe	713fbdc0a6	Merge pull request #10239 from Godmartinz/Adds-info-on-how-to-nullify-reorder-alerts ... adds info on how to nullify reorder alerts for consumables, component…	2021-12-08 14:26:22 -08:00
snipe	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk ... WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	0ba55e0eaf	Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase ... Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…	2021-12-06 14:08:24 -08:00
snipe	4612b9e711	Merge pull request #10394 from snipe/fixes/add_stricter_validation_for_slack_hooks ... Adds stricter validation for slack hooks	2021-12-06 11:41:11 -08:00