|
|
24aee6d194
|
Merge branch 'release/v7.2.0' into feature/directUrl
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
|
2022-08-03 12:13:12 +03:00 |
|
|
|
e737e8ed48
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
|
2022-08-03 12:10:20 +03:00 |
|
|
|
583403cf78
|
update empty files (Fix Bug 58202)
|
2022-08-02 16:50:01 +03:00 |
|
|
|
641e45e24f
|
1.3.0
|
2022-08-02 15:35:18 +03:00 |
|
|
|
2eeed5d26d
|
Fix #287 Fix #285 Fix #284 Fix #280
Build(deps)/bot recommendations
|
2022-08-02 14:24:11 +03:00 |
|
|
|
e041baeef7
|
Merge branch 'feature/extension-on-rename' into develop
|
2022-08-02 14:18:22 +03:00 |
|
|
|
63c9c4242e
|
Merge pull request #291 from ONLYOFFICE/feature/chat
Feature/chat
# Conflicts:
# CHANGELOG.md
|
2022-08-02 14:18:21 +03:00 |
|
|
|
901bb61883
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/liveview
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:21:54 +03:00 |
|
|
|
b3512ea0ce
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:16:54 +03:00 |
|
|
|
8fb698bb75
|
Basque (Spain), Armenian and Malay (Malaysia) lang
|
2022-07-29 11:38:25 +03:00 |
|
|
|
5c194da95d
|
[add] - java - directUrl
|
2022-07-04 19:46:34 +03:00 |
|
|
|
9de9bc90a4
|
fix - java - checking mode view insert edit
|
2022-06-16 16:32:36 +03:00 |
|
|
|
7a9ebdbbe5
|
fix - java - coEditing from permissions to editorConfig
|
2022-06-16 16:26:03 +03:00 |
|
|
|
680e53823a
|
add - java - anonymous without liveview
|
2022-06-15 21:08:18 +03:00 |
|
|
|
cdbd264ed5
|
Merge branch 'feature/chat' into feature/liveview
# Conflicts:
# CHANGELOG.md
|
2022-06-15 19:21:30 +03:00 |
|
|
|
22039078ef
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
|
2022-06-15 18:38:12 +03:00 |
|
|
|
f49f96a2c2
|
add - java - anonymous without permissions.chat
|
2022-06-14 20:16:06 +03:00 |
|
|
|
8c9d2d80bd
|
Merge remote-tracking branch 'remotes/origin/dependabot/maven/web/documentserver-example/java/com.google.code.gson-gson-2.8.9' into build(deps)/bot-recommendations
|
2022-06-10 16:13:53 +03:00 |
|
|
|
058bb0d2e2
|
build(deps): bump gson in /web/documentserver-example/java
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 20:58:39 +00:00 |
|
|
|
070dac6878
|
Merge remote-tracking branch 'remotes/origin/master' into develop
|
2022-05-12 13:22:41 +03:00 |
|
|
|
4f2f877f0e
|
docxf update
|
2022-05-12 13:22:15 +03:00 |
|
|
|
e10f3962b6
|
java: with ext
|
2022-04-25 13:28:35 +03:00 |
|
|
|
13e3d7673b
|
Merge pull request #275 from ONLYOFFICE/feature/new-langs-7.2
added langs
|
2022-04-18 15:20:53 +03:00 |
|
|
|
7a70a44bcb
|
1.2.0
|
2022-04-18 13:59:07 +03:00 |
|
|
|
ce2e7f97d6
|
added langs
|
2022-04-11 15:28:55 +03:00 |
|
|
|
23e616aade
|
languages sort fix
|
2022-04-11 10:38:26 +03:00 |
|
|
|
589ca9b601
|
Merge branch 'develop' into feature/ignore-self-signed-certificate
|
2022-03-28 16:00:59 +03:00 |
|
|
|
32f1ec82d1
|
Merge pull request #271 from ONLYOFFICE/feature/uid-0-fix
Feature/uid 0 fix
|
2022-03-28 13:26:38 +03:00 |
|
|
|
6f5800fbde
|
Updated Readme files in examples
|
2022-03-28 12:05:45 +03:00 |
|
|
|
60469b0dba
|
java: ignore certificate in config
|
2022-03-23 15:39:11 +03:00 |
|
|
|
7e34067410
|
java
|
2022-03-23 12:38:38 +03:00 |
|
|
|
6c9e6e9304
|
Merge pull request #268 from ONLYOFFICE/feature/language-update
Feature/language update
|
2022-03-22 12:21:43 +03:00 |
|
|
|
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 |
|
|
|
0673fed928
|
java: java-spring: version history button was hidden
|
2022-03-21 09:35:58 +03:00 |
|
|
|
7ec16b90e3
|
java: removed rename action for anonymous
|
2022-03-18 15:04:28 +03:00 |
|
|
|
4ba708631e
|
Merge pull request #266 from ONLYOFFICE/feature/renaming-files
Feature/renaming files
|
2022-03-18 10:31:19 +03:00 |
|
|
|
215ade01a3
|
java: changing arguments
|
2022-03-18 09:32:34 +03:00 |
|
|
|
4d25418fc8
|
java: move languages to config
|
2022-03-17 14:05:56 +03:00 |
|
|
|
4539bac5db
|
Merge pull request #267 from ONLYOFFICE/feature/customization
Feature/customization
|
2022-03-17 11:10:14 +03:00 |
|
|
|
eb196613e7
|
format
|
2022-03-17 10:36:38 +03:00 |
|
|
|
e0c0595796
|
removed chat
|
2022-03-16 13:06:37 +03:00 |
|
|
|
e8aec0b68c
|
java: php: python: refactoring
|
2022-03-15 18:10:02 +03:00 |
|
|
|
82a5a68e6c
|
java: meta command
|
2022-03-11 14:59:10 +03:00 |
|
|
|
935377a941
|
all: fix link in mentions
|
2022-03-02 17:42:12 +03:00 |
|
|
|
b8b375a19a
|
Merge pull request #263 from ONLYOFFICE/feature/scroll
fixed scrolling due to footer : ab82be9b3d
|
2022-03-02 16:40:13 +03:00 |
|
|
|
fec77a9e75
|
fixed scrolling due to footer : ab82be9b3d
|
2022-03-02 14:30:57 +03:00 |
|
|
|
f0171cbb18
|
Merge pull request #262 from ONLYOFFICE/feature/anonymus-without-id
new branch + anonymus without id
|
2022-03-02 13:55:20 +03:00 |
|
|
|
8416f36581
|
mobile-upload:centering
|
2022-03-02 13:48:01 +03:00 |
|
|
|
b9f3bfd2e2
|
new branch + anonymus without id
|
2022-03-02 11:16:24 +03:00 |
|
|
|
02b22e9e26
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-upload
|
2022-03-01 16:01:30 +03:00 |
|
