DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app
History
snipe 43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
2022-01-12 20:51:33 -08:00
..
Console Merge branch 'develop' into remove_old_ldap 2022-01-03 12:56:58 -08:00
Events Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Exceptions Change validation failure to 422 to make it consistent with Laravel's default 2021-12-08 17:54:35 -08:00
Helpers Merge remote-tracking branch 'origin/master' into develop 2021-10-20 17:26:41 -07:00
Http Merge master into develop 2022-01-12 20:51:33 -08:00
Importer Merge remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -08: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 Fixed notification tests 2021-12-02 20:01:03 -08:00
Models Merge pull request #10494 from exula/fix/increase_max_licenses 2022-01-10 15:04:47 -08:00
Notifications Fixed notification tests 2021-12-02 20:01:03 -08:00
Observers Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Policies Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
Presenters Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Providers Merge branch 'develop' into remove_old_ldap 2022-01-03 12:56:58 -08:00
Services WIP: cleaning up LDAP 2021-10-28 18:19:50 -07:00