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

2114 commits

Author SHA1 Message Date
snipe
8b4a9aa382 Fixes to history importer 2019-08-13 18:15:42 -07:00
snipe
0e93495ca2 Check that the user has assets and that the aset model is valid 2019-07-17 17:51:35 -07:00
snipe
77a6f6f400 Cap warranty months to 3 on the frontend blade 2019-07-17 12:15:15 -07:00
snipe
fecf8015a1 Added space between footer and custom message 2019-07-17 12:09:32 -07:00
snipe
79ab0d8dc2 Check for valid seat on hardware view 2019-07-17 12:09:18 -07:00
snipe
6736b1c4e7 Addresses #7238 - add PWA code to layout 
Needs additional UX testing
 2019-07-15 13:49:56 -07:00
snipe
6966c132d0 Update language strings 2019-05-31 12:17:09 -07:00
snipe
c29ab90029 Added Filipino, corrected order for Spanish variations 2019-05-31 11:58:14 -07:00
snipe
087cdd859e Fixed #7092 - handle weird port forwarding/port numbers for baseUrl 2019-05-29 14:57:58 -07:00
snipe
2dd31544fe Increased image size to 800px, added lightboxes 2019-05-24 19:11:08 -07:00
snipe
237acdcff0 Show accessory image on view page 2019-05-24 18:22:57 -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
149ac4bdf8 Removed cosole log 2019-05-23 17:52:53 -07:00
snipe
f6ef139111 Fixed baseUrl is undefined error 
I literally cannot figure out how this ever worked before.
 2019-05-23 16:56:22 -07:00
snipe
de1189295a Added spatie language files 2019-05-22 00:51:00 -07:00
snipe
21ec670531 Updated language strings 2019-05-21 19:17:00 -07:00
snipe
b2eacb147b Fixed #7046 - added user website url back into UI 2019-05-21 18:55:12 -07:00
snipe
729e3eb70d Updated email strings 2019-05-21 18:43:00 -07:00
snipe
978533b2f4 Fixed XSS vulnerability when creating a new categories, etc via modal on create 
Same fix as before, because of the weird select2 post-parsing ajax behavior
 2019-05-21 18:29:50 -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
snipe
00a8a2aff3 Fixed next audit date math 2019-05-05 20:00:05 -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
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
e46cccdf90 Added upcoming audit report 
TODO: Fid diff/threshold math
 2019-05-04 17:52:17 -04:00
ajsy
0cdc7af611 Update print.blade.php 2019-05-03 15:22:01 +03: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
ajsy
878cfee5a2 Revert "Delete print.blade.php" 
This reverts commit a0721412fa.
 2019-04-20 09:28:48 +03:00
ajsy
a0721412fa
Delete print.blade.php 2019-04-19 15:50:05 +03:00
ajsy
52add03e56 Update print.blade.php 
replace string in serial number with x except last five character
 2019-04-19 15:43:40 +03:00
ajsy
c974968821 Update view.blade.php 2019-04-19 14:03:09 +03:00
ajsy
f2242fa32e Update view.blade.php 2019-04-19 13:20:41 +03:00
ajsy
7a68187466 Update table.php 2019-04-19 13:20:31 +03:00
snipe
420e8bc85a Allow phone number to be changed in Profile 2019-04-18 14:13:50 -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
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
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
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