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,533 Commits 28 Branches 8,560 Tags
096102fa595df90677a6177b2cb83ce77cb321eb
Commit Graph

274 Commits

Author SHA1 Message Date
Andrey
096102fa59 Merge branch 'develop' into feature/jwtHistoryFiles 2021-12-22 17:13:10 +03:00
Sergey Linnik
8d194b78a1 Update samples 2021-12-20 11:29:02 +03:00
Sergey Linnik
b8e726a7be Update pptx sample 2021-12-20 11:02:24 +03:00
Natalia
ec6ea72069 small fixes for readme files 2021-12-16 17:51:01 +03:00
Andrey Yumatov
dac09bd1e1 jwt signature for prev.* files. Ruby (by redirection) 2021-12-14 19:26:56 +03:00
Sergey Linnik
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
Sergey Linnik
71041fea9f Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath 
Feature/pptx xpath
 2021-12-13 16:16:54 +03:00
Sergey Linnik
8b25a7a869 ruby: v 3.0 2021-12-13 16:02:48 +03:00
Sergey Linnik
dd20d79236 Merge pull request #230 from ONLYOFFICE/feature/ruby-3.0 
ruby 3.0 version
 2021-12-13 15:47:25 +03:00
Sergey Linnik
299a68e0bd Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes 
fix layout
 2021-12-13 15:42:15 +03:00
Sergey Linnik
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
Sergey Linnik
24cfd661ef 1.1.0 2021-12-13 11:34:05 +03:00
Sergey Linnik
6481ac7e13 update presentation sample 2021-12-13 11:21:56 +03:00
Andrey Yumatov
bc1c9f455c fileType in setHistoryData for ruby (+ Gemfile) 2021-12-08 17:25:43 +03:00
Oleg Sinizin
beb9885b03 docxf and oform since v7.0 2021-12-08 14:00:04 +03:00
Oleg Sinizin
b453aa19f0 replace group value null with empty string 2021-12-02 17:39:48 +03:00
Oleg Sinizin
20f28afec1 rename master form to form template 2021-12-02 11:32:07 +03:00
Oleg Sinizin
7841822c54 delete unused block 2021-12-02 10:37:05 +03:00
Oleg Sinizin
d3b962dcb8 fix layout 2021-11-26 15:45:53 +03:00
Sergey Linnik
7184928a6c update assets 2021-11-25 11:02:20 +03:00
Oleg Sinizin
5e0f54be68 ruby and java: fix media styles 2021-11-21 14:13:46 +03:00
Sergey Linnik
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
Oleg Sinizin
cf2f60f8cd ruby: docxf 2021-11-17 16:24:46 +03:00
Sergey Linnik
8688ef1db5 Merge pull request #224 from ONLYOFFICE/feature/oform 
Feature/oform
 2021-11-17 13:01:49 +03:00
Oleg Sinizin
3233e257cb ruby: opening uploaded form 2021-11-16 15:20:09 +03:00
Oleg Sinizin
6b4f56373e ruby: filling on mobile 2021-11-16 15:17:20 +03:00
Oleg Sinizin
cd1a312aba ruby: revert filling in docx 2021-11-16 15:13:32 +03:00
Oleg Sinizin
8cd0297917 ruby: hide submit button 2021-11-16 15:06:03 +03:00
Oleg Sinizin
4568dcfdce ruby: oform 2021-11-16 15:05:06 +03:00
Oleg Sinizin
2429668b57 ruby: add Copy File as... 2021-11-15 16:02:11 +03:00
Oleg Sinizin
9bab8edc3c using innerAlert in onRequestSendNotify 2021-11-15 11:48:17 +03:00
Oleg Sinizin
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
Oleg Sinizin
adc549bf7e Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.12.5 
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
 2021-11-08 11:46:30 +03:00
dependabot[bot]
8de69d18cb build(deps): bump nokogiri in /web/documentserver-example/ruby 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.5 to 1.12.5.
- [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.11.5...v1.12.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-04 19:39:12 +00:00
Oleg Sinizin
11e8f40f8c ruby: fix embedded mode; fix media.css connect 2021-11-02 18:13:45 +03:00
Sergey Linnik
1e6585e324 Merge pull request #212 from ONLYOFFICE/bugfix/password (b1a00854de) 
Bugfix/password
 2021-10-26 18:05:39 +03:00
Sergey Linnik
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
Oleg Sinizin
b9654f722e filePass fix 2021-10-18 15:33:44 +03:00
Oleg Sinizin
a597c37684 Merge branch 'develop' of https://github.com/ONLYOFFICE/document-server-integration into feature/change-files-folder 2021-10-17 15:38:48 +03:00
Oleg Sinizin
a9e2df73ca add region(lang) param to convert 2021-10-15 13:50:15 +03:00
Oleg Sinizin
da7450c732 ruby: add ability to use custom path for files storage 2021-10-14 12:19:45 +03:00
Sergey Linnik
8ed261dabc Merge pull request #206 from ONLYOFFICE/bugfix/info-block-max-width 
add max-width to portal info block
 2021-10-12 10:23:19 +03:00
Oleg Sinizin
27982b0aa6 remove unused 2021-10-12 10:10:34 +03:00
Oleg Sinizin
a412f3f591 ruby and php: delete misprint quotes 2021-10-11 14:19:02 +03:00
Oleg Sinizin
01132d78c2 add max-width to portal info block 2021-10-08 16:15:16 +03:00
Sergey Linnik
b61e7574bb Merge pull request #204 from ONLYOFFICE/bugfix/hide-tooltip 
replace hiding portal-info block from js to templates
 2021-10-07 09:49:28 +03:00
dependabot[bot]
689ac66bba build(deps): bump nokogiri in /web/documentserver-example/ruby 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.12.5.
- [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.11.1...v1.12.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-06 13:58:35 +00:00
Sergey Linnik
0b0919568c 1.0.0 2021-10-06 16:48:03 +03:00
Oleg Sinizin
c3774d8cb6 replace hiding portal-info block from js to templates 2021-10-06 15:14:45 +03:00
Sergey Linnik
e3304792c4 0.0.0 2021-10-04 14:05:11 +03:00