|
|
c4c819c513
|
format
|
2022-02-11 10:54:03 +03:00 |
|
|
|
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 |
|
|
|
af86ec1ca3
|
update submodule
|
2022-02-11 10:19:44 +03:00 |
|
|
|
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 |
|
|
|
c55ab7cc75
|
java: userInfoGroups
|
2022-02-10 23:56:09 +03:00 |
|
|
|
468488c384
|
note to index page
|
2022-02-09 10:55:02 +03:00 |
|
|
|
20012c7678
|
change note in readme
|
2022-02-09 10:17:36 +03:00 |
|
|
|
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 |
|
|
|
761e578faf
|
update submodule
|
2022-02-07 16:14:53 +03:00 |
|
|
|
6716d38a40
|
support xlsb
|
2022-02-06 11:15:20 +03:00 |
|
|
|
77ec1649a5
|
Java: fix the code and remove the encoding of the url version
|
2022-01-31 15:00:27 +03:00 |
|
|
|
29cbe66d09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
|
2022-01-18 18:16:53 +03:00 |
|
|
|
c2410268eb
|
Java: Merge jwt prev + diff
|
2022-01-18 17:41:59 +03:00 |
|
|
|
c5269a53cf
|
Merge pull request #244 from ONLYOFFICE/bugfix/customization-fix-JavaExample
fix Customization in Java and JavaSpringExample
|
2022-01-17 11:12:32 +03:00 |
|
|
|
a900183056
|
Merge pull request #241 from ONLYOFFICE/feature/fileTypeInsteadParsing
Feature/file type instead parsing
|
2022-01-14 16:52:30 +03:00 |
|
|
|
67d34f4bfa
|
format
|
2022-01-14 16:52:12 +03:00 |
|
|
|
d396f92f4d
|
Java : fix[support old version] fileType instead parsing
|
2022-01-10 18:44:01 +03:00 |
|
|
|
bb28257a2d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fileType
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2022-01-10 16:03:18 +03:00 |
|
|
|
783ad9f2de
|
fix Customization in Java and JavaSpringExample
|
2021-12-29 13:30:11 +03:00 |
|
|
|
2d0b17e334
|
fileType instead parsing url to save doc in Java (take fileType out of body)
|
2021-12-24 17:13:28 +03:00 |
|
|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
8d194b78a1
|
Update samples
|
2021-12-20 11:29:02 +03:00 |
|
|
|
b8e726a7be
|
Update pptx sample
|
2021-12-20 11:02:24 +03:00 |
|
|
|
dfd2d49e6c
|
Add link(handler) to onRequestHistoryData jwt Java
|
2021-12-17 15:39:38 +03:00 |
|
|
|
ec6ea72069
|
small fixes for readme files
|
2021-12-16 17:51:01 +03:00 |
|
|
|
2accdeac3b
|
jwt signature for prev.* files. Java (via handler) + README.md (Build point)
|
2021-12-16 17:43:01 +03:00 |
|
|
|
0268298f2b
|
Merge remote-tracking branch 'remotes/origin/develop' into bugfix/java-fixes
# Conflicts:
# web/documentserver-example/java-spring/README.md
|
2021-12-13 16:32:54 +03:00 |
|
|
|
32ea01784c
|
Merge pull request #234 from ONLYOFFICE/bugfix/group-fix
replace group value null with empty string
|
2021-12-13 16:27:14 +03:00 |
|
|
|
71041fea9f
|
Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath
Feature/pptx xpath
|
2021-12-13 16:16:54 +03:00 |
|
|
|
299a68e0bd
|
Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes
fix layout
|
2021-12-13 15:42:15 +03:00 |
|
|
|
828115e5b0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java
|
2021-12-13 15:38:37 +03:00 |
|
|
|
24cfd661ef
|
1.1.0
|
2021-12-13 11:34:05 +03:00 |
|
|
|
6481ac7e13
|
update presentation sample
|
2021-12-13 11:21:56 +03:00 |
|
|
|
abffa3e75f
|
fileType in setHistoryData for java
|
2021-12-08 17:23:00 +03:00 |
|
|
|
beb9885b03
|
docxf and oform since v7.0
|
2021-12-08 14:00:04 +03:00 |
|
|
|
b453aa19f0
|
replace group value null with empty string
|
2021-12-02 17:39:48 +03:00 |
|
|
|
20f28afec1
|
rename master form to form template
|
2021-12-02 11:32:07 +03:00 |
|
|
|
7841822c54
|
delete unused block
|
2021-12-02 10:37:05 +03:00 |
|
|
|
d3b962dcb8
|
fix layout
|
2021-11-26 15:45:53 +03:00 |
|
|
|
7184928a6c
|
update assets
|
2021-11-25 11:02:20 +03:00 |
|
|
|
5e0f54be68
|
ruby and java: fix media styles
|
2021-11-21 14:13:46 +03:00 |
|
|
|
95ea50210f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
|
2021-11-18 12:54:57 +03:00 |
|
|
|
a3e84f50fa
|
java: docxf
|
2021-11-17 15:28:19 +03:00 |
|
|
|
8688ef1db5
|
Merge pull request #224 from ONLYOFFICE/feature/oform
Feature/oform
|
2021-11-17 13:01:49 +03:00 |
|
|
|
8f2c2f96d2
|
java: fix docker
|
2021-11-17 00:10:28 +03:00 |
|
|
|
c3a4c0a66b
|
java: add fields owner and uploaded for document info
|
2021-11-16 17:52:07 +03:00 |
|
|
|
4568dcfdce
|
ruby: oform
|
2021-11-16 15:05:06 +03:00 |
|
|
|
ace2677062
|
java: revert filling in docx
|
2021-11-16 13:56:06 +03:00 |
|
|
|
d3cd62f5ae
|
java: opening uploaded form
|
2021-11-16 13:35:55 +03:00 |
|
|
|
c7cd0ba828
|
java: filling on mobile
|
2021-11-16 13:32:15 +03:00 |
|
