lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
7534 commits 1 branch 0 tags 220 MiB
Commit graph

554 commits

Author SHA1 Message Date
Christian Weirich
4be6288ae3 Possibility to set region for AWS (SES) 2022-04-27 15:26:33 +02:00
Brady Wetherington
6756dd193e SCIM integration using the 're-do-the routes' approach, which seems like a dead-end 
Cleaning up routes to match laravel-scim-server's recommended implementation

Some actually *working* changes for SCIM support?!

Whoops, forgot my route file

Fix public SCIM routes

Removed Ziggy, removed old generated file, yanked Ziggy references

Resolves the first set of comments for SCIM

Ensure all /api routes have baseUrl prepended

Fix the parent:: call to be, uh, actually correct :P

Clarify the route-ordering, as it is quite tricky

This gets it so that users can actually be saved..

Work around the lack of callbacks with some inheritance

Mapped a bunch more fields from SCIM into Snipe-IT's user table

More baseUrl shenanigans since we yanked Ziggy :/

Properly map job title and work with some other necessary attributes

Map more fields...

Finalized basic mapping for core and enterprise namespaces

Latest tuned settings for SCIM config to work with Azure (and others)
 2022-04-05 20:26:37 +01:00
snipe
f7cd21a007 Sigh. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:59:52 +01:00
snipe
a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07:00
snipe
c0451fe17a Bumped version to v6.0.0-RC-5 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:10:17 +00:00
snipe
349715576a Bumped RC version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 22:23:24 -08:00
snipe
b876d0abb0 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
 2022-03-03 21:59:38 -08:00
snipe
afd83311aa Fixed version number (vV) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:58:54 -08:00
snipe
fa576bc78f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:45:34 -08:00
snipe
336d8e6574
Updated version 2022-02-24 18:17:15 -08:00
Godfrey M
533670f3f1 faulty method for converting asset acceptance to pdf 2022-02-24 14:50:16 -08:00
snipe
50f55b4308 Fixes broken API throttling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:10 -08:00
snipe
a8028e7dd0
Merge pull request #10727 from uberbrady/master 
Fix for negative CORS/SAML interaction
 2022-02-23 11:17:17 -08:00
Brady Wetherington
15abc84ab0 Migrate to Fruitcake/laravel-cors which has path-exclusion built-in 2022-02-23 11:06:19 -08:00
snipe
42fcd29200 Fixed #10436 on master, applies #10449 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-22 21:06:54 -08:00
Brady Wetherington
cd2c92fd6c Cors should respect the .env var for CORS domains 2022-02-22 19:00:59 -08:00
snipe
784bf6f223 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-20 13:30:24 -08:00
snipe
8624531f78 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-13 12:01:37 -07:00
snipe
e032cf1fda Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-11 13:07:26 -08:00
snipe
d2655c1092 Bumped RC version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-01 18:54:46 -08:00
snipe
a0d0645453 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-28 12:38:42 -08:00
snipe
cfb64be9a4 More specific RC version number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:41:04 -08:00
snipe
91017aed52 Bumped to RC-1 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 21:38:10 -08:00
snipe
ae50f86c39 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 20:52:30 -08:00
snipe
bc10761b49 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 12:44:16 -08:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
Brady Wetherington
3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00
Alex Janes
74de91c31a
Merge pull request #1 from snipe/develop 
Develop
 2021-12-17 14:51:03 -05:00
snipe
04f4bb83e9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 20:37:22 -08:00
snipe
6be98638ed Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 14:29:38 -08:00
Alex Janes
6898119891 Replaced env() with config() to check environment variables 
Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.
 2021-12-16 16:56:39 -05:00
Alex Janes
3c8d70c5fb Add option to environment to require SAML for a more secure installation. 2021-12-16 11:44:07 -05:00
snipe
02be4773de Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-13 12:07:34 -08:00
snipe
e5f4048e9e Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-13 11:01:02 -08:00
snipe
8028b39b43 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:58:43 -08:00
snipe
78809c0fe7 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-16 12:02:45 -08:00
snipe
8bf11e9417 Bummped hash fpr v6-pre-alpha 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 19:31:20 -08:00
snipe
f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	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/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe
960028b376 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-03 16:04:39 -07:00
Brady Wetherington
4dda28de9e WIP: cleaning up LDAP 2021-10-28 18:19:50 -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
snipe
a88f622ec3 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-18 16:45:51 -07:00
snipe
61f16f47a2 Use Helper alias 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 19:44:55 -07:00
Brady Wetherington
f380da3f19 Try to ensure all currency output is formatted correctly. 2021-09-28 16:45:47 -07:00
snipe
38a544ea42 Updated version branch to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-08 13:50:52 -07:00
snipe
116bc4ece4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-08 13:42:48 -07:00
snipe
5c92ddb2c6 Fixed version back to develop from master downmerge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-30 12:57:06 -07:00
snipe
f99602c039 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-08-18 00:47:33 -07:00
snipe
0aa328f908 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 00:45:35 -07:00