snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
snipe
7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets
...
Fix #10810 unaccepted assets
2022-03-29 12:10:37 +01:00
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync
...
This looks good, thanks!
2022-03-29 12:06:01 +01:00
Godfrey M
a1429ce86b
removed manager_name from user files
2022-03-24 11:47:13 -07:00
Godfrey M
c1f8252388
adds manager field to LDAP sync
2022-03-24 11:24:39 -07:00
Godfrey M
55680762de
Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync
2022-03-22 16:33:58 -07:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
3e01981576
clean up
2022-03-22 10:07:08 -07:00
Godfrey M
62352ef1a1
completes accessory eula agreement blade
2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco
319d816002
Update in the license seat the user that the asset with that license have assigned
2022-03-21 15:06:43 -06:00
Godfrey M
4956eb0410
WIP: needs to be tested. adds ldap_manager field to ldap sync
2022-03-21 11:15:39 -07:00
Godfrey M
220df9710e
adds most of the fields for an accessory eula agreement pdf
2022-03-21 09:18:29 -07:00
snipe
df60729140
Fixed #10769 - redirect user back to due for audit page
...
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 14:27:18 +00:00
snipe
e04ae63d02
Apply the fix to API controller too :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:12:48 +00:00
snipe
7db252ade3
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:11:42 +00:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Dampfklon
9818d16834
fix showDeletedFunction by reverting #9508
2022-03-16 20:20:46 +01:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
6386fa1c5e
clean up
2022-03-16 09:54:10 -07:00
snipe
7498fe36e9
Removed extra space because pedantry
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 16:45:03 +00:00
snipe
babf7c064b
Added ability to filter status label index endpoint by status type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 16:38:45 +00:00
Godfrey M
b2f7262cd2
adds table structure for asset history
2022-03-14 19:38:36 -07:00
Godfrey M
e1a6a2afc6
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
2022-03-10 12:15:50 -08:00
snipe
e3d2f7cc96
Missed a few
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-08 20:05:17 -08:00
snipe
d1358b6249
Removed experimental feature policies
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-08 16:58:24 -08:00
Godfrey M
59c583ac74
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
2022-03-08 16:42:27 -08:00
snipe
2d7a8b5e15
Merge pull request #10776 from snipe/added_trim_to_email_and_username
...
Added trim to email and username
2022-03-04 11:57:33 -08:00
snipe
9a358087ec
Add remote user to bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:47:23 -08:00
snipe
67134ca387
Do a trim() before inserting/updating
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:18:52 -08:00
snipe
0dfc27f56e
Added remote to allowed_columns for sorting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:44:46 -08:00
snipe
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 05:35:26 -08:00
snipe
67ed0d91c0
Handle file_get_contents more gracefully
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 02:54:37 -08:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
snipe
29a2e80984
Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display
...
Retry fix bad metadata display
2022-03-03 20:49:30 -08:00
snipe
6fca8350f9
Added notes field to transformers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:35 -08:00
snipe
9acb5413f6
Added notes field to controllers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:29:25 -08:00
snipe
08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api
...
Features/adds ldap import and assets count to user api
2022-03-03 19:15:14 -08:00
snipe
6abe8f296b
We don’t need the users table here
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:12:03 -08:00
snipe
a53a67be4a
Added consumables, licenses, accessories count filters too
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:08:08 -08:00
snipe
b72cac3511
Adds ldap_import and assets_count filter to user API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 19:03:35 -08:00
snipe
c940d36fff
Updated maintenance gate in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:49:54 -08:00
snipe
cd12028845
Use “update” instead of edit in gate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 18:47:20 -08:00
Brady Wetherington
3225605ef3
Handling the old weirdly-formatted data wasn't quite working.
2022-03-03 18:17:29 -08:00
Brady Wetherington
31dde20a2b
Actually, re-introduce this code comment as it's still relevant and tricky
2022-03-03 15:48:04 -08:00
Brady Wetherington
aa36ebc947
Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display
2022-03-03 15:46:19 -08:00
Brady Wetherington
92434fa943
Revert "Revert "refactor and clean up attribute-changing logic for assets""
...
This reverts commit bdc737ce0c
2022-03-03 15:45:54 -08:00
Brady Wetherington
0164354463
Fix for the weird error that blew up the demo when my PR got merged
2022-03-02 15:15:16 -08:00
snipe
bdc737ce0c
Revert "refactor and clean up attribute-changing logic for assets"
...
This reverts commit 290baf1c8d
2022-03-02 14:45:14 -08:00
snipe
733b3a7550
Merge pull request #10682 from uberbrady/fix_bad_metadata_display
...
Fixed weird JSON-handling on log_meta updates
2022-03-02 14:36:38 -08:00
