snipe
|
d06ef4bdef
|
Bumped lockfile
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-08 22:17:46 -08:00 |
|
|
snipe
|
c817daa4da
|
Merge pull request #10767 from uberbrady/fix_double_request_datatable
One attempt to fix the 'datatable double-request' problem.
|
2022-03-08 20:34:15 -08:00 |
|
|
snipe
|
1b3631d57d
|
Merge pull request #10806 from snipe/fixes/removed_experimental_content_policies
Removed experimental feature policies
|
2022-03-08 20:32:39 -08:00 |
|
|
snipe
|
968de7e469
|
Merge pull request #10804 from inietov/fixes/date_localization_not_working_custom_fields
Fixes #8143 Date localization not work in custom fields
|
2022-03-08 20:11:49 -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
|
95d6e1a402
|
Merge pull request #10805 from inietov/fixes/date_localization_not_working_custom_fields_develop
Fixes #8143 Date localization not work in custom fields for develop branch
|
2022-03-08 16:36:31 -08:00 |
|
Ivan Nieto Vivanco
|
657cfddd3c
|
Add a condition to show customfields as the user wants in localization settings
|
2022-03-08 18:28:13 -06:00 |
|
|
Ivan Nieto Vivanco
|
2410b1a146
|
Add a condition to show customfields as the user wants in localization settings
|
2022-03-08 18:25:15 -06:00 |
|
|
snipe
|
9311584f43
|
Merge pull request #10033 from uberbrady/ldap_troubleshooter_cherrypicked
Fixed [ch14855] - create LDAP troubleshooter
|
2022-03-07 20:24:11 -08:00 |
|
|
snipe
|
ed39df349f
|
Merge pull request #10799 from snipe/fixes/check_if_tables_exist_before_trying_to_create
Check if table exists before trying to create in migrations
|
2022-03-07 20:22:28 -08:00 |
|
Brady Wetherington
|
ab7bf3c5d4
|
Get rid of stale commented-out line
|
2022-03-07 20:22:23 -08:00 |
|
|
snipe
|
86a2312a31
|
Check if table exists before trying to create
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 20:13:10 -08:00 |
|
|
snipe
|
e30d814ece
|
Merge pull request #10798 from snipe/features/add_qr_and_barcode_urls_to_asset_transformer
Added QR and alt barcode urls to asset transformer
|
2022-03-07 19:53:08 -08:00 |
|
|
Brady Wetherington
|
0556c7653a
|
Implement a generic timeout function, and run methods that need to run with a timeout using it.
|
2022-03-07 19:51:21 -08:00 |
|
|
Brady Wetherington
|
b96303cb38
|
Clean up errors, add new required package to Dockerfile
|
2022-03-07 19:51:21 -08:00 |
|
|
Brady Wetherington
|
312a90ce77
|
Add start of Tracing to LDAP troubleshooter
|
2022-03-07 19:51:21 -08:00 |
|
|
Brady Wetherington
|
71b5c0e80f
|
Add new LDAP troubleshoot ldapsearch subcommand, broaden out troubleshooting
|
2022-03-07 19:51:21 -08:00 |
|
Brady Wetherington
|
519bd00bef
|
WIP - just need to get authed connections to work
|
2022-03-07 19:51:21 -08:00 |
|
|
Brady Wetherington
|
ffd8f583b4
|
Got most of the stages working for the LDAP troubleshooter
|
2022-03-07 19:51:21 -08:00 |
|
|
Brady Wetherington
|
8cd5ec6799
|
Most of the host-port-tls discovery stuff is in-place now
|
2022-03-07 19:51:20 -08:00 |
|
|
Brady Wetherington
|
ef0e9a3c93
|
WIP: Enhancing stage 2 of LDAP troubleshooter
|
2022-03-07 19:51:20 -08:00 |
|
|
Brady Wetherington
|
8aa975e959
|
First pass at Artisan-based LDAP troubleshooter
|
2022-03-07 19:51:20 -08:00 |
|
|
snipe
|
e9d297e97d
|
Added cache comment
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 19:37:06 -08:00 |
|
|
snipe
|
9269d5945e
|
Added QR and alt barcode urls to asset transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 19:32:18 -08:00 |
|
|
snipe
|
33ee63f985
|
Merge pull request #10797 from snipe/features/use_max_results_in_pagination
Use the max_results env value in the paginator
|
2022-03-07 19:14:49 -08:00 |
|
|
snipe
|
def570db4b
|
Finer grain for > 200
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 18:51:49 -08:00 |
|
|
snipe
|
fcb81b9505
|
Use the max_results env value in the paginator
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-07 18:39:39 -08:00 |
|
|
Brady Wetherington
|
8d49d35463
|
Remove another data-toggle="table" - possibly the last one
|
2022-03-07 12:52:57 -08:00 |
|
|
Brady Wetherington
|
6f3e9033c2
|
One attempt to fix the 'datatable double-request' problem.
|
2022-03-07 12:52:57 -08:00 |
|
|
snipe
|
3e2fe10480
|
Fixed getAssetBySerial
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-05 09:03:29 -08:00 |
|
|
snipe
|
0c520476a3
|
Removed namespace
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 12:30:47 -08:00 |
|
|
snipe
|
ba010618f7
|
Throttle got merged out - re-adding it
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 12:15:09 -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
|
1dabd6cc71
|
Merge pull request #10777 from snipe/added_remote_to_bulk_user_edit
Add remote user setting to bulk edit
|
2022-03-04 10:35:07 -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
|
b6a1d245e8
|
Added trim to CC email as well
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 06:20:34 -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
|
eb8b4a2aa5
|
Merge pull request #10775 from snipe/features/add_remote_checkbox_to_user
Added remote checkbox to user
|
2022-03-04 05:39:23 -08:00 |
|
|
snipe
|
06a05e6340
|
Added remote to view
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:37:28 -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
|
a9069e65e5
|
Don’t show groups in menu if there are none yet
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 04:39:39 -08:00 |
|
|
snipe
|
1400c610a1
|
Use correct button translation
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 04:22:44 -08:00 |
|
|
snipe
|
f840652395
|
Suppress errors for missing signatures
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 03:18:28 -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
|
349715576a
|
Bumped RC version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 22:23:24 -08:00 |
|
|
snipe
|
0d787fcc94
|
Updated language files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 22:21:44 -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 |
|