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
snipe
dee92cfc6c
Fixes XSS vulnerabilities ( #6831 )
...
* Properly escape log_meta values
* Vue syntax fix to allow npm run dev to work again
* Janky fix for Select2 bug
* Compiled production assets
* Escape user’s last name in API
* Removed duplicate alertClass
* Compiled production assets
2019-03-18 20:49:32 -07:00
snipe
dec77890bd
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-03-18 11:59:48 -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
Martin Meredith
1d26195821
Add models IDE helper to .gitignore ( #6829 )
2019-03-18 11:58:33 -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
snipe
ab6744dfba
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-03-14 15:38:20 -07:00
snipe
0fd940ffa4
Check for empty headers in import
2019-03-14 15:38:07 -07:00
Ivan Nieto
bebdbdfb87
Fix #6763 . Import Stuck Processing - Error - Can only flip STRING and INTEGER values! ( #6804 )
...
* Added validation for errors when the Import Field to map isn't setted
* A slightly correction to the error message
* Added the translation strings for the Error Message
2019-03-14 12:32:40 -07:00
Tim Farmer
5893e25b43
Label bugs in alerts settings ( #6808 )
...
* Label bugs in alerts settings
Found another label bug where the alert_email label should be alerts_enabled.
* Update alerts.blade.php
2019-03-14 10:53:05 -07:00
snipe
26c0cf5d33
Allow null for logCheckin $action_date
2019-03-14 01:22:29 -07:00
snipe
239f21b0d7
Set null option for $action_date
2019-03-14 01:09:16 -07:00
snipe
0b927623e8
Added “record created” string for clarification in asset/license history
2019-03-13 22:06:57 -07:00
snipe
96f069c417
Change action_datwe to datetime in transformer
2019-03-13 21:57:06 -07:00
snipe
60e52cc927
Make action_date a datetime
2019-03-13 21:53:56 -07:00
snipe
9f79028391
Fixed copypasta in email_logo down() method
2019-03-13 21:53:45 -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
55f727ef28
Fixed HTML labels on alerts setting page
...
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
2019-03-13 19:53:23 -07:00
snipe
6c71e72dcd
Fixed labels labels (wha?)
...
Wrong HTML labels for some fields in the Settings > Labels page.
Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
2019-03-13 19:50:35 -07:00
snipe
79f4f46e3a
Add @timothyfarmer as a contributor
2019-03-13 19:45:40 -07:00
