snipe
|
e27065fe16
|
Merge branch 'develop-v6-integration' into develop-v6-rc1
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
|
2021-09-21 23:46:50 -07:00 |
|
|
snipe
|
3821c4d372
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 21:53:40 -07:00 |
|
|
snipe
|
104d66b4b1
|
Merge pull request #10115 from snipe/features/added_footer_to_depreciation_report_totals
Added totals to depreciation report footer
|
2021-09-21 21:53:17 -07:00 |
|
|
snipe
|
b4a90045e6
|
Added totals to depreciation report footer
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:52:18 -07:00 |
|
|
snipe
|
3b9b63a7a8
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 21:29:11 -07:00 |
|
|
snipe
|
9b78b25372
|
Grr. 100 should be 1000
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:28:59 -07:00 |
|
|
snipe
|
0411f63591
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 21:25:39 -07:00 |
|
|
snipe
|
7df4f98e19
|
Bump number per page up to 1000
Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries.
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 21:25:22 -07:00 |
|
|
snipe
|
86a4f2d3ec
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 20:54:37 -07:00 |
|
|
snipe
|
0763c76a4e
|
Fixed scoping with leftjoin
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:54:24 -07:00 |
|
|
snipe
|
3af7c66de7
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 20:11:08 -07:00 |
|
|
snipe
|
0be4b21721
|
Merge pull request #10114 from snipe/fixes/sorting_in_non_assets
Fixes sorting on non-asset relations in API
|
2021-09-21 20:09:43 -07:00 |
|
|
snipe
|
b7f0e76e4c
|
Merge branch 'develop-v6-integration' of https://github.com/snipe/snipe-it into develop-v6-integration
|
2021-09-21 20:07:07 -07:00 |
|
|
snipe
|
6d3c8a9189
|
Add @Delta5 as a contributor
|
2021-09-21 20:06:45 -07:00 |
|
|
snipe
|
df1b1bc972
|
Merge pull request #10111 from Delta5/add-restore-user-api-endpoint
Added restore functionality to user API
|
2021-09-21 20:05:52 -07:00 |
|
|
snipe
|
5d32c17a2e
|
Removed comments
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:01:36 -07:00 |
|
|
snipe
|
10ca7cffc3
|
Fixes for query scoping, ordering, and nicer readability
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 19:59:23 -07:00 |
|
Godfrey M
|
160017c720
|
more deadspace
|
2021-09-21 19:28:39 -07:00 |
|
|
Godfrey M
|
941cba73b9
|
removed deadspace and unnecessary css changes
|
2021-09-21 19:27:17 -07:00 |
|
|
Godfrey M
|
4a0c8de82a
|
adds jquery eventlistner to monitor chart.js width and refresh accordingly
|
2021-09-21 19:13:09 -07:00 |
|
|
snipe
|
05faffbd28
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 17:50:35 -07:00 |
|
|
snipe
|
dacdf788bc
|
Reverted erroneous german text in UK language files
|
2021-09-21 17:50:13 -07:00 |
|
|
snipe
|
d54057e495
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-21 15:55:04 -07:00 |
|
|
snipe
|
a22c35140b
|
Merge pull request #10112 from snipe/fixes/strtolower_for_category_type
Improved category_type with strtolower() to make it case insensitive
|
2021-09-21 15:54:35 -07:00 |
|
|
snipe
|
61176335d7
|
Improved category_type with strtolower() to make it case insensitive
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 15:51:41 -07:00 |
|
Delta5
|
c8c3c7fbbd
|
Fixed issue with incorrect error message
|
2021-09-21 19:45:18 +00:00 |
|
|
Delta5
|
615f7e3c69
|
Fix author name and remove additional line spacing
|
2021-09-21 19:18:19 +00:00 |
|
|
Delta5
|
59302e1d19
|
Add restore to users api endpoint
|
2021-09-21 17:42:26 +00:00 |
|
|
Delta5
|
20f7fe1ecc
|
Add restore to users api endpoint
|
2021-09-21 17:36:11 +00:00 |
|
|
snipe
|
11c8b1259e
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-20 18:49:17 -07:00 |
|
|
snipe
|
9b52c61d95
|
Updated banner with better warning
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:49:04 -07:00 |
|
|
snipe
|
2dfb965885
|
Merge pull request #10104 from snipe/fixes/revamp_pave_command_to_persist_api_keys
Fixes pave command to persist api keys and first few test users
|
2021-09-20 18:48:11 -07:00 |
|
|
snipe
|
36464bc17d
|
Fix confirmation, because apparently you can't pass that along via cli vs interactively
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:22:06 -07:00 |
|
|
snipe
|
f35208d58d
|
Clean up, find custom fields and drop those columns
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:03:13 -07:00 |
|
|
snipe
|
4d30edd535
|
Let's make sure to keep some of the stuff we need on the demo as well
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 17:29:32 -07:00 |
|
|
snipe
|
957f33c8cf
|
First stab at a better pave command
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 17:19:41 -07:00 |
|
|
snipe
|
d24822e342
|
Retroactively fix any existing settings for that table
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 15:47:29 -07:00 |
|
|
snipe
|
c59c7337a5
|
Forgot the ->change() method
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 15:42:25 -07:00 |
|
|
snipe
|
b331bb33d9
|
Code fixes and a new migration
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 15:37:24 -07:00 |
|
|
snipe
|
7c8c567eaf
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-20 15:12:53 -07:00 |
|
|
snipe
|
6772ace94e
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2021-09-20 15:10:54 -07:00 |
|
|
snipe
|
ee28f3e853
|
Merge branch 'snyk-fix-bb1a61f0d07295579c411381da690d4c' of https://github.com/snipe/snipe-it into develop
|
2021-09-20 15:10:31 -07:00 |
|
|
snipe
|
81f1f4ce6f
|
Add @vapier as a contributor
|
2021-09-20 15:07:37 -07:00 |
|
|
snipe
|
3b79038879
|
Merge pull request #10082 from vapier/develop
add rewrite rule for Let's Encrypt certificates
|
2021-09-20 14:57:14 -07:00 |
|
|
snipe
|
7e611fa699
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-15 13:55:12 -07:00 |
|
|
snipe
|
e8ad5dc273
|
Merge pull request #10086 from snipe/fixes_depreciation_report
Fixed extraneous asset search in depreciation report
|
2021-09-15 13:54:32 -07:00 |
|
|
snipe
|
8a93e1e796
|
Remove asset call on depreciation report controller method
We ajax this in now, so no need for it
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 13:49:53 -07:00 |
|
|
snipe
|
3d7000f759
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-15 11:33:30 -07:00 |
|
|
snipe
|
d96f877aa4
|
Default show_in_nav to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 11:33:13 -07:00 |
|
Mike Frysinger
|
7b665ade0a
|
add rewrite rule for Let's Encrypt certificates
The LE tools need access to a stable path to automatically obtain
certificates, so add a rewrite rule to allow it.
|
2021-09-14 16:21:31 -04:00 |
|