snipe
|
ebdbc20740
|
Adds stricter validation for slack endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-06 11:40:24 -08:00 |
|
snipe
|
cae62fd4c7
|
Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity
Fixed #5676: Sum cost by quantity
|
2021-12-02 12:13: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 |
|
Matthew Nickson
|
9381ba2404
|
Merge branch 'develop' into sum_cost_by_quantity
|
2021-11-21 18:59:34 +00:00 |
|
snipe
|
c49c5f4164
|
Added text-right to presenters for money values
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-18 15:09:17 -08:00 |
|
snipe
|
bbb0d1be17
|
Possible fix for asset model editing when no custom fieldset is associated
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 21:09:35 -08:00 |
|
snipe
|
476e17055b
|
Escape custom fields in API response
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 20:31:01 -08: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
|
c2b5f9b372
|
Cleaned up the output and added some better checks for errors
|
2021-11-10 17:08:04 -08:00 |
|
Brady Wetherington
|
2b6614e2dd
|
Tweak Restore command to _also_ run via webserver via Artisan::call()
|
2021-11-10 12:44:19 -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
|
76685d7fd3
|
Clearer text in restore artisan command
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:32 -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
|
3b25093aeb
|
Removed noisy debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:38:27 -08:00 |
|
snipe
|
76506dabbf
|
Made helpers call full namespace (tho I have no idea why this was necessary)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:38:14 -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
|
3ea209a507
|
Escape asset_tag attribute at controller level for consumption in bulk checkout
|
2021-11-08 20:27:43 -08:00 |
|
Terrell Eaton
|
2c7a71a2a1
|
Fixes not being able to search by checked out user in advanced search
|
2021-11-01 22:14:19 +01: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
|
84a3a85823
|
Fixed parse error for merge conflict
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 18:04:03 -07:00 |
|
snipe
|
798f6d65de
|
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
|
2021-10-28 17:53:24 -07:00 |
|
snipe
|
76cc46c419
|
Merge pull request #9814 from 01ste02/importMinAmt
Improved Consumable Import: Import min_amt for consumables
|
2021-10-28 17:49:44 -07:00 |
|
snipe
|
bdf321ecc9
|
Merge branch 'develop' into change-var-aws-public-url
|
2021-10-28 17:46:16 -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
|
371a39a118
|
Merge branch 'develop' into fixes/advanced_search_serial_v2
|
2021-10-28 16:42:10 -07:00 |
|
snipe
|
7821d38e60
|
Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance
Fixes asset components must return relationship instance
|
2021-10-28 16:38:21 -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 |
|
Ivan Nieto Vivanco
|
ee9133f722
|
Return the proper Asset-Components relationship
|
2021-10-27 16:42:51 -05: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 |
|
snipe
|
8b1c60a17a
|
Make gates a little more consistent
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-25 15:34:22 -07:00 |
|
snipe
|
033c3253bb
|
Fixed permissions array to handle missing clone button
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-25 14:10:17 -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
|
31d49b5c9b
|
Fixed merge error parse error
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 18:11:34 -07: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
|
ae1a4bb3c9
|
Fixed extra braces from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:36:06 -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 |
|
Matthew Nickson
|
8996c24d1f
|
Merge branch 'develop' into sum_cost_by_quantity
|
2021-10-10 13:01:44 +01: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 |
|