3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-07 08:58:51 +00:00
Commit Graph

992 Commits

Author SHA1 Message Date
afc8ac5e72 Php7 updates (#5365)
* Update composer dependencies.

* Update google2fa to version 3 and make adjustments related to it.

* Update to league/csv 9

* Fix api categories test.  we were passing the wrong parameter to the url which caused the wrong data to be fetched.
2018-07-15 13:56:42 -04:00
ffa43d2a36 Use object count instead of php count 2018-07-15 13:55:43 -04:00
50f520423b Updated backup settings for newer version of spatie 2018-07-15 13:52:56 -04:00
ba0bb0ad05 Fixed filledFile back to hasFile 2018-07-15 13:52:34 -04:00
bb5cb64ba9 Change $request->has to $request->filled unilaterally 2018-07-15 13:52:33 -04:00
0fb9f42ba4 Removes setting the encryption status on update (#5833)
When we are updating a custom field, we don’t want to change the „field_encrypted“-setting on it.
2018-07-13 04:04:30 -07:00
27699aa99c Adds permission checks for custom fields and custom fieldsets (#5645) (#5795)
* adds permission checks to custom fields

* adds permission checks to custom fieldsets

* adds separate permissions for custom fieldsets

* check for permissions in views

* Removes custom fieldsets from permissions config

* Proxy the authorization for custom fieldsets down to custom fields.

This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets.

* simplifies the authorization check for the custom fields overview

* removes special handling of custom fieldsets in base policy

I just realised that this code duplicates the logic from the custom fieldset policy.
Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields.

* cleanup of unused imports
2018-07-12 18:28:20 -07:00
48bbbe0f40 Fixing authorization issues (#5807)
* adds permission checks for companies

* adds permission checks for depreciations

* adds permission check for all reports

* fixes permissions for departments

* fixes permission naming (edit -> update)

* fixes authorization checking wrong permission in API

The authorization was checking for the non-existent „edit“ method where it should have checked for the „update“ method.

* adds authorization checks for select2 lists

* adds missing authorization checks for api

* fixes user authorization check for creating users

* adds additional check viewing assets on showing a users assets

* Removes authorization checks for select2 lists

Reference: https://github.com/snipe/snipe-it/pull/5807#pullrequestreview-136018755
2018-07-12 18:28:02 -07:00
98b20fc1cd Added option to include model information on asset labels. (#5301)
* Added option to include model information on asset labels.

Cleaned up label page to fix skewed label alignment on last row per page.

* Changes made per Snipe's direction

changed type from tinyint to boolean in DB
changed labels back to initials
2018-07-12 18:23:12 -07:00
339263a295 Fixed #5751 - added option for unique constraint on serial 2018-07-05 19:30:36 -07:00
311f9fcefb Implemented method to get info on the current user of the API (#5722)
* Implemented method to get info on the current user of the API

* Move userinfo method to UsersController

* Added missing files
2018-07-02 20:35:10 -07:00
d7dc4ae0c0 Added manager to custom report 2018-06-27 00:45:09 -07:00
f8429ad357 Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes 2018-06-21 07:31:15 -07:00
32e3f748d8 Make version footer configurable. (#5730) 2018-06-21 07:12:16 -07:00
1a64879b65 Only allow remote user settings to be saved if the app is not in demo mode 2018-05-31 10:55:48 -07:00
8eb96efa13 Merge branch 'develop' 2018-05-16 19:38:23 -07:00
e9973670ea Could should not be equal to 1 2018-05-16 19:38:02 -07:00
ef8d2d06df Fixes #5519 - count() for php 7.2 2018-05-16 19:35:14 -07:00
0b5bb520a7 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-16 19:24:31 -07:00
233fb23cb8 Create asset maintenance - Added orange bar for required asset to edit view (#5520)
* Added orange bar for required asset to edit view

* disable redirection to asset maintenances view

* Update - disable redirection to asset maintenances view
2018-05-16 19:23:23 -07:00
4c656c0321 De-normalize new counters from 4.3.0 (#5547)
* Added de-norm counter migration for assets

* Renaming counter columns, since Eloquent has a magical *_count helper

* Added artisan command to sync counters (one-off)

* Update API to use de-normed fields

* Increment counters for checkin;/checkout

* Derp.

* Added request increment/decrementer

* Move increment for checkout to the Asset::checkout method

* Added “could take a while” message
2018-05-16 19:20:43 -07:00
4ba9792fbe Merge branch 'develop' 2018-05-09 15:29:59 -07:00
8ad5eb3e59 Fixed #5500 - present() on correct location value 2018-05-08 09:21:43 -07:00
3df8fa99f0 Merge branch 'develop' 2018-05-08 07:37:44 -07:00
13195d06fd Fixed #5491 - added default location filter for custom report 2018-05-08 07:34:14 -07:00
25f537e730 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-08 03:49:28 -07:00
04709dc1df Fixed #5477 - added GDPR privacy policy link in email and webpage 2018-05-08 00:50:13 -07:00
7b8362b64c Added license categories 2018-05-04 21:01:38 -07:00
a9fc7e04e9 Fixed php7.2 count issue 2018-05-04 21:00:58 -07:00
ec1fa8e90a Merge branch 'develop' 2018-05-03 08:06:58 -07:00
3a1b432234 Fixed #5472 - show_in_email for custom fields missing in edit field UI 2018-05-03 08:06:28 -07:00
0472e3a3e5 Merge branch 'develop' 2018-05-02 14:41:10 -07:00
a0afa9f2e8 Modified the affectation of the value of the password in credential mail sent for the first user sign up (#5446)
* Modified the affectation of the value of the password

* Remove e()
2018-05-02 14:40:41 -07:00
0116fa9b95 Merge branch 'develop'
# Conflicts:
#	config/version.php
2018-05-02 14:35:16 -07:00
0be69f57ac Improved files display 2018-05-02 14:13:06 -07:00
97f748d58e Removed old reports methods and routes
We only use the custom asset report now
2018-05-02 03:44:31 -07:00
71708e349c PHP7.2 count fixes (#5427)
* PHP 7.2 count() fixes

* Re-enable php travis 7.2
2018-04-29 06:10:49 -07:00
6df7f6d6ec Fixes wrong users index route name 2018-04-26 16:31:02 -07:00
5365182c86 Fixed advanced search on supplier, count for PHP7.2 2018-04-25 20:25:03 -07:00
c4c520c1a3 Fixes #4445: prevents assigned assets from being checked out in bulk checkout (#5421)
* Fixes #4445: prevents assigned assets from being checked out in bulk checkout

* Updates data attribute to more versatile 'data-asset-status-type'

* Fixes broken unit test
2018-04-25 02:39:23 -07:00
088eb3da14 Merge branch 'develop' 2018-04-24 13:24:24 -07:00
0e1dfcf408 Changed directory for audits image dir 2018-04-24 13:20:15 -07:00
3ca9f5f389 Merge branch 'develop' 2018-04-24 12:49:28 -07:00
1708bb5cdf Fixes #5422 - remove extension ending from uploaded file name 2018-04-24 12:47:09 -07:00
8127484081 Better error checking for private file display method 2018-04-24 03:12:30 -07:00
ea54d73911 Merge branch 'develop' 2018-04-24 02:59:19 -07:00
1ef4cc9fc2 Fixed #4301 - added image upload to audit 2018-04-24 02:54:54 -07:00
c8cbc55b59 Bulk Checkout to Assets and Location (#5385) 2018-04-23 21:24:49 -07:00
8d501e1c24 Feature/custom fields default values (#5389)
* Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection.
Have tested extensively and doesn't seem to affect anywhere else?

* Adds default value functionality

* Adds built assets

* Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work

* Updates built assets

* Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377)

* Added department to custom asset export
Updates build assets

* Adds translation support for 'add default values' checkbox label
2018-04-23 21:16:55 -07:00
132a5d424d Check for valid accessory category 2018-04-23 16:04:01 -07:00