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

1270 commits

Author SHA1 Message Date
snipe
d4725b61be Check that a model exists before trying to fiddle with fieldsets 2019-05-24 04:48:04 -07:00
sreyemnayr
f85ac97d8c Feedback for Kits; Fix checkins for accessories (#7060) 
* Kits feedback

* Fix accessory checkin
 2019-05-23 19:39:30 -07:00
snipe
bf93e8cc32 Use getReader instead of fetchAssoc for CSV parser 
https://csv.thephpleague.com/9.0/upgrading/
 2019-05-23 19:09:58 -07:00
snipe
2d036c64e9 Change ->has() to ->filled() 2019-05-23 17:39:50 -07:00
snipe
8db2470ac4 Switch has() to filled() 2019-05-23 17:17:46 -07:00
snipe
12ec2d1f7a Fixed custom field edit screen 2019-05-22 01:07:14 -07:00
snipe
6cd25fbdeb Updated backup path in backup admin 2019-05-22 00:56:14 -07:00
snipe
4be8ba9f17 Updated withCount to use manual naming 2019-05-22 00:52:51 -07:00
snipe
b2eacb147b Fixed #7046 - added user website url back into UI 2019-05-21 18:55:12 -07:00
snipe
0358d13ddb Fixed #7044 - API update deleted custom fields if they are not re-presented 2019-05-20 11:49:18 -07:00
snipe
9eb7b668d1 Fixed #6880 - correctly encrypt encrypted fields via the API 2019-05-15 19:33:30 -07:00
snipe
888bdbdb68 Added ability to update groups via API 
Fixes [ch9139]
 2019-05-15 16:39:34 -07:00
Ivan Nieto
e40a5a70a5 RTF support added (#7024) 
* Added the Gatte Facade to AssetsController

* Added the filetype RTF in the modal to upload files

* Added validation of RTF files
 2019-05-15 15:47:40 -07:00
snipe
d016076806
Fixed #6956 - viewKeys policy inconsistent (#7009) 
* 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
 2019-05-08 08:14:49 -04:00
snipe
407445456a Merge branch 'features/6204_email_audit-alerts' into develop 
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
 2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for 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)
 2019-05-05 22:32:52 -04:00
snipe
e4a298ca2a Added scope for both overdue and upcoming 2019-05-05 22:13:30 -04:00
vicleos
ab8792a13d Update CompaniesController.php (#6900) 
fixed companies destroy error
 2019-05-05 20:57:28 -04:00
snipe
0f0ffd39a8 Added ability to pass audit specs to main API asset search method 2019-05-05 19:19:56 -04:00
snipe
ab060288fa Controller/API methods for due/overdue audits 
We could probably skip this and just handle it via view in the routes…
 2019-05-05 19:13:37 -04:00
snipe
ce16eae508 Merge branch 'master' of https://github.com/snipe/snipe-it 2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd Fixed #6911 - note must be a string on license checkin 2019-05-02 15:20:47 -07:00
snipe
420e8bc85a Allow phone number to be changed in Profile 2019-04-18 14:13:50 -04:00
Ivan Nieto
b1f96448af Remove old redundant code in LicensesController, added an offset to AccessoriesController for pagination to work correctly (#6847) 2019-04-02 10:13:58 -07:00
Martin Meredith
b779e274cc Fix usage of Google2FA Facade (#6864) 2019-03-27 22:01:38 -07:00
Martin Meredith
83257af267 Fix imports for 2FA Login (#6855) 2019-03-26 14:10:56 -07:00
snipe
109a29b5fc Fix error in tests 2019-03-20 04:39:50 -07:00
snipe
acb90c7aee Horrible master -> dev merge that makes baby jesus cry :( 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	composer.json
#	composer.lock
#	resources/views/auth/two_factor_enroll.blade.php
 2019-03-20 02:24:23 -07:00
snipe
bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop 
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.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/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
 2019-03-20 02:17:02 -07:00
snipe
da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA (#6840) 
* Fixed  #6834 and #6402 - use inline QR code generation for

* Update auth controllers to use translations

* Updated composer lock

* Added comments

* Moar comments

* Typo
 2019-03-20 01:24:31 -07:00
snipe
335e8ffaaa Typo 2019-03-20 01:22:20 -07:00
snipe
8d0ee9e531 Moar comments 2019-03-20 01:21:34 -07:00
snipe
cc5c7d33e7 Added comments 2019-03-20 01:14:58 -07:00
snipe
5699e021de Update auth controllers to use translations 2019-03-20 00:50:09 -07:00
snipe
cf92618c70 Fixed #6834 and #6402 - use inline QR code generation for 2019-03-20 00:49:44 -07:00
snipe
a874dbb0d0 Working attempt, but will try with old library for mininal footprint 2019-03-19 23:18:16 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list (#6822) 
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced

I also updated the language in the user’s listing table to clarify what “activated” means

* Added login enabled info to user view

* Clarified comments

* Added info about 2FA on user profile

Because why not

* Added nowrap to table, and added 2FA reset for superadmins
 2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask (#6826) 
* Check for empty headers in import

* Added import permission

* Fixed model path in docblock

* Added import gate to default blade

* Check if the user is an admin OR idf they have import permissions

* Walked back that admin permission

Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
 2019-03-18 11:58:08 -07:00
Ivan Nieto
c7f48951a9 Valo/checkin date in history of asset (#6733) 
* To see checkin/checkout Date in History of Asset

* Added some logic to get today's date if the checkin_at input is blank

* Updating the action_date taking the value from the action_log table

* Hide created_at field and rename 'Action Date' as only 'Date'
 2019-03-13 21:36:32 -07:00
Marián Skrip
8d63533205 Add write-only image_source field for asset create/edit API endpoint (#6146) 
`image_source` should contain base64 encoded image data with mime-type.
 2019-03-13 21:00:40 -07:00
Ivan Nieto
8c65214b1f Ignore the soft deleted assets in the eloquent query (#6824) 2019-03-13 20:14:30 -07:00
Martin Meredith
e3e0d57f56 Minor code cleanup bits and bobs (#6805) 
* Add IDE Helper files

* Cleanup imports

- Alphabetises imports
- Removes unused imports

* Add Platform requirements

* Move filling asset into block where asset exists

* Remove duplicate array keys
 2019-03-13 20:12:03 -07:00
snipe
858d382e26 Changed logging to info level for LDAP 2019-03-13 15:14:03 -07:00
snipe
de16fee00a Change image unlink error log to info from error 2019-03-13 12:22:12 -07:00
snipe
1b0d855c00 Added translation, removed commented out code 2019-03-13 12:15:48 -07:00
snipe
61afdeac2e Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop 2019-03-08 16:18:48 -08:00
Martin Meredith
0840ab41d5 Hotfix: Fix ability to create assets (#6790) 2019-03-06 16:37:58 -08:00
snipe
5293cb30bd Merge branch 'fixes/only_present_image_url_if_image_present_in_profile_api' into develop 2019-03-05 23:54:08 -08:00
snipe
6d98bd6846
Fixed error if item requested or request was deleted (#6786) 
ch628
 2019-03-05 23:47:36 -08:00
snipe
0b0813b260 Fixed error if item requested or request was deleted 
ch628
 2019-03-05 23:46:40 -08:00