snipe 953b3a8d6e Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 ...

Merge master into develop for RC 6.0.0-8

2022-05-05 10:53:17 -07:00

..

Console

Removed dupe lines from merge conflict

2022-05-03 12:56:29 -07:00

Events

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

Exceptions

Merge remote-tracking branch 'origin/master' into develop

2022-03-03 21:59:38 -08:00

Helpers

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

Http

Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8

2022-05-05 10:53:17 -07:00

Importer

Merge master back down into develop

2022-03-29 16:28:43 +01:00

Jobs

Version 3 - hold onto your butts

2016-03-25 01:18:05 -07:00

LegacyEncrypter

Minor code cleanup bits and bobs (#6805)

2019-03-13 20:12:03 -07:00

Listeners

adds table structure for asset history

2022-03-14 19:38:36 -07:00

Models

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Notifications

Fixed notification tests

2021-12-02 20:01:03 -08:00

Observers

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Policies

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

Presenters

Add remote option to user

2022-03-04 05:35:26 -08:00

Providers

SCIM integration using the 're-do-the routes' approach, which seems like a dead-end

2022-04-05 20:26:37 +01:00

Services

Add new UserAccountControl to permitted UAC's for AD.

2022-01-12 12:07:51 -08:00