DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14077 commits 101 branches 268 tags 288 MiB
Commit graph

821 commits

Author SHA1 Message Date
snipe 5defd5ec0a Merge develop into master 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:59:17 -08:00
snipe e66b19aca0 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:44:06 -08:00
snipe d36b4c1bd3 Merge remote-tracking branch 'origin/develop' 2023-03-06 17:04:15 -08:00
Brady Wetherington dd3c3a1428 Suppress SCIMExceptions from cluttering up Rollbar 2023-03-06 15:24:16 -08:00
snipe dbe0a3352b Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-02-28 20:34:20 -08:00
snipe 2189a74d6a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:00 -08:00
snipe 8caf29975f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-02-24 09:58:19 -08:00
snipe 95501bf57c Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:57:25 -08:00
Brady Wetherington 645bba96cd WIP: First stabs at getting Laravel Vite to work; no luck so far :( 
Probably going to back out all the 'vite' stuff anyways :/
 2023-02-21 19:35:37 -08:00
snipe 495d7e057d Merge remote-tracking branch 'origin/develop' 2023-02-15 18:37:39 -08:00
snipe 7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions 
Silence E_WARNING "exceptions"
 2023-02-15 11:56:37 -08:00
snipe c7f90f304d Added insights config 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
Brady Wetherington 3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
Brady Wetherington a1b0eaf128 Got working E_WARNING-in-production going. YAY! 2023-02-14 20:00:06 -08:00
snipe a60510c063 Added insights config 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:39:48 -08:00
Brady Wetherington 039d159cbd WIP: working on better Rollbar filtering in prod 2023-02-01 17:15:22 -08:00
snipe 6fbd20a11b Merge remote-tracking branch 'origin/develop' 2023-01-31 19:50:18 -08:00
Ben Periton c2854f1bcb
Update database.php 
Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port
 2023-01-29 19:28:04 -06:00
snipe 8b94b208e3 Merge remote-tracking branch 'origin/develop' 2023-01-26 13:17:28 -08:00
Brady Wetherington cd573c484d Change the SCIM_STANDARDS_COMPLIANCE config to default to 'true' 2023-01-26 12:48:41 -08:00
snipe d020ab455d Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:56:53 -08:00
snipe 0c3d03a4ce Only add rollbar to the logging array if the app is in production 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:50:16 -08:00
snipe 2eac03db4a
Merge pull request #12329 from snipe/fixes/rollbar_integration 
Fixed rollbar integration if ROLLBAR_TOKEN is provided
 2023-01-10 17:21:52 -08:00
snipe 1cf7784bb8 Logging override if ROLLBAR_TOKEN is provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 00:20:56 -08:00
snipe 60dcaa9e94 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-01-09 21:11:29 -08:00
snipe 2e75bd6960 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:11:00 -08:00
snipe a6c7471bf5 Merge remote-tracking branch 'origin/develop' 2022-12-20 15:11:36 -08:00
Ivan Nieto Vivanco d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
Ivan Nieto Vivanco b142f8e012 Add the permission to show purchase cost column to non-admin sessions 2022-12-14 23:00:35 -06:00
snipe 687f8971b1 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-12-08 14:49:31 -08:00
snipe bc2a455a89 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-08 14:48:55 -08:00
snipe d5e702ac74 Merge remote-tracking branch 'origin/develop' 2022-11-28 14:12:38 -08:00
Brady Wetherington 06a1fe5b38 Pulled in latest upstream changes for improved standards-compliance 2022-11-22 12:52:11 -08:00
snipe 8d03ce5e2c Merge remote-tracking branch 'origin/develop' 2022-11-14 17:45:01 +00:00
snipe 6a9131e771
Merge pull request #12088 from uberbrady/minimal_scim_upgrade 
Added new SCIM env vars; and upgraded SCIM library
 2022-11-09 19:30:50 +00:00
Brady Wetherington 383bd6bb45 Add new SCIM env vars; upgrade SCIM library 2022-11-09 19:08:15 +00:00
snipe 23cbee9493 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-11-03 14:18:55 -07:00
snipe 7c21158680 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:18:13 -07:00
snipe 52e33a8b0e Merge remote-tracking branch 'origin/develop' 2022-11-03 13:27:21 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 276f534ded Updated permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:21 -07:00
snipe b362951c95 Added consumables permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:45 -07:00
snipe 38678d4646 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-10-26 09:50:44 -07:00
snipe 476a5cbc02 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:49:50 -07:00
snipe f4a3f896bd Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-10-13 13:20:35 -07:00
snipe 0303df4b25 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 13:19:51 -07:00
snipe 3c9c89355e Aaaand master again 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:01:55 -07:00
snipe 5ff72420a6 Set branch back to develop 
I hads to switch branches because the automated GH action script always targets masterb

Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 11:00:06 -07:00
snipe 1ef3eb94db Merge remote-tracking branch 'origin/develop' 2022-10-05 17:55:33 -07:00
snipe 25e4b7d59d
Merge pull request #11927 from uberbrady/use_improved_scim 
Use the new scim-trace feature from our fork of laravel-scim-server lib
 2022-10-05 17:53:20 -07:00
Brady Wetherington 9605dec22a Use the new scim-trace feature from our fork of laravel-scim-server lib 2022-10-05 17:43:59 -07:00
snipe 687a764fc1 Dev to master in version.php 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:53:16 -07:00
snipe 81be84568e Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:52:24 -07:00
snipe 5a7e35c0e8 Made a conditional escape according to .env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:48:43 -07:00
snipe 421c9baecc # Conflicts: 
Signed-off-by: snipe <snipe@snipe.net>
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2022-09-15 20:11:07 -07:00
snipe 5c9e84f663 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 20:09:00 -07:00
snipe 4cc9b5a5a2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-08-25 12:34:38 -07:00
snipe 8720a58b51 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:34:02 -07:00
snipe 44e598b0dc Updated branch name in version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 17:17:38 -07:00
snipe 8a312f69a6 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 16:37:22 -07:00
snipe 80d91c0c51 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-08-08 15:33:10 -07:00
snipe 4f4c4ed5be Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 14:35:04 -07:00
snipe d7d0056b73 Merge remote-tracking branch 'origin/develop' 2022-07-27 15:10:38 -07:00
snipe 7d2fcef807
Merge pull request #11562 from uberbrady/clarify_logging 
Fixed inconsistent `*_LOG_LEVEL` variables; set reasonable defaults
 2022-07-25 20:02:37 -07:00
Brady Wetherington 0c7d4a709a Cleaned up more logging options 2022-07-25 19:25:06 -07:00
Brady Wetherington 7057cb0104 Make all *_LOG_LEVEL vars consistent; set default to 'warning' 2022-07-25 18:44:37 -07:00
snipe e9121c15d8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-07-18 16:50:53 -07:00
snipe 43bd00da86 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 16:50:12 -07:00
snipe f1488767f8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-07-05 16:41:00 -07:00
snipe 2d5755c1dd Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:40:17 -07:00
snipe 7bdbbbee50 Branch in config set to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:20:33 -07:00
snipe 2137c4e897 Back to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-04 10:12:25 -07:00
snipe f3a3c59b7b Fixed branch name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 18:05:46 -07:00
snipe aa54c23f98 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 18:04:53 -07:00
Nathan Butler 6531657ee0 Revert version to dev for pull request 2022-06-29 18:00:15 +10:00
snipe 242836719d Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 19:32:10 -07:00
snipe 393c32558b Gotta bump that hash up 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 19:31:26 -07:00
snipe e2c227f02b Merge remote-tracking branch 'origin/develop' 2022-06-24 16:21:10 -07:00
snipe cf99d42413 Added backup delete to app config 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:48:37 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe f5702532f0 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:21:51 -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
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
snipe 615bdd0499 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-15 13:29:07 -07:00
snipe 5b5b70e639 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2021-06-28 11:01:45 -07:00
snipe 6521f16b80 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:00:34 -07:00
snipe 2e6bac7db5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:36:43 -07:00
snipe 335f4e50a5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-23 16:07:01 -07:00
snipe 1808986bf5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:06:30 -07:00
snipe a67ce965ec
Update version.php 2021-06-22 20:13:03 -07:00
snipe aebb30cea8 Fixed Cors wildcard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 00:23:51 -07:00
snipe 2cddd7faf0 Fixed filesystem config 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:26:10 -07:00
snipe a5f144b4e0 Merge branch 'shift-46327' into develop-v6-integration 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-11 14:10:10 -07:00
snipe a8123092af Misc fixes for shift 
// TODO - re-fix the exception handler

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:07:50 -07:00
snipe aae6a8fc6c Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-10 17:42:29 -07:00
Laravel Shift 7e93086dd4 Default config files 
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
 2021-06-10 20:18:10 +00:00
Laravel Shift cc3c59bf97 Shift config files 2021-06-10 20:18:10 +00:00
Laravel Shift 934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00:00
snipe 7d5a9180e6 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:57:56 -07:00
snipe aa98e4ea7a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-05-05 00:04:17 -07:00
snipe 6935d94184 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 00:03:33 -07:00
snipe a1bc984d17 Generate production assets, bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:34:02 -07:00
snipe 31944cd4d4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:28:38 -07:00
Renee Margaret McConahy e6c3d7fe57
Restore LOG_CHANNEL environment variable. (#9464) 
This allows selecting the Monolog channel with the LOG_CHANNEL variable.
 2021-04-21 11:40:23 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
Tetrachloromethane250 157d9e4ebb
Added #5977: Add permission to view files attached to licenses (#9264) 
* Add permission to view and modify files for licenses

* Actually use the permission
 2021-04-05 21:51:47 -07:00
snipe b2a3a80f96 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
#	config/version.php
 2021-03-17 20:04:43 -07:00
snipe afb7fcfa3e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 20:02:54 -07:00
snipe 9f3a8a43cc Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
 2021-03-17 19:41:02 -07:00
snipe 72f7baf5ee Removed unused class references 2021-03-17 16:56:32 -07:00
snipe ab092fd209 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Providers/AppServiceProvider.php
#	config/logging.php
#	config/services.php
 2021-03-15 12:29:29 -07:00
snipe 3fc24b4e61 Set spatie encryption to null 2021-03-09 21:07:41 -08:00
snipe 0fa07a4bca Bumped point version 2021-03-09 16:19:21 -08:00
snipe c3871c98df Updated rollbar package 2021-03-09 16:16:57 -08:00
snipe f05a8d782c Added spatie encryption line 2021-03-09 13:38:53 -08:00
snipe e9ee9ea2e9 Fixed rollbar integration 2021-03-09 12:40:00 -08:00