From a3ff98ea57e24ee0cfe293d2e7a98d1ceda618eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:41:19 +0100 Subject: [PATCH 1/3] Update jquery-ui-rails requirement from ~> 6.0 to >= 6, < 8 (#311) --- spree_backend.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_backend.gemspec b/spree_backend.gemspec index 5dc2dd2c6a..9c139015c6 100644 --- a/spree_backend.gemspec +++ b/spree_backend.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |s| s.add_dependency 'importmap-rails' s.add_dependency 'inline_svg', '~> 1.5' s.add_dependency 'jquery-rails', '~> 4.3' - s.add_dependency 'jquery-ui-rails', '~> 6.0' + s.add_dependency 'jquery-ui-rails', '>= 6', '< 8' s.add_dependency 'responders' s.add_dependency 'requestjs-rails' s.add_dependency 'sass-rails', '>= 5' From e893456387453c7269449e5102741dd785983e24 Mon Sep 17 00:00:00 2001 From: Damian Legawiec Date: Wed, 1 May 2024 12:53:33 +0200 Subject: [PATCH 2/3] [skip ci] fixed broken links to documentation site --- .github/CONTRIBUTING.md | 2 +- README.md | 8 ++++---- SECURITY.md | 2 +- app/views/spree/admin/oauth_applications/index.html.erb | 2 +- app/views/spree/admin/shared/_account_nav.html.erb | 2 +- spree_backend.gemspec | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 398a9364eb..cf0881673a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1 +1 @@ -Please visit [Contributing section](https://dev-docs.spreecommerce.org/contributing/index) of Spree Guides. Thank you! +Please visit [Contributing section](https://docs.spreecommerce.org/developer/contributing/quickstart) of Spree Guides. Thank you! diff --git a/README.md b/README.md index 7b19b2406f..fd9f38d44d 100644 --- a/README.md +++ b/README.md @@ -37,19 +37,19 @@ Default credentials: ## Installation -Spree Admin Dashboard is bundled with [Spree Starter](https://github.com/spree/spree_starter) and we recommend following [Spree Getting Started guide](https://dev-docs.spreecommerce.org/getting-started/installation). +Spree Admin Dashboard is bundled with [Spree Starter](https://github.com/spree/spree_starter) and we recommend following [Spree Getting Started guide](https://docs.spreecommerce.org/getting-started/installation). -You can also [add Spree and Admin Dashboard to an existing Ruby on Rails application](https://dev-docs.spreecommerce.org/advanced/existing_app_tutorial) as well. +You can also [add Spree and Admin Dashboard to an existing Ruby on Rails application](https://docs.spreecommerce.org/advanced/existing_app_tutorial) as well. ## Documentation -* [Developer Documentation](https://dev-docs.spreecommerce.org/) +* [Developer Documentation](https://docs.spreecommerce.org/) ## Contributing Spree Admin Dashboard is an open source project and we love contributions in any form - pull requests, issues, feature ideas! -Please review the [Spree Contributing Guide](https://dev-docs.spreecommerce.org/contributing/index) +Please review the [Spree Contributing Guide](https://docs.spreecommerce.org/developer/contributing/quickstart) ### Local setup diff --git a/SECURITY.md b/SECURITY.md index 1f33b77048..a4b1fd0fbd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1 +1 @@ -Please see [Spree Guides Security section](https://dev-docs.spreecommerce.org/security/index). +Please see [Spree Guides Security section](https://docs.spreecommerce.org/developer/security/quickstart). diff --git a/app/views/spree/admin/oauth_applications/index.html.erb b/app/views/spree/admin/oauth_applications/index.html.erb index 869887fade..5069f8cd78 100644 --- a/app/views/spree/admin/oauth_applications/index.html.erb +++ b/app/views/spree/admin/oauth_applications/index.html.erb @@ -9,7 +9,7 @@
<%=Spree.t('admin.oauth_applications.documentation_message')%> - <%= link_to(Spree.t('admin.oauth_applications.documentation_cta'), 'https://dev-docs.spreecommerce.org/api/platform-api/authenticating-requests')%> + <%= link_to(Spree.t('admin.oauth_applications.documentation_cta'), 'https://docs.spreecommerce.org/api-reference/platform/authentication')%>
diff --git a/app/views/spree/admin/shared/_account_nav.html.erb b/app/views/spree/admin/shared/_account_nav.html.erb index 6f9a15d0b5..9e3251052c 100644 --- a/app/views/spree/admin/shared/_account_nav.html.erb +++ b/app/views/spree/admin/shared/_account_nav.html.erb @@ -49,7 +49,7 @@ <%= Spree.t(:join_slack) %> <% end %> - <%= link_to 'https://dev-docs.spreecommerce.org/extensions/extensions', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %> + <%= link_to 'https://docs.spreecommerce.org/developer/extending-spree/3rd-party-extensions', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %> <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>   <%= Spree.t(:extensions_directory) %> diff --git a/spree_backend.gemspec b/spree_backend.gemspec index 9c139015c6..e7b750e9c5 100644 --- a/spree_backend.gemspec +++ b/spree_backend.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.metadata = { "bug_tracker_uri" => "https://github.com/spree/spree_backend/issues", "changelog_uri" => "https://github.com/spree/spree_backend/releases/tag/v#{s.version}", - "documentation_uri" => "https://dev-docs.spreecommerce.org/", + "documentation_uri" => "https://docs.spreecommerce.org/", "source_code_uri" => "https://github.com/spree/spree_backend/tree/v#{s.version}", } From 02f3301fa8871a3c7ee87c568f0e636bff159cd0 Mon Sep 17 00:00:00 2001 From: Damian Legawiec Date: Wed, 1 May 2024 12:54:43 +0200 Subject: [PATCH 3/3] [skip ci] Update license.md (#314) --- license.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/license.md b/license.md index 252319ff7a..6dca29887c 100644 --- a/license.md +++ b/license.md @@ -1,13 +1,18 @@ -Spree License +BSD 3-Clause License ============= -Copyright © 2007-2024, Spree Commerce Inc., Spark Solutions Sp. z o.o. and other contributors. +Copyright © 2015-2024 Spark Solutions Sp. z o.o. + +Copyright © 2007-2015, Spree Commerce Inc. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -_This software is provided by the copyright holders and contributors "as is" and any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the copyright owner or contributors be liable for any direct, indirect, incidental, special, exemplary, or consequential damages (including, but not limited to, procurement of substitute goods or services; loss of use, data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage._ +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.