Commit Graph

115 Commits

Author SHA1 Message Date
8d194b78a1 Update samples 2021-12-20 11:29:02 +03:00
b8e726a7be Update pptx sample 2021-12-20 11:02:24 +03:00
ec6ea72069 small fixes for readme files 2021-12-16 17:51: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
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
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
d3639d1697 java-sprong: added comments 2021-11-18 12:47:26 +03:00
40016395a8 java-spring: update README.md, set empty server.address 2021-11-18 12:35:29 +03:00
a3e84f50fa java: docxf 2021-11-17 15:28:19 +03:00
796433cf8a java-spring: docxf 2021-11-17 15:15:31 +03:00
7309d942d6 java-spring: fix permissions 2021-11-17 15:12:04 +03:00
8688ef1db5 Merge pull request #224 from ONLYOFFICE/feature/oform
Feature/oform
2021-11-17 13:01:49 +03:00
f9dbe89fd9 java-spring: fix docker, clean up application.properties 2021-11-16 18:48:52 +03:00
c8aac65af6 java-spring: opening uploaded form 2021-11-16 12:56:28 +03:00
5f8e9370a7 java-spring: mobile-fill-forms.svg 2021-11-16 12:52:39 +03:00
7fd0882c06 java-spring: filling on mobile 2021-11-16 12:51:52 +03:00
c6a8cd0ff1 java-spring: revert filling in docx 2021-11-16 12:32:21 +03:00
73797dcf31 java-spring: hide submit button 2021-11-16 12:22:06 +03:00
19ebecd4d0 java-spring: oform 2021-11-16 12:20:00 +03:00
7cd7f1bf66 java-spring: add Save Copy as... 2021-11-15 13:12:42 +03:00
9bab8edc3c using innerAlert in onRequestSendNotify 2021-11-15 11:48:17 +03:00
edd423cd87 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-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
2021-11-09 19:04:30 +03:00
e026a7027b java-spring: check if storage directory does not exist 2021-11-09 18:31:09 +03:00
64f82872b3 Merge pull request #215 from ONLYOFFICE/bugfix/java-spring-fix
Bugfix/java spring fix
2021-11-02 10:03:39 +03:00
39e7cea624 java-spring: fix save file 2021-11-01 17:41:25 +03:00
b36f96f9c8 java-spring: fix create sample file 2021-11-01 16:44:42 +03:00
8b3b3268bf java-spring: fix ability to create new file from editor for Anonymous 2021-11-01 16:05:15 +03:00
5d2abdb634 java-spring: remove random favorite flag 2021-11-01 15:23:39 +03:00
3556073f5c java-spring: fix switch to edit mode from editor 2021-11-01 15:08:04 +03:00
b724366c33 java-spring: fix casting date 2021-11-01 13:16:27 +03:00
aeff6a4e9e java-spring: replace from DefaultCallbackManager.java to LocalFileStorage.java 2021-11-01 13:06:21 +03:00
97dad58428 java-spring: fix filename 2021-11-01 12:44:51 +03:00
2ce861d39b java-spring: replace if by switch 2021-11-01 12:42:55 +03:00
1e6585e324 Merge pull request #212 from ONLYOFFICE/bugfix/password (b1a00854de)
Bugfix/password
2021-10-26 18:05:39 +03:00
2e812c4584 java-spring: fix forcesave 2021-10-25 11:07:30 +03:00
c578099c03 java-spring: document info 2021-10-25 10:19:33 +03:00
35ab4b678d java-spring: fix deleting history folder 2021-10-22 17:17:38 +03:00
4446196919 java-spring: fix creating file 2021-10-21 18:55:13 +03:00
90a6514b6e http protocol
Revert "https://documentserver/"

This reverts commit ceb4db9de6.

# Conflicts:
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java/src/main/resources/settings.properties
#	web/documentserver-example/nodejs/config/default.json
#	web/documentserver-example/php/config.php
#	web/documentserver-example/ruby/config/application.rb
2021-10-21 12:19:48 +03:00