pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,842 Commits 28 Branches 8,560 Tags
6f5800fbdec0611223f50100bc840e10653501bd
Commit Graph

336 Commits

Author SHA1 Message Date
Olga Larinova
6f5800fbde Updated Readme files in examples 2022-03-28 12:05:45 +03:00
Sergey Linnik
6c9e6e9304 Merge pull request #268 from ONLYOFFICE/feature/language-update 
Feature/language update
 2022-03-22 12:21:43 +03:00
Sergey Linnik
416b1fde8c Merge pull request #270 from ONLYOFFICE/feature/hide-history-for-anonymous 
Feature/hide history for anonymous
 2022-03-22 11:54:12 +03:00
Olga Larinova
8f09dadfa0 ruby: java-spring: bugfix 2022-03-21 17:10:11 +03:00
Olga Larinova
23176ddf07 ruby: version history button was hidden 2022-03-21 09:27:26 +03:00
Olga Larinova
2c12393c78 ruby: removed rename action for anonymous 2022-03-18 14:52:59 +03:00
Sergey Linnik
4ba708631e Merge pull request #266 from ONLYOFFICE/feature/renaming-files 
Feature/renaming files
 2022-03-18 10:31:19 +03:00
Sergey Linnik
4539bac5db Merge pull request #267 from ONLYOFFICE/feature/customization 
Feature/customization
 2022-03-17 11:10:14 +03:00
Sergey Linnik
eb196613e7 format 2022-03-17 10:36:38 +03:00
Olga Larinova
97c7859db5 ruby: move languages to config 2022-03-16 15:32:47 +03:00
Olga Larinova
e0c0595796 removed chat 2022-03-16 13:06:37 +03:00
Olga Larinova
a192c6ce1f ruby: refactoring 2022-03-15 18:45:35 +03:00
Olga Larinova
6b93311ce5 customization change 2022-03-15 13:10:34 +03:00
Olga Larinova
0e1a580a86 refactoring 2022-03-11 14:13:09 +03:00
Olga Larinova
8a04e5fbc4 ruby:meta command 2022-03-09 13:50:47 +03:00
Olga Larinova
935377a941 all: fix link in mentions 2022-03-02 17:42:12 +03:00
Sergey Linnik
b8b375a19a Merge pull request #263 from ONLYOFFICE/feature/scroll 
fixed scrolling due to footer : ab82be9b3d
 2022-03-02 16:40:13 +03:00
Olga Larinova
fec77a9e75 fixed scrolling due to footer : ab82be9b3d 2022-03-02 14:30:57 +03:00
Sergey Linnik
f0171cbb18 Merge pull request #262 from ONLYOFFICE/feature/anonymus-without-id 
new branch + anonymus without id
 2022-03-02 13:55:20 +03:00
Olga Larinova
8416f36581 mobile-upload:centering 2022-03-02 13:48:01 +03:00
Olga Larinova
b9f3bfd2e2 new branch + anonymus without id 2022-03-02 11:16:24 +03:00
Sergey Linnik
02b22e9e26 Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-upload 2022-03-01 16:01:30 +03:00
Andrey Yumatov
1c27610e8d Ruby - fix body display 2022-03-01 15:47:24 +03:00
Olga Larinova
23169c6fea block height fix:upload for mobile 2022-03-01 10:45:29 +03:00
Olga Larinova
48314b2c7f ruby:upload for mobile 2022-02-28 18:09:20 +03:00
Andrey Yumatov
b6a08e242d Add licenses of mimemagic on ruby (7a61fac6b7) 
# Conflicts:
#	web/documentserver-example/ruby/licenses/mimemagic.license
 2022-02-28 16:59:02 +03:00
Oleg Sinizin
69c07a30a7 Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.3 
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
 2022-02-28 12:02:41 +03:00
dependabot[bot]
6283ff934d build(deps): bump nokogiri in /web/documentserver-example/ruby 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.5 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.3)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-26 03:34:12 +00:00
Sergey Linnik
2f5b25d6ab Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles 
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
 2022-02-15 16:31:57 +03:00
Sergey Linnik
1d8175b88f Merge pull request #256 from ONLYOFFICE/feature/ruby-deps-version 
ruby: update dependencies version
 2022-02-11 13:01:44 +03:00
Sergey Linnik
c4c819c513 format 2022-02-11 10:54:03 +03:00
Sergey Linnik
ebc864736d Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles 
# Conflicts:
#	web/documentserver-example/java/README.md
 2022-02-11 10:22:04 +03:00
Sergey Linnik
af86ec1ca3 update submodule 2022-02-11 10:19:44 +03:00
Oleg Sinizin
c663bfe464 Merge remote-tracking branch 'remotes/origin/develop' into feature/userInfoGroups 
# Conflicts:
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
#	web/documentserver-example/java/src/main/java/helpers/Users.java
#	web/documentserver-example/php/users.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb
 2022-02-11 10:14:06 +03:00
Oleg Sinizin
4068e23556 ruby: userInfoGroups 2022-02-11 00:20:29 +03:00
Oleg Sinizin
018d1bbead ruby: update dependencies version 2022-02-09 11:43:22 +03:00
Sergey Linnik
468488c384 note to index page 2022-02-09 10:55:02 +03:00
Sergey Linnik
20012c7678 change note in readme 2022-02-09 10:17:36 +03:00
Sergey Linnik
382160f2fc Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop 
# Conflicts:
#	web/documentserver-example/csharp-mvc/assets
#	web/documentserver-example/csharp/assets
#	web/documentserver-example/java-spring/src/main/resources/assets
#	web/documentserver-example/java/src/main/resources/assets
#	web/documentserver-example/nodejs/public/assets
#	web/documentserver-example/php/assets
#	web/documentserver-example/python/assets
#	web/documentserver-example/ruby/public/assets
 2022-02-09 10:05:10 +03:00
Sergey Linnik
761e578faf update submodule 2022-02-07 16:14:53 +03:00
Sergey Linnik
6716d38a40 support xlsb 2022-02-06 11:15:20 +03:00
Andrey Yumatov
5bbc4c6232 Ruby: remove unnecessary action (version encoding) 2022-01-31 16:28:34 +03:00
Andrey Yumatov
29cbe66d09 Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles 2022-01-18 18:16:53 +03:00
Sergey Linnik
a900183056 Merge pull request #241 from ONLYOFFICE/feature/fileTypeInsteadParsing 
Feature/file type instead parsing
 2022-01-14 16:52:30 +03:00
Andrey Yumatov
507a7f3162 Ruby: Merge jwt prev + diff 2022-01-13 18:08:40 +03:00
Andrey Yumatov
2d85a4166e Ruby: fix code 2022-01-11 15:07:19 +03:00
Andrey
5caaf0b1c6 Merge branch 'develop' into feature/jwtHistoryFiles 2022-01-10 19:00:27 +03:00
Andrey Yumatov
db976766cc Ruby: fix[support old version] fileType instead parsing 2022-01-10 18:47:02 +03:00
Andrey Yumatov
f81ae23a64 Merge branch 'feature/jwtHistoryFiles' of github.com:ONLYOFFICE/document-server-integration into feature/jwtHistoryFiles 
# Conflicts:
#	web/documentserver-example/csharp-mvc/Models/FileModel.cs
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/ruby/licenses/3rd-Party.license
 2022-01-10 17:08:45 +03:00
Sergey Linnik
4f3882f892 Merge pull request #248 from ONLYOFFICE/feature/ruby-add-mimemagic 
Add licenses of mimemagic on ruby
 2022-01-10 16:08:31 +03:00