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,933 Commits 28 Branches 8,560 Tags
c358fa814a4d0ca5cd60a948fa695e1fee387f7b
Commit Graph

185 Commits

Author SHA1 Message Date
Sergey Linnik
8fb698bb75 Basque (Spain), Armenian and Malay (Malaysia) lang 2022-07-29 11:38:25 +03:00
Andrey Yumatov
4042d2bb8a Merge remote-tracking branch 'remotes/origin/dependabot/maven/web/documentserver-example/java-spring/com.google.code.gson-gson-2.8.9' into build(deps)/bot-recommendations 2022-06-10 16:14:14 +03:00
dependabot[bot]
e662c765e6 build(deps): bump gson in /web/documentserver-example/java-spring 
Bumps [gson](https://github.com/google/gson) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-20 22:07:08 +00:00
Sergey Linnik
070dac6878 Merge remote-tracking branch 'remotes/origin/master' into develop 2022-05-12 13:22:41 +03:00
Sergey Linnik
4f2f877f0e docxf update 2022-05-12 13:22:15 +03:00
Sergey Linnik
cfa0fb1b74 Merge pull request #278 from ONLYOFFICE/dependabot/maven/web/documentserver-example/java-spring/com.fasterxml.jackson.core-jackson-databind-2.12.6.1 
build(deps): bump jackson-databind from 2.12.2 to 2.12.6.1 in /web/documentserver-example/java-spring
 2022-04-25 16:57:39 +03:00
Sergey Linnik
328ea46693 format 2022-04-25 14:20:41 +03:00
Olga Larinova
b9859ef5ca java-spring: with ext 2022-04-25 12:53:28 +03:00
Sergey Linnik
13e3d7673b Merge pull request #275 from ONLYOFFICE/feature/new-langs-7.2 
added langs
 2022-04-18 15:20:53 +03:00
dependabot[bot]
e7b76729a4 build(deps): bump jackson-databind 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.12.2 to 2.12.6.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-18 11:17:36 +00:00
Sergey Linnik
7a70a44bcb 1.2.0 2022-04-18 13:59:07 +03:00
Olga Larinova
ce2e7f97d6 added langs 2022-04-11 15:28:55 +03:00
Olga Larinova
23e616aade languages sort fix 2022-04-11 10:38:26 +03:00
Olga Larinova
589ca9b601 Merge branch 'develop' into feature/ignore-self-signed-certificate 2022-03-28 16:00:59 +03:00
Sergey Linnik
32f1ec82d1 Merge pull request #271 from ONLYOFFICE/feature/uid-0-fix 
Feature/uid 0 fix
 2022-03-28 13:26:38 +03:00
Sergey Linnik
54bb5b0a24 format 2022-03-28 13:26:17 +03:00
Sergey Linnik
7a982fc785 format 2022-03-28 13:09:13 +03:00
Olga Larinova
6f5800fbde Updated Readme files in examples 2022-03-28 12:05:45 +03:00
Olga Larinova
405be2847b java-spring: ignoring self-signed certificate was added 2022-03-25 16:54:04 +03:00
Olga Larinova
a44787c625 java-spring 2022-03-23 11:11:03 +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
0673fed928 java: java-spring: version history button was hidden 2022-03-21 09:35:58 +03:00
Olga Larinova
204f770401 java-spring: bugfix 2022-03-18 15:58:02 +03:00
Olga Larinova
fcfb6efda7 java-spring: removed rename action for anonymous 2022-03-18 15:02:45 +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
Olga Larinova
b9c1bc0f42 java-spring: changing arguments 2022-03-18 09:50:59 +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
55119458af java-spring: move languages to config 2022-03-17 10:14:02 +03:00
Olga Larinova
e0c0595796 removed chat 2022-03-16 13:06:37 +03:00
Olga Larinova
b0df0d72df java-spring: refactoring 2022-03-16 10:48:43 +03:00
Olga Larinova
0e1a580a86 refactoring 2022-03-11 14:13:09 +03:00
Olga Larinova
d4d7c4e222 java-spring: meta command 2022-03-11 10:58:54 +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
b24e4503bc Java Spring - fix body display 2022-03-01 15:46:53 +03:00
Andrey Yumatov
1e2a9cf4f2 Java Spring - Add viewport device display on index page 2022-03-01 15:44:56 +03:00
Olga Larinova
23169c6fea block height fix:upload for mobile 2022-03-01 10:45:29 +03:00
Olga Larinova
f334bf4b19 java-spring:upload for mobile 2022-02-28 18:17:52 +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