Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integrations/develop into master #7352

Merged
merged 136 commits into from
Aug 15, 2019
Merged

Integrations/develop into master #7352

merged 136 commits into from
Aug 15, 2019

Conversation

snipe
Copy link
Owner

@snipe snipe commented Aug 15, 2019

Horrible beast of a PR to bring develop back to mergeable parity with master.

snipe and others added 30 commits May 5, 2019 22:32
@snipe
Fixes #6204 - added email alerts and web/API access to assets due for…
e5c2d77 
… audits (#6992)

* Added upcoming audit report

TODO: Fid diff/threshold math

* Added route to list overdue / upcoming assets via API

* Controller/API methods for due/overdue audits

We could probably skip this and just handle it via view in the routes…

* Added query scopes for due and overdue audits

* Added audit due console command to kernel

* Added ability to pass audit specs to main API asset search method

* Added audit presenter

* Added bootstrap-tables presenter formatter to display an audit button

* Added gated sidenav items to left nav

* Added audit due/overdue blades

* Cleanup on audit due/overdue console command

* Added language strings for audit views

* Fixed :threshold placeholder

* Removed unused setting variable

* Fixed next audit date math

* Added scope for both overdue and upcoming

* Derp. Wrong version

* Bumped version

(I will release this version officially tomorrow)
@snipe
Leave the activated state for users alone in normal LDAP synchronisat…
486c708 
…ion. (#6988)
@snipe
Fixed #7003 - crash when warranty months or purchase date is null
23fa5d0
@snipe
Fixed #6956 - viewKeys policy inconsistent (#7009)
d016076 
* Fixed #6956 - Added additional gates show showing/hiding license keys

* Modified gate to allow user to see licenses if they can create or edit the license as well
@snipe
Added API middleware to API routes to enable throttling
f47b960 
TODO: Figure out how to make this costumizable without touching the code
@snipe
Merge branch 'master' of https://github.com/snipe/snipe-it
dbdc511
@snipe
Import locations from CSV via command line (#7021)
d67c931 
* Added import locations command

* Small fixes to location importer

* Added country, LDAP OU

* Cleaned up comments, added more clarification to what the script does
@snipe
Added ability to update groups via API
888bdbd 
Fixes [ch9139]
@snipe
Bumped version
33b59d7
@snipe
Fixed #6883 - remove escaping of fields on LDAP import
6728089
@snipe
Fixed #6880 - correctly encrypt encrypted fields via the API
9eb7b66
@thinkl33t @snipe
Fixes #5054: LDAP users deactivated for none-ad (#7032)
0963933 
When using none-AD ldap, users are automatically deactivated every LDAP
sync.  This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.

Fixed #5054, at least for 4.X
@snipe
Updated packages
c944304 
  - Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
  - Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
  - Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
  - Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
  - Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
  - Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
  - Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
  - Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
  - Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
@snipe
Fixed #7044 - API update deleted custom fields if they are not re-pre…
0358d13 
…sented
@snipe
Fixed XSS vulnerability when creating a new categories, etc via modal…
978533b 
… on create

Same fix as before, because of the weird select2 post-parsing ajax behavior
@snipe
Updated email strings
729e3eb
@snipe
Fixed #7046 - added user website url back into UI
b2eacb1
@snipe
Updated language strings
21ec670
@snipe
Bumped version
7b34cf1
@snipe
Updated packages
77c3b8f
@snipe
New backups config for spatie
8244a2a
@snipe
Removed debugbar service provider (autodiscovery)
144a32b
@snipe
Use laravel v5.5 withCount manual aliases
20d0dce
@snipe
Added spatie language files
de11892
@snipe
Removed old laravel backups config
57e80ee 
This config file was renamed in a newer version of spatie laravel-backup
@snipe
Set the serialization
bfb910f
@snipe
Added the command loader to console kernel
77547c5
@snipe
Renamed fire() to handle()
df8008f
@snipe
Updated withCount to use manual naming
4be8ba9
@snipe
Updated backup path in backup admin
6cd25fb
snipe and others added 27 commits July 17, 2019 12:09
@snipe
Check for valid seat on hardware view
79ab0d8
@snipe
Added space between footer and custom message
fecf801
@snipe
Cap warranty months to three characters
15bfd07 
Filles rollbar 209
@snipe
Cap warranty months to 3 on the frontend blade
77a6f6f
@snipe
Fixed countable() strings on user destroy
444e250
@snipe
Check that the user has assets and that the aset model is valid
0e93495
@snipe
Bumped hash
61fb380
@snipe
Caps asset warranty to 20 years
cef22c3
@snipe
Command to fix custom field unicode conversion differences between PH…
eec445f 
…P versions (#7263)
@snipe
Fixes #7252 form request changes (#7272)
55ee90b 
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests

* Removed debug info

* More fixes for #7252

This is mostly working as intended, if not yet the way Laravel wants us to do it.

Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.

* Removed experimental method

* Check for digits_between:0,240 for warranty

* Removed debug code
@snipe
Apply fix from PR #7273 to master
74e647f
@snipe
Bumped hash
a0f3fc6
@snipe
Fixed #7250 - permission issue for API fieldsets and fields endpoints
250a797 
This applies the change from #7294 to master
@snipe
Add @mskrip as a contributor
9af9ed9
@snipe
Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
ab86e42
@snipe
CORS for api (#7292)
3dc2cc9 
* Added CORS support to API

* Changed order so CORS will still work if throttle hit

* Added APP_CORS_ALLOWED_ORIGINS env option

* Fixed typo

* Clarified header comments

* More clarification

* DIsable CORS allowed origins by default to replicate existing behavior

* Change variable name to be clearer
@snipe
Bumped version
c7be250
@inietov @snipe
Added condition to deal with fieldname 'rtd_location' which can be tr…
28ae90f 
…ied to be queried in some places and doesn't exist in database (#7317)
@snipe
Added comments to the ByFilter query scope for clarity
c593b36
@snipe
Added accessories checkout/checkin API endpoint
e7b0ee2
@snipe
Fixed CVE-2019-10742
d372805 
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
@gastamper @snipe
Update README.md (#7334)
5591c86 
Add reference to CSV importer.
@snipe
Group related variables in .env
6ebb01a
@snipe
Merge branch 'master' of https://github.com/snipe/snipe-it
6c7e5cb
@snipe
History importer fixes
99cd552
@snipe
Fixes to history importer
8b4a9aa
@snipe
Merge branch 'develop' into integrations/develop-into-master
881f2a3 
# Conflicts:
#	.env.example
#	.travis.yml
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Controllers/ViewAssetsController.php
#	app/Http/Middleware/EncryptCookies.php
#	app/Http/Requests/AssetRequest.php
#	app/Importer/Importer.php
#	app/Models/Asset.php
#	app/Models/User.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/backup.php
#	config/database.php
#	config/version.php
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/lang/en-ID/general.php
#	resources/lang/es-MX/general.php
#	resources/lang/es-MX/mail.php
#	resources/lang/vi/admin/settings/general.php
#	resources/views/accessories/edit.blade.php
#	resources/views/hardware/history.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/users/print.blade.php
#	routes/api.php
#	tests/api/ApiCategoriesCest.php
@snipe snipe requested a review from uberbrady as a code owner August 15, 2019 04:47
@snipe snipe merged commit 441ae69 into develop Aug 15, 2019
@snipe snipe deleted the integrations/develop-into-master branch August 15, 2019 04:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uberbrady uberbrady Awaiting requested review from uberbrady uberbrady is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.