Ivan Nieto Vivanco
|
570dd09dcd
|
Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out
|
2022-03-15 17:52:19 -06:00 |
|
snipe
|
84aa26dd50
|
Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu
Fixed #10191 - font color contrast on mobile menu
|
2022-03-10 13:02:45 -08:00 |
|
|
snipe
|
8984b3a59d
|
Merge pull request #10812 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime_develop
Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string develop
|
2022-03-10 10:40:33 -08:00 |
|
|
Ivan Nieto Vivanco
|
cdc0805fc4
|
Sanitize dates input in the importer before saving
|
2022-03-10 12:07:07 -06:00 |
|
|
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
|
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 |
|
|
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 |
|
|
snipe
|
9311584f43
|
Merge pull request #10033 from uberbrady/ldap_troubleshooter_cherrypicked
Fixed [ch14855] - create LDAP troubleshooter
|
2022-03-07 20:24:11 -08:00 |
|
Brady Wetherington
|
ab7bf3c5d4
|
Get rid of stale commented-out line
|
2022-03-07 20:22:23 -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 |
|
|
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
|
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
|
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 |
|
|
snipe
|
afd83311aa
|
Fixed version number (vV)
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:58:54 -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
|
fa576bc78f
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:45:34 -08:00 |
|
|
snipe
|
3e22dce117
|
Merge pull request #10774 from snipe/features/added_notes_to_accessories_etc
Fixed #6918 - added notes to accessories, components, consumables
|
2022-03-03 20:41:18 -08:00 |
|
|
snipe
|
9adcf58ae5
|
Added notes migration
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:30:58 -08:00 |
|
|
snipe
|
5266b2c71f
|
Added notes field to view blades
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:30:27 -08:00 |
|
|
snipe
|
94dded3785
|
Added notes field to presenters for table view show/hide columns
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:30:07 -08:00 |
|
|
snipe
|
ac8a7d0bc9
|
Made notes field fillable and searchable
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:29:48 -08:00 |
|
|
snipe
|
6fca8350f9
|
Added notes field to transformers
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:29:35 -08:00 |
|