snipe
2624b8c827
Added weekly digest app for repo
...
https://github.com/apps/weekly-digest
2019-02-14 13:52:56 -08:00
snipe
bfc1ebc4ba
Merge branch 'fixes/auto_increment_prefix' into develop
2019-02-14 13:09:40 -08:00
snipe
14eb6b387b
Possible fix for #6710 - explicitly make auto_increment_prefix nullable ( #6716 )
...
* Possible fix for #6710 - explicitly make auto_increment_prefix nullable
* Added migration to make auto_increment_prefix explicitly nullable
2019-02-14 12:46:09 -08:00
snipe
6b106e48e9
Added migration to make auto_increment_prefix explicitly nullable
2019-02-14 12:45:21 -08:00
snipe
18c591f993
Possible fix for #6710 - explicitly make auto_increment_prefix nullable
2019-02-14 12:30:18 -08:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
c3c4ad1ae6
One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 22:45:05 -08:00
snipe
a4420efb7d
I guess we use 10 as the settings for password min in tests
2019-02-13 22:13:32 -08:00
snipe
d24851c5d8
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-02-13 22:04:58 -08:00
snipe
794bc45cc0
Fixed tests
2019-02-13 21:59:24 -08:00
snipe
d893837c86
Removed debugging
2019-02-13 21:32:26 -08:00
snipe
230c9da1df
Fixed #6703 - fixes password confirmation
2019-02-13 21:30:15 -08:00
snipe
b5aadd4b74
Add @lubo as a contributor
2019-02-13 20:50:25 -08:00
Ľubomír Kučera
9183de578d
docker: Fix upgrades ( #6680 )
...
Until now, the Docker image was not performing actions that are
necessary for an upgrade completion. That is considered an
anti-pattern.
See https://snipe-it.readme.io/docs/upgrading for more information.
2019-02-13 20:49:36 -08:00
snipe
cd1ef1d316
Literally no idea where that folder came from
2019-02-13 07:58:11 -08:00
snipe
9035707bd6
Bumped point version
2019-02-13 07:40:52 -08:00
snipe
9247dc592b
Removed debugging statements
2019-02-13 07:09:49 -08:00
snipe
35898e4ca0
Added asset tag to maintenances report
2019-02-13 07:09:16 -08:00
snipe
cd333fa93b
Fixed wonky merge :(
2019-02-13 06:52:36 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# 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/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
3b525f0009
Fixed #6705 - undefined is not a function (near '...$.validate...')
...
Not sure what happened here, but re-running webpack seems to have resolved it.
2019-02-13 05:16:12 -08:00
snipe
f1fa5bdaa9
Fixed (develop) #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:56:13 -08:00
snipe
aa1e06f021
One more time…. Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:46:19 -08:00
snipe
30b1cfabf5
Fixed dumb formatting
2019-02-13 04:45:21 -08:00
snipe
e75d22ab73
Revert "Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets"
...
This reverts commit b1e17743b8
.
2019-02-13 04:44:19 -08:00
snipe
b1e17743b8
Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:35:55 -08:00
snipe
2768ea692e
Removed extraneous js call
2019-02-13 04:24:37 -08:00
snipe
83c511e1c8
Removed gh-changelog - we don’t use it anymore
2019-02-13 04:24:23 -08:00
snipe
35e60fd151
Updated languages
2019-02-13 03:56:18 -08:00
snipe
471fcd1272
Set beta version tag
2019-02-13 02:27:56 -08:00
snipe
1e1d32dc85
Make user notes field editable via API
2019-02-13 01:32:00 -08:00
snipe
b317fb8d83
Fixed #6367 - pass table name and column_id to scopeCompanyables
2019-02-13 01:29:53 -08:00
snipe
e2c0f01a10
Fixed #6367 - pass table name and column_id to scopeCompanyables
...
Solves error: Integrity constraint violation: 1052 Column 'company_id' in where clause is ambiguous
2019-02-13 01:26:11 -08:00
snipe
f88fee0f21
Make user notes field editable via API
2019-02-12 23:58:30 -08:00
snipe
245b3ca09f
Fixed #6061 - Assigned user group cannot be removed
2019-02-12 23:49:42 -08:00
snipe
c0669150fb
Bumped point version
2019-02-12 23:48:31 -08:00
snipe
f3c12f38b6
Fixed #6061 - Assigned user group cannot be removed
...
This bug was a result of attempting to check if the groups field had a value, and only THEN trying to sync the groups. This meant that uf you were removing ALL groups, the sync wouldn’t be triggered.
This still needs to be updated in the API.
2019-02-12 23:43:38 -08:00
snipe
da34b82b3e
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:33:01 -08:00
snipe
5e19178a30
Do not count deleted locations in managedLocation check on user delete
2019-02-12 23:32:10 -08:00
snipe
8e358faebc
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API
2019-02-12 22:15:32 -08:00
snipe
90cddb7aee
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API ( #6693 )
...
Need to confirm that re-enabling `\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,` won’t mangle anything. I know we ran into some issues when testing a long time ago, but not sure those issues apply anymore, and I can’t remember what they were.
2019-02-12 22:08:38 -08:00
herroworrd
3f7d2aebc7
Fixed #6634 : Asset Import History fixes and optimizations ( #6657 )
...
* Starting work on asset history importer.
* Starting work on asset history importer.
* Added checkin target.
* Last change... importing history should also probably be an admin only task.
* Added caching for user and asset queries.
* Updated cache keepalive time to DateTimeInterface
* Updated cache keepalive time to DateTimeInterface
2019-02-08 16:05:56 -08:00
Steffen
5624ea14e7
Fix accessories edit error ( #6698 )
...
* Add accessories_upload_path singleton (used in accessories/edit)
* Fix indent
2019-02-08 15:43:11 -08:00
Steffen
3530603797
Simplify slack channel regexp and allow private (no # prefix) channels and direct messages (@ prefix) ( #6699 )
2019-02-08 15:41:54 -08:00
snipe
4fd469e07b
Prevent editing special users demo mode
2019-02-04 19:13:55 -08:00
snipe
59cb1e561e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-02-04 18:59:53 -08:00
snipe
4fe63d2966
Fixed #6633 - return 200 status code on asset API
2019-02-04 18:59:49 -08:00
snipe
6d828964be
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-02-04 18:58:32 -08:00
snipe
971fcf5800
Fixed #6633 - return 200 status code
2019-02-04 18:58:28 -08:00