Merge branch 'main' into feature/admin-branding

.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!

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
 

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).

app/views/spree/admin/oauth_applications/index.html.erb

@@ -9,7 +9,7 @@
   <div class="card bg-light">
     <div class="card-body">
       <%=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')%>
     </div>
   </div>
 

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.

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}",
   }
 
@@ -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'