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
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
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
Ivan Nieto Vivanco
23b770fac6
Added a validation to use the same name in categories with different types
2021-10-08 15:19:16 -05:00
snipe
1c77fd0d09
Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror
...
Fixed typo when setting the headers
2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco
d184da8611
Fixed typo (thanks @ssddanbrown)
2021-10-08 13:39:49 -05:00
Dampfklon
ab4a234e20
fix rebase errors
2021-10-07 21:32:57 +02: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
snipe
ccd430ce07
Switched back down to debug level
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:38:21 -07:00
snipe
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:26:45 -07:00
snipe
c06a93ef13
Removed extra brace in assets for components
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco
ef6eea67d8
Set headers in a different manner in the middleware
2021-10-05 14:09:35 -05:00
Brady Wetherington
bbeedc026d
A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.
2021-10-04 22:07:29 -07:00
Brady Wetherington
d80604f2ac
Most of the basics are working, but not done and lots of debug messages are about
...
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
2021-10-04 22:06:48 -07:00
snipe
34eab88b7e
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:25:31 -07:00
snipe
b20c841a89
Fixed asset models restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:29:13 -07:00
snipe
52caee2a9f
Handle checking and unchecking for bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:26 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
snipe
9b48732cd2
Force revalidation headers when user logs out
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 12:52:48 -07:00
snipe
daa88f06f7
Added pivot to components JSON
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:51:08 -07:00
snipe
d0acb9fdb4
Applies PR #10150 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 15:33:00 -07:00
Ivan Nieto Vivanco
11aa8971c8
Fix error if the Department is also empty
2021-09-30 17:20:44 -05:00
Ivan Nieto Vivanco
5c7aaaac22
Fix error when department is null
2021-09-30 16:46:23 -05:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
ae466be153
Fix license output, tweak CleanFloat function to handle numbers over 1 million
2021-09-28 19:10:25 -07:00
Brady Wetherington
f3338667c7
Create new ParseCurrency helper and use it in the appropriate controllers
2021-09-28 18:20:39 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
snipe
d88c0ae5ec
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
...
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
2021-09-26 13:41:52 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
67d898e897
Updated map icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 14:30:36 -07:00
snipe
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 13:07:02 -07:00
snipe
ad6f073c82
Few more icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:38:23 -07:00
