DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8174 commits 101 branches 268 tags 320 MiB
Commit graph

591 commits

Author SHA1 Message Date
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe 2f02eee69b Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:21:04 -07:00
snipe a7dc6162fa Simplify password attempts rate limiting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 09:11:24 -07:00
snipe 5ff1b5fd50 Increased throttle 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:39:50 -07:00
snipe 57720cb978 Added comment block 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:12:57 -07:00
snipe 284dbb7553 Set higher threshhold, moved throttle settings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:11:39 -07:00
snipe 791f77f641 Fixed throttle variables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 18:41:12 -07:00
snipe a758e825ed Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 13:45:33 -07:00
snipe e935a34946 Merge remote-tracking branch 'origin/develop' 2022-06-14 16:25:50 -07:00
snipe cc6a2f2d49 Use the Deja Vu font to be able to support cyrllic, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:23:30 -07:00
snipe 1806dacb9d Bumped hash on master to 6.0.4 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-06-13 23:59:43 -07:00
snipe abb7f23ca5 Bumped version to 6.0.4 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 23:58:53 -07:00
snipe 3e8837dd6e Bumped dev branch to 6.0.3 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 22:13:18 -07:00
snipe ea1ff1e8bb Bumped version to 6.0.3 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 22:12:40 -07:00
snipe 3dedd51b84 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-06-05 17:16:21 -07:00
snipe 711c713ab8 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 17:15:29 -07:00
snipe 089704c4f9 Merge remote-tracking branch 'origin/develop' 2022-05-31 14:17:23 -07:00
snipe c031686825 Fixed path 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:12:38 -07:00
snipe 791c39d977 Starter Livewire config (for subdirectories) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:10:20 -07:00
snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-05-24 15:10:46 -07:00
snipe 72799973e7 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 14:41:44 -07:00
snipe b8e6df545a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-23 18:55:57 -07:00
snipe b32fba7f8a Switch to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:33:26 -07:00
snipe 7573a03cc5 Bumped minor version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:32:57 -07:00
Brady Wetherington 0ddb0f2c81 Switch the barcode backend to SVG, and fix the two-factor middleware 2022-05-13 14:22:27 -07:00
snipe 293e3e02e4 Updated cookie name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 12:07:00 -07:00
snipe 64dc6fbd9c Switched branch to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 11:52:27 -07:00
snipe e55aac7fea Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 11:51:41 -07:00
snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/permissions.php
 2022-05-12 09:31:42 -07:00
snipe c0ef27fc9e Removed kit checkout permission - it’s just confusing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-11 19:02:11 -07:00
snipe 816437b4d8 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 17:28:11 -07:00
snipe a43b54cc8d Bumped hash for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:13:56 -07:00
snipe 31f2b73e5a Bumped version to GM 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 10:55:29 -07:00
snipe 57ed3afcc4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-04 16:50:50 -07:00
snipe 150724b744 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 17:51:27 +01:00
Christian Weirich 4be6288ae3 Possibility to set region for AWS (SES) 2022-04-27 15:26:33 +02:00
snipe e4ef970934 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 12:26:58 +01:00
snipe 61f5825c69 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-11 15:37:38 +01: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