6697 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	be7e6ed847	Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth ... Add new UserAccountControl to permitted UAC's for AD.	2022-01-13 17:01:47 -08:00
snipe	115109f612	Merge pull request #10510 from misilot/fix-10176-master ... Looks great, thanks!	2022-01-13 13:22:22 -08:00
Thomas Misilo	037a912e21	Adding .my.cnf to disable column-statistics backup ... Fixes #10176 The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each Dockerfile that exists	2022-01-13 15:16:59 -06:00
snipe	984db1ef44	Apply personal API token fix to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:39:56 -08:00
Brady Wetherington	c8fe929e09	Add new UserAccountControl to permitted UAC's for AD.	2022-01-12 12:07:51 -08:00
snipe	181dc5127f	Add @UniversalSuperBox as a contributor	2022-01-11 15:03:08 -08:00
snipe	303fc39966	Regenerated assets to pikc up #10089 changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-11 14:38:17 -08:00
snipe	730c2a6821	Merge pull request #10496 from UniversalSuperBox/fix/improve-asset-card-view ... Fixed #10089 (partially): Back to master: Added some BS tables style overrides for mobile	2022-01-11 14:10:18 -08:00
snipe	bc10761b49	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-11 12:44:16 -08:00
snipe	cf14a0222c	Merge pull request #10498 from Haxatron/master ... Fix access control	2022-01-10 19:24:31 -08:00
snipe	b18b3812df	Back to master: Added some BS tables style overrides for mobile ... This repeats 06e8e826, which alone improves the mobile view immensely, on master.	2022-01-10 15:23:43 -06:00
Haxatron	bb095641c2	Update BulkAssetModelsController.php ... https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7	2022-01-06 09:50:11 +08:00
snipe	b78e610ce3	Merge pull request #10480 from snipe/fixes/check_for_valid_custom_field ... Fixed format property on invalid custom field object when trying to edit a field that doesn't exist	2022-01-03 19:28:25 -08:00
snipe	884b6b0270	Fixes format property on invalid custom field object ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-03 19:14:50 -08:00
snipe	7a1ab1292c	Merge pull request #10479 from adagioajanes/fixes/auto_asset_tag_phrasing ... Fixed auto asset tag phrasing	2021-12-31 15:17:59 -08:00
Alex Janes	87bb741013	Merge branch 'snipe:master' into fixes/auto_asset_tag_phrasing	2021-12-31 16:34:57 -05:00
Alex Janes	5fe2083688	Adjusted the phrasing around auto-incrementing asset tags.	2021-12-31 16:33:30 -05:00
snipe	2ee84c2675	Added a few more comments ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:33:28 -08:00
snipe	39a5b6b426	Merge pull request #10478 from snipe/fixes/whitelist_modal_views ... Added allow list to modal view options	2021-12-30 18:29:30 -08:00
snipe	c6ce928567	Added allow list to modal view options ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:16:49 -08:00
snipe	950a23b0f4	Merge pull request #10476 from snipe/fixes/custom_fieldsets_index ... Fixed missing index for fieldsets	2021-12-30 13:18:13 -08:00
snipe	b4fac3e4ae	Fixed missing index for fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 13:16:44 -08:00
snipe	548e483ef8	Merge pull request #10475 from snipe/fixes/wrong_default_sort_on_kits ... Fixed assets_count doesnt exist as a column on kits	2021-12-30 13:02:12 -08:00
snipe	bad6b862ca	assets_count doesnt exist as a column ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 12:59:16 -08:00
snipe	4e336e11ee	Merge pull request #10470 from snipe/increase_address_length_for_supplier ... Fixed #10469 - increased size of supplier address field	2021-12-27 12:29:13 -08:00
snipe	8588e9ebf1	Fixed #10469 - increased size of supplier address field ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 12:28:02 -08:00
snipe	11524d0f7d	Merge pull request #10463 from adagioajanes/fixes/pass_total_to_GroupsTransformer ... Fixed #10461: Groups management page did not paginate correctly	2021-12-24 10:39:22 -08:00
Alex Janes	d0bfd8dfd2	Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly.	2021-12-23 20:54:34 -05:00
snipe	312200bf44	Removed duplicate "department" entry in importer, pulls #10460 to master ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-21 13:37:20 -08:00
snipe	04f4bb83e9	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:37:22 -08:00
snipe	9b2dd6522f	Switch GET to POST for asset request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:36:08 -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	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
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -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
Brady Wetherington	acfb41f129	Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 18:42:56 -08:00