DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
4697 commits 95 branches 267 tags 294 MiB
Commit graph

4697 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 00a8a2aff3 Fixed next audit date math 2019-05-05 20:00:05 -04:00
snipe 7497eaf302 Removed unused setting variable 2019-05-05 19:58:08 -04:00
snipe 7d416d1175 Fixed :threshold placeholder 2019-05-05 19:57:23 -04:00
snipe e9b9301efb Added language strings for audit views 2019-05-05 19:35:20 -04:00
snipe 7b194c678c Cleanup on audit due/overdue console command 2019-05-05 19:22:08 -04:00
snipe 4369d6adc6 Added audit due/overdue blades 2019-05-05 19:21:48 -04:00
snipe 69614a7db4 Added gated sidenav items to left nav 2019-05-05 19:21:26 -04:00
snipe 8154d1116c Added bootstrap-tables presenter formatter to display an audit button 2019-05-05 19:21:06 -04:00
snipe 05a85c628f Added audit presenter 2019-05-05 19:20:17 -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 996a4cc29b Added audit due console command to kernel 2019-05-05 19:15:24 -04:00
snipe 0e234bac70 Added query scopes for due and overdue audits 2019-05-05 19:14:02 -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 52c9e8ad96 Added route to list overdue / upcoming assets via API 2019-05-05 19:11:28 -04:00
snipe e46cccdf90 Added upcoming audit report 
TODO: Fid diff/threshold math
 2019-05-04 17:52:17 -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 dae26e0378 Remove “Imported from LDAP” note override 2019-04-18 17:56:08 -04:00
snipe 1bb1f7342f Fixed #6922 - date_add crashing if EOL is null 2019-04-18 15:49:59 -04:00
snipe 420e8bc85a Allow phone number to be changed in Profile 2019-04-18 14:13:50 -04:00
snipe a521523d45 Truncate imports table on seed 2019-04-18 14:13:33 -04:00
snipe ded1a59914 Removed help text for email images (since we embed them by default now) 
Added help text for username format
 2019-04-02 18:22:31 -07:00
snipe fe553aec02 Added first-initial dot lastname format for usernames/email 
Fixed [ch1379]
 2019-04-02 18:21:54 -07:00
snipe 37b8029d04 Fixed parse error on label settings 
Also fixed [ch1362] - moving left/right
 2019-04-02 18:04:31 -07: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 d01f9a701c Fix double-encoding issue? 
I assume there’s something new in Laravel 5.7/5.8 that’s causing the double escaping. I’m not seeing it everywhere, which is more confusing, TBH. :-/
 2019-03-20 04:12:03 -07:00
snipe 25884a893e Bumped version 2019-03-20 02:41:33 -07:00
snipe d1e9fbfa24 Updated compoer 2019-03-20 02:37:44 -07:00
snipe 53419b33a5 Compiled assets 2019-03-20 02:35:32 -07:00
snipe d429a1c423 Bumped version 2019-03-20 02:32:32 -07:00
snipe fe0bda0d04 Updated composer 2019-03-20 02:31:13 -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 69c61420f6 Updated composer lock 2019-03-20 00:50:15 -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 0614ab4362 Upgraded pragmarx/google2fa 2019-03-19 23:10:49 -07:00
snipe 8ed268819e Fixed XSS 2019-03-18 21:09:57 -07:00
snipe 1451b4f45d Merge branch 'master' of https://github.com/snipe/snipe-it 2019-03-18 20:51:11 -07:00
snipe b6da68a69c Bumped version 2019-03-18 20:50:47 -07:00