diff --git a/CHANGELOG.md b/CHANGELOG.md index 831090169..d0309ad4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 1.3.1 +- charp: fix references +- ruby: update rails + ## 1.3.0 - update empty files - anonymous without chat diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index 7c57de318..841f69a9a 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -63,7 +63,7 @@ packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj index e6e5b28e0..daf78aa0e 100644 --- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj +++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj @@ -23,6 +23,8 @@ + + true @@ -48,29 +50,29 @@ packages\JWT.9.0.3\lib\net46\JWT.dll - + packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - + packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - + packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - + packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - + packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - + packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/web/documentserver-example/csharp/Web.config b/web/documentserver-example/csharp/Web.config index 4d0d7b357..3610d49f6 100644 --- a/web/documentserver-example/csharp/Web.config +++ b/web/documentserver-example/csharp/Web.config @@ -1,4 +1,4 @@ - + @@ -9,9 +9,9 @@ - - - + + + @@ -25,4 +25,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/documentserver-example/csharp/packages.config b/web/documentserver-example/csharp/packages.config index 59580bcc2..ffadd3c77 100644 --- a/web/documentserver-example/csharp/packages.config +++ b/web/documentserver-example/csharp/packages.config @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 4d8edb624..2cc3e1186 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -1,7 +1,7 @@ - + diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index ba9547b93..2784219b4 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '7.0.3' +gem 'rails', '7.0.3.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '1.4.2' # Use SCSS for stylesheets diff --git a/web/documentserver-example/ruby/Gemfile.lock b/web/documentserver-example/ruby/Gemfile.lock index 64c1cbf70..b114f39b9 100644 --- a/web/documentserver-example/ruby/Gemfile.lock +++ b/web/documentserver-example/ruby/Gemfile.lock @@ -8,67 +8,67 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) + actioncable (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + actionmailbox (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.3) - actionpack (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activesupport (= 7.0.3) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3) - actionview (= 7.0.3) - activesupport (= 7.0.3) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.3) - actionpack (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + actiontext (7.0.3.1) + actionpack (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.3) - activesupport (= 7.0.3) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.3) - activesupport (= 7.0.3) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (7.0.3) - activesupport (= 7.0.3) - activerecord (7.0.3) - activemodel (= 7.0.3) - activesupport (= 7.0.3) - activestorage (7.0.3) - actionpack (= 7.0.3) - activejob (= 7.0.3) - activerecord (= 7.0.3) - activesupport (= 7.0.3) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activestorage (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -101,7 +101,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) jwt (2.4.1) - loofah (2.18.0) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) macaddr (1.7.2) @@ -129,7 +129,7 @@ GEM nio4r (2.5.8) nokogiri (1.13.8-x64-mingw-ucrt) racc (~> 1.4) - psych (4.0.4) + psych (4.0.5) stringio racc (1.6.0) rack (2.2.4) @@ -137,28 +137,28 @@ GEM rack (>= 2.0.0) rack-test (2.0.2) rack (>= 1.3) - rails (7.0.3) - actioncable (= 7.0.3) - actionmailbox (= 7.0.3) - actionmailer (= 7.0.3) - actionpack (= 7.0.3) - actiontext (= 7.0.3) - actionview (= 7.0.3) - activejob (= 7.0.3) - activemodel (= 7.0.3) - activerecord (= 7.0.3) - activestorage (= 7.0.3) - activesupport (= 7.0.3) + rails (7.0.3.1) + actioncable (= 7.0.3.1) + actionmailbox (= 7.0.3.1) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actiontext (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) bundler (>= 1.15.0) - railties (= 7.0.3) + railties (= 7.0.3.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - railties (7.0.3) - actionpack (= 7.0.3) - activesupport (= 7.0.3) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -197,7 +197,7 @@ GEM turbolinks-source (5.2.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.3) + tzinfo-data (1.2022.4) tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -225,7 +225,7 @@ DEPENDENCIES jwt (~> 2.4.1) mimemagic! rack-cors - rails (= 7.0.3) + rails (= 7.0.3.1) sass-rails (~> 6.0) sdoc (~> 2.4.0) sqlite3 (= 1.4.2) diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index dca22130c..74b213235 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -26,7 +26,7 @@ class Application < Rails::Application end end - Rails.configuration.version="1.3.0" + Rails.configuration.version="1.3.1" Rails.configuration.fileSizeMax=5242880 Rails.configuration.storagePath="app_data"