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
2,681 Commits 28 Branches 8,560 Tags
bc3cbbbb825ca104697f2d7082e4aa6d151c1da9
Commit Graph

443 Commits

Author SHA1 Message Date
Sergey Linnik
7b926f1e11 Merge remote-tracking branch 'remotes/origin/develop' into feature/convert-to-ooxml-on-upload 2023-03-26 17:26:50 +05:00
Sergey Linnik
2b19d96646 Merge pull request #365 from ONLYOFFICE/feature/save-files-format 
Feature/save files format
 2023-03-26 17:21:49 +05:00
rivexe
7495ae9c15 ruby: convert to .ooxlm 2023-03-24 12:33:17 +03:00
rivexe
dcac8cbbde ruby: horizontal scroll fix for IE10-11 2023-03-22 16:57:20 +03:00
suxa
be1616d6b6 ruby: save file in response type 2023-03-22 12:12:46 +05:00
Sergey Linnik
f5c6fe76d3 Merge pull request #362 from ONLYOFFICE/feature/update-jquery 
Feature/update jquery
 2023-03-22 11:31:41 +05:00
Sergey Linnik
e1d6bac33a Merge remote-tracking branch 'remotes/origin/hotfix/1.5.1' into feature/update-jquery 
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/php/config.php
#	web/documentserver-example/php/index.php
#	web/documentserver-example/python/licenses/jQuery.license
 2023-03-22 11:29:45 +05:00
Sergey Linnik
2724f007db 1.5.1 2023-03-22 11:13:14 +05:00
Sergey Linnik
a0abfb39a7 license: update jquery license text 2023-03-22 11:05:42 +05:00
rivexe
ccd5584b0c ruby: licenses for jQuery.Migrate 2023-03-21 21:32:05 +05:00
rivexe
a871b29d7c ruby: jquery-3.6.4 instead of 1.8.2 2023-03-21 21:32:05 +05:00
rivexe
e5b8628760 ruby: licenses for jQuery.Migrate 2023-03-20 10:16:14 +03:00
rivexe
f0dbf0f9a0 ruby: jquery-3.6.4 instead of 1.8.2 2023-03-20 10:14:53 +03:00
Sergey Linnik
459c7cd233 Merge pull request #359 from ONLYOFFICE/feature/prevent-anonymous-edit 
Feature/prevent anonymous edit
 2023-03-17 12:00:32 +05:00
Sergey Linnik
b7aa93e628 Merge branch 'develop' into dependabot/bundler/web/documentserver-example/ruby/rack-2.2.6.4 2023-03-17 11:53:47 +05:00
dependabot[bot]
d47ec1820a build(deps): bump rack in /web/documentserver-example/ruby 
Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.4.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-16 11:17:15 +00:00
suxa
f79fb213f1 ruby: hide edit icon on view screen for anonymous 2023-03-14 16:16:01 +05:00
dependabot[bot]
bb9d73610e build(deps): bump rack in /web/documentserver-example/ruby 
Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.3.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-13 11:28:41 +05:00
Sergey Linnik
8468c87170 Merge remote-tracking branch 'remotes/origin/master' into develop 2023-03-08 13:14:15 +05:00
Dmitrii Vershinin
ec2845af5e chore: remove .gitignore from spring,ruby 2023-03-06 12:27:58 +05:00
suxa56
3d7ea8715a ruby: changed format list 2023-03-03 17:11:01 +05:00
rivexe
469a8c087b Merge branch 'develop' into feature/referenceData 2023-02-27 10:17:41 +03:00
Sergey Linnik
9c7b39bd5a protect field to information 2023-02-23 17:43:09 +05:00
rivexe
055f548056 ruby: "protect" permission is added 2023-02-22 14:30:59 +03:00
rivexe
4eff2e7d89 ruby: fix - search for filename by path 2023-02-21 11:49:42 +03:00
rivexe
f76c611033 ruby: search for fileName by path added 2023-02-17 10:40:03 +03:00
rivexe
55734a1458 ruby: referenceData 2023-02-16 10:10:23 +03:00
rivexe
7a50b8fda2 ruby: config request JWT used in functions 2023-02-06 16:14:53 +03:00
rivexe
5f7f8d66d5 ruby: added use_for_request method into jwt_helper 2023-02-06 16:11:41 +03:00
rivexe
4000117811 ruby: user address required on download 2023-02-01 15:00:09 +05:00
rivexe
98cdda06c4 ruby: user address required on download 2023-02-01 14:25:24 +05:00
Sergey Linnik
83bc0fed5e Merge remote-tracking branch 'remotes/origin/master' into develop 2023-01-27 18:54:25 +05:00
dependabot[bot]
77290d88f3 build(deps): bump rails-html-sanitizer 
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-26 19:35:36 +05:00
Sergey Linnik
6befd87761 Merge pull request #330 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/rack-2.2.6.2 
build(deps): bump rack from 2.2.4 to 2.2.6.2 in /web/documentserver-example/ruby
 2023-01-26 17:13:57 +03:00
Sergey Linnik
f3e270c1ad Merge pull request #332 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/globalid-1.0.1 
build(deps): bump globalid from 1.0.0 to 1.0.1 in /web/documentserver-example/ruby
 2023-01-26 17:13:11 +03:00
Sergey Linnik
3bd6f51edc 1.5.0 2023-01-24 00:55:41 +05:00
Vladimir Kurguzov
7ec969f4d9 ruby: check file availability when saving 2023-01-22 12:51:46 +05:00
Sergey Linnik
d79feca18c remove parsing url for getting ext 2023-01-22 00:11:47 +05:00
Sergey Linnik
3181c7449d Copyright 2023 2023-01-20 15:27:03 +05:00
dependabot[bot]
1a51759154 build(deps): bump globalid in /web/documentserver-example/ruby 
Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/rails/globalid/releases)
- [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 23:00:11 +00:00
dependabot[bot]
8807328180 build(deps): bump rack in /web/documentserver-example/ruby 
Bumps [rack](https://github.com/rack/rack) from 2.2.4 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-19 01:22:30 +00:00
Vladimir Kurguzov
ed8d0194b7 ruby: fixed tooltip 2022-12-01 10:46:32 +03:00
Vladimir Kurguzov
87a11c8633 ruby: deleting uid cookie 2022-12-01 10:46:31 +03:00
Vladimir Kurguzov
01e0cefae5 ruby: deleting uid cookie 2022-12-01 10:46:31 +03:00
Vladimir Kurguzov
4ebbecf580 ruby: added fake language 2022-12-01 10:46:29 +03:00
Vladimir Kurguzov
4ccc3fa35e ruby: added request status check for file 2022-12-01 10:46:27 +03:00
Vladimir Kurguzov
dbf1047f29 ruby: option to send directUrl 2022-12-01 10:46:23 +03:00
Sergey Linnik
2b184972dc Merge pull request #306 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.9 
build(deps): bump nokogiri from 1.13.8 to 1.13.9 in /web/documentserver-example/ruby
 2022-11-03 14:46:55 +03:00
dependabot[bot]
1593df6aec build(deps): bump nokogiri in /web/documentserver-example/ruby 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [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.13.8...v1.13.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-26 10:46:51 +00:00
Sergey Linnik
5b76d798fb 1.3.1 2022-10-26 13:28:18 +03:00