Ivan Nieto Vivanco
|
a419a690d4
|
Add a variable to better control the selected user's ids
|
2021-12-11 18:01:38 -06:00 |
|
Brady Wetherington
|
ea71086dfc
|
Yank assetlog from eager-load clause in API query for develop
|
2021-12-10 18:50:34 -08:00 |
|
Brady Wetherington
|
acfb41f129
|
Remove 'actionlog' from the ::with() clause in the asset query API
|
2021-12-10 18:42:56 -08:00 |
|
Haxatron
|
1699c09758
|
Update AssetModelsController.php
|
2021-12-09 21:42:18 +08:00 |
|
Haxatron
|
918e7c8dae
|
Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/
|
2021-12-09 12:57:04 +08:00 |
|
snipe
|
86afe6c4b1
|
Cleanup slack validation
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 18:03:56 -08:00 |
|
snipe
|
ff97b359ad
|
Removed form request on ajax, cleaned up some other things
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 17:58:46 -08:00 |
|
snipe
|
8fa690b635
|
Reverting form request because it doesn't seem to work (????!!)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 17:54:15 -08:00 |
|
snipe
|
8c1cd87831
|
Added slacksettingsrequest as use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 15:56:22 -08:00 |
|
snipe
|
ebdbc20740
|
Adds stricter validation for slack endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-06 11:40:24 -08:00 |
|
snipe
|
3debe78574
|
Merge pull request #10350 from inietov/fixes/trim_custom_fields_names
Apply trim() function when storing Custom Fields names
|
2021-11-24 19:42:04 -08:00 |
|
snipe
|
29bbfad693
|
Applied escaping fix from master to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-24 19:38:27 -08:00 |
|
snipe
|
830d07f84f
|
Removed escaping on input save for asset checkout on creation
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-24 19:19:32 -08:00 |
|
Ivan Nieto Vivanco
|
1ca770895a
|
Apply trim() function when storing Custom Fields names
|
2021-11-22 18:43:21 -06:00 |
|
snipe
|
46d2f8a81d
|
Disallow file upload to backups on demo
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:42:02 -08:00 |
|
snipe
|
92b7aaf44b
|
Log the user out upon successful restore
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:40:01 -08:00 |
|
snipe
|
f2f8f96991
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
|
2021-11-15 19:24:38 -08:00 |
|
Brady Wetherington
|
864cc4f8d5
|
Fix FIXME's by downgrading them to TODO's :)
|
2021-11-10 11:37:10 -08:00 |
|
snipe
|
457c6080cc
|
Better handling if there was no file uploaded
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 01:43:45 -08:00 |
|
snipe
|
96f76e1f6b
|
INCOMPLETE: Added restore and upload methods for backups
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:17 -08:00 |
|
snipe
|
1b1b54fbf4
|
Add modified_value and modified_display so we can use the formatted date but still sort correctly
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:37:49 -08:00 |
|
snipe
|
0e21a95817
|
Escape error message in asset autdit apI (same as in v5)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 19:39:32 -08:00 |
|
Brady Wetherington
|
91f087258b
|
Merge branch 'develop' into remove_old_ldap
|
2021-11-09 18:33:41 -08:00 |
|
Brady Wetherington
|
3ea209a507
|
Escape asset_tag attribute at controller level for consumption in bulk checkout
|
2021-11-08 20:27:43 -08:00 |
|
Brady Wetherington
|
a58c5ce27f
|
Better documentation, disable AdLdap2-based "Add domain" setting
|
2021-11-08 17:11:47 -08:00 |
|
Brady Wetherington
|
b0417e5bd7
|
Finish pulling out the AdLdap2-based LDAP remnants that were still in the system
|
2021-11-03 15:22:06 -07:00 |
|
Brady Wetherington
|
4dda28de9e
|
WIP: cleaning up LDAP
|
2021-10-28 18:19:50 -07:00 |
|
snipe
|
ea0d92c439
|
Merge branch 'develop' into fixes/fmcs_departments
|
2021-10-28 18:18:08 -07:00 |
|
snipe
|
d36849bd41
|
Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report
|
2021-10-28 18:11:03 -07:00 |
|
snipe
|
645529ba78
|
Merge pull request #9889 from ncareau/api-licenses
Add licenses api parameters and fix a missing variable in license view.
|
2021-10-28 17:20:09 -07:00 |
|
snipe
|
2f9e5f79af
|
Merge pull request #10139 from FliegenKLATSCH/patch-1
API: Do not include deleted items per default on lookup by serial
|
2021-10-28 17:09:20 -07:00 |
|
snipe
|
3088230236
|
Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets
Fixes Bug: When parent asset is assigned to other location, children assets loca…
|
2021-10-28 16:49:44 -07:00 |
|
snipe
|
1895dd326f
|
Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user
support apache REDIRECT_* for remote user login
|
2021-10-28 16:34:57 -07:00 |
|
snipe
|
52ef9280ba
|
Adds reqestable as model bulk edit field
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 15:15:54 -07:00 |
|
Steven Daniele
|
efc644c960
|
support apache REDIRECT_* for remote user login
|
2021-10-28 14:23:38 -04:00 |
|
snipe
|
17bf899a17
|
Set default_label to 0 instead of null in API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-25 20:14:01 -07:00 |
|
Ivan Nieto Vivanco
|
9eaf89aaa7
|
Add a variable to better control the selected user's ids
|
2021-10-21 13:28:58 -05:00 |
|
snipe
|
6e0f8068b2
|
Fixed duplicate use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:54:32 -07:00 |
|
snipe
|
9ee13f0d2a
|
Fixed dupe use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:53:43 -07:00 |
|
snipe
|
aa8f1378c9
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
|
2021-10-20 17:26:41 -07:00 |
|
Godfrey M
|
9ae7d0b23a
|
when parent asset is assigned to other location, children assets location are updated as well.
|
2021-10-20 17:01:25 -07:00 |
|
FliegenKLATSCH
|
24c484303e
|
Do not include deleted assets by default when doing lookup by serial
This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.
|
2021-10-09 08:56:31 +02:00 |
|
snipe
|
5d94b99035
|
Switched to 5 in one minute
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:53:32 -07:00 |
|
snipe
|
0674ef5a3d
|
Fixed number to 1 (for minutes)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:43:32 -07:00 |
|
snipe
|
702791210e
|
Throttle password reset requests to 5 every 60 seconds
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 14:26:30 -07:00 |
|
Dampfklon
|
7645f23f5c
|
remove pending Acceptances on checkin
|
2021-10-07 21:03:46 +02:00 |
|
Dampfklon
|
4418ad2340
|
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
|
2021-10-07 21:03:46 +02:00 |
|
Dampfklon
|
12ee06deb6
|
add Download All Button, change route analogue to activity report
|
2021-10-07 21:01:50 +02:00 |
|
Dampfklon
|
9a9ca59544
|
Fix decprecated implode usage
|
2021-10-07 20:55:47 +02:00 |
|
Dampfklon
|
ed99532c30
|
Unaccepted Assets Report Actions (send reminder, delete) added
Unaccepted Assets Export fixed
|
2021-10-07 20:53:02 +02:00 |
|