snipe
|
e321aeabae
|
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# 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
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
|
2020-08-31 12:14:44 -07:00 |
|
snipe
|
8ec99ff433
|
Merge pull request #8374 from snipe/fixes/moar_flysystem
WIP - More Flysystem fixes
|
2020-08-31 09:45:27 -07:00 |
|
snipe
|
f2c60d055b
|
Updated docblock
|
2020-08-28 18:22:57 -07:00 |
|
snipe
|
e1cc003cec
|
Fixed backup urls for download
|
2020-08-28 18:22:37 -07:00 |
|
snipe
|
5aaa2430b4
|
Fixes for backups
|
2020-08-28 14:10:43 -07:00 |
|
snipe
|
bc5a82e734
|
Small fixed for file mover artisan command
|
2020-08-28 14:10:28 -07:00 |
|
snipe
|
c23e28d0df
|
Merge pull request #8372 from snipe/fix_adldap_sync
Fix adldap sync
|
2020-08-26 13:34:07 -07:00 |
|
snipe
|
5abd85003c
|
Merge pull request #8371 from snipe/bushelpowered-develop
Fixed #7919 - LDAP Logins + query filters
|
2020-08-26 13:33:41 -07:00 |
|
Brady Wetherington
|
67a1d2fa5f
|
Remove hardcoding of LDAP Auth query to 'uid=', use setting instead
|
2020-08-26 12:25:10 -07:00 |
|
snipe
|
24be73f76b
|
Use image handling request for logo uploads
|
2020-08-26 12:17:50 -07:00 |
|
snipe
|
a86dc52695
|
Added fieldname to file name for better clarity on setting logos
|
2020-08-26 12:17:36 -07:00 |
|
snipe
|
1ff7e6b834
|
Use Storage facade for user presenter
|
2020-08-26 12:17:18 -07:00 |
|
snipe
|
fa2dfc3e87
|
Use updated request signature for models
|
2020-08-26 11:59:30 -07:00 |
|
snipe
|
d25a05d748
|
Misc Flysystem/image upload request fixes
|
2020-08-26 11:53:36 -07:00 |
|
snipe
|
139c874308
|
Fixed delete old image on upload
|
2020-08-26 02:48:07 -07:00 |
|
snipe
|
db385b5f6b
|
Fixed assetmodels selectlist
|
2020-08-26 02:32:39 -07:00 |
|
snipe
|
f385f3e928
|
Fixed user image upload
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
|
2020-08-26 02:30:23 -07:00 |
|
snipe
|
de21f00771
|
Fixed assetmodels upload
|
2020-08-26 02:29:37 -07:00 |
|
snipe
|
37568ae9ec
|
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
|
2020-08-25 20:49:37 -07:00 |
|
snipe
|
32ad9050cf
|
Added google maps to CSP
|
2020-08-25 20:48:53 -07:00 |
|
snipe
|
3c6883489c
|
Added assignedTo scope
|
2020-08-25 20:37:30 -07:00 |
|
Brady Wetherington
|
6c23e881c7
|
Merge branch 'develop' of https://github.com/bushelpowered/snipe-it into bushelpowered-develop
|
2020-08-24 21:42:04 -07:00 |
|
Brady Wetherington
|
b721a977c0
|
Fix PHP 7.4 deprecation warnings in ldap-sync script.
|
2020-08-24 21:35:00 -07:00 |
|
snipe
|
e5dd6035b9
|
Fixed the other upload handleUploads signatures
|
2020-08-24 18:32:40 -07:00 |
|
snipe
|
66686f8080
|
Added some debugging - will remove at RC
|
2020-08-24 18:32:15 -07:00 |
|
snipe
|
041fc20955
|
Fixed Companies and Categories uploads
|
2020-08-24 15:43:11 -07:00 |
|
snipe
|
b97ff4e907
|
Fixed Depts uploads
|
2020-08-24 15:10:26 -07:00 |
|
snipe
|
5aeac3c9e0
|
Fixed parse error
|
2020-08-24 14:30:43 -07:00 |
|
snipe
|
bcad49ce79
|
Try to better handle slack “too many requests” issue
|
2020-08-14 16:10:22 -07:00 |
|
snipe
|
b5acca89d7
|
Check for admin for slack notifications
|
2020-08-14 16:02:15 -07:00 |
|
snipe
|
e52919cf1b
|
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
|
2020-08-14 15:35:15 -07:00 |
|
snipe
|
29f3a5c48f
|
Use more verbose annotation for Auth::user if/else
|
2020-08-14 15:27:40 -07:00 |
|
snipe
|
134e8e6fb9
|
Moved user email nulling until after the save
|
2020-08-14 15:25:07 -07:00 |
|
Brady Wetherington
|
4b7f6a95e3
|
Fix deprecation report for customers with many active assets
|
2020-08-14 15:07:59 -07:00 |
|
Brady Wetherington
|
5128992940
|
Fix deprecation report for customers with many active assets
|
2020-08-14 15:03:03 -07:00 |
|
snipe
|
0291323502
|
Use the user as the target
|
2020-08-14 14:57:58 -07:00 |
|
Brady Wetherington
|
262a964760
|
[WIP] fix ldap-sync for v5 with AdLdap2
|
2020-08-14 14:45:05 -07:00 |
|
snipe
|
e0f6f9b839
|
Artisan command to check in licenses from all users
|
2020-08-14 14:43:37 -07:00 |
|
snipe
|
f1a6308002
|
Check for Auth::user before trying to log id (for cli)
|
2020-08-14 14:43:07 -07:00 |
|
Brady Wetherington
|
799c059070
|
Add internationalized version of LDAP error message
|
2020-08-11 16:39:02 -07:00 |
|
Brady Wetherington
|
c62d43a778
|
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
|
2020-08-11 16:39:02 -07:00 |
|
Brady Wetherington
|
e0644dbbf6
|
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
|
2020-08-10 17:22:31 -07:00 |
|
snipe
|
6a089f86f8
|
Fixed pathing for accessories
|
2020-08-03 11:17:56 -07:00 |
|
snipe
|
9a39cf721e
|
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
|
2020-07-31 12:18:49 -07:00 |
|
snipe
|
3e62a6ea2d
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2020-07-31 11:01:35 -07:00 |
|
Brady Wetherington
|
7410b16835
|
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
|
2020-07-24 16:22:44 -07:00 |
|
andres
|
8994f3e15e
|
cleanup
|
2020-07-22 19:57:06 -04:00 |
|
andres
|
d23f1a77ca
|
implement checkout API
|
2020-07-22 19:56:31 -04:00 |
|
snipe
|
e955c983a3
|
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
|
2020-07-22 13:43:29 -07:00 |
|
Brady Wetherington
|
b09e7d19b3
|
Add new useraccountcontrol value for valid AD users; document algorithm and values
|
2020-07-22 13:32:16 -07:00 |
|