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
8ec99ff433
Merge pull request #8374 from snipe/fixes/moar_flysystem
...
WIP - More Flysystem fixes
2020-08-31 09:45:27 -07:00
f2c60d055b
Updated docblock
2020-08-28 18:22:57 -07:00
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
5aaa2430b4
Fixes for backups
2020-08-28 14:10:43 -07:00
c23e28d0df
Merge pull request #8372 from snipe/fix_adldap_sync
...
Fix adldap sync
2020-08-26 13:34:07 -07:00
24be73f76b
Use image handling request for logo uploads
2020-08-26 12:17:50 -07:00
fa2dfc3e87
Use updated request signature for models
2020-08-26 11:59:30 -07:00
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
db385b5f6b
Fixed assetmodels selectlist
2020-08-26 02:32:39 -07:00
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
de21f00771
Fixed assetmodels upload
2020-08-26 02:29:37 -07:00
3c6883489c
Added assignedTo scope
2020-08-25 20:37:30 -07:00
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
041fc20955
Fixed Companies and Categories uploads
2020-08-24 15:43:11 -07:00
b97ff4e907
Fixed Depts uploads
2020-08-24 15:10:26 -07:00
4b7f6a95e3
Fix deprecation report for customers with many active assets
2020-08-14 15:07:59 -07:00
5128992940
Fix deprecation report for customers with many active assets
2020-08-14 15:03:03 -07:00
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
9a39cf721e
Merge pull request #8258 from ballertv/features/consumable-api
...
This looks great, thank you!
2020-07-31 12:18:49 -07:00
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
8994f3e15e
cleanup
2020-07-22 19:57:06 -04:00
d23f1a77ca
implement checkout API
2020-07-22 19:56:31 -04:00
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
799a93c46a
Allow for email/username search on users
2020-07-17 12:11:32 -07:00
897757bd04
Removed added line for location
2020-07-16 17:43:44 -07:00
c7125c3937
Set location_id to rtd_location_id on asset creation
2020-07-16 16:34:39 -07:00
5320f5c67c
Disallow non-super users from editing their own permissions
2020-07-13 21:16:45 -07:00
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
3d8823ede5
Added #5762 Modify expected checkin dates
...
It is now possible to edit expected checkin dates for assets in Actions > Edit Asset
2020-07-10 19:21:04 +01:00
2ac1c1636c
Better handle the logic to determine if we should display the license checkout blade
2020-06-16 16:12:57 -07:00
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
262eb79471
WIP - this needs refactoring
...
We have to use Storage::get() if the filesystem is local, since the method does a file_get_contents() and the file isn’t accessible via a URL since it’s private and doesn’t live on the web root. (We do this slightly differently than Laravel out of the box)
Signed-off-by: snipe <snipe@snipe.net >
2020-05-28 01:59:01 -07:00
8ccc1c6515
Fixed weird merge in Bulk Users Controller
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-27 22:46:42 -07:00
d54acd908c
Made logo file have a better name for multiple tries in the same day
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-27 02:31:04 -07:00
dee1f5ec35
Merge pull request #8078 from dmeltzer/wrong-id
...
Fix incorrectly named parameter.
2020-05-26 19:51:38 -07:00
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
2020-05-23 15:24:10 -04:00
136df9418f
Deadcode--
2020-05-23 15:24:10 -04:00
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
25d6ceee6e
Remove old code.
2020-05-23 12:18:27 -04:00
fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset
2020-05-23 11:48:02 -04:00
c70bd62a0f
Missing includes. Fix by using the request object instead of facade.
2020-05-23 11:36:16 -04:00
ad1db2c640
Fix incorrectly named parameter.
2020-05-23 10:26:56 -04:00
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
274f82893f
Regenerate session ID on logout
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-12 10:38:00 -07:00
0550fe0ffa
Fix for session fixation vulnerability
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-12 10:31:54 -07:00
730632e2eb
Apply PR #8043 to develop
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-11 22:57:55 -07:00
95cc48e422
Added option to disable backup in import
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-11 20:41:10 -07:00
