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
545 Commits 28 Branches 8,560 Tags
267fe7d260c7ebc31a9e073acaeb20bbcbf7cc2d
Commit Graph

75 Commits

Author SHA1 Message Date
Sergey Linnik
267fe7d260 Merge pull request #105 from ONLYOFFICE/feature/favorite 
Feature/favorite
 2021-01-27 11:49:21 +03:00
Alexandr Fedorov
9ee379e8df ruby: setFavorite 2021-01-26 17:04:38 +03:00
Alexandr Fedorov
8cf4eb2fc2 Merge branch 'develop' into feature/new-banner 2021-01-26 16:06:46 +03:00
Alexandr Fedorov
eba3f15587 ruby: fix banner 2021-01-26 16:02:48 +03:00
Alexandr Fedorov
848229f79c ruby: new banner 2021-01-26 13:22:17 +03:00
Julia Radzhabova
a76ec17e70 Add languages 2020-11-20 12:59:46 +03:00
Andrew
4c62e12822 updated dependencies to support ruby 2.7 2020-10-02 14:24:05 +03:00
Andrew
951f5f9887 corrected comments syntax 2020-10-02 14:23:32 +03:00
Sergey Linnik
5e852e024d Merge branch 'hotfix/apache' into develop 
# Conflicts:
#	3rd-Party.txt
#	licences/3rd-Party.txt
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/java/src/main/webapp/index.jsp
#	web/documentserver-example/js/LICENSE.txt
#	web/documentserver-example/js/OnlineEditorsExampleJS.html
#	web/documentserver-example/nodejs/licenses/formidable.license
#	web/documentserver-example/nodejs/licenses/jsonwebtoken.license
#	web/documentserver-example/nodejs/licenses/mime.license
#	web/documentserver-example/nodejs/licenses/urllib.license
#	web/documentserver-example/php/LICENSE.txt
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/php/functions.php
#	web/documentserver-example/php/index.php
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/ruby/LICENSE.txt
#	web/documentserver-example/ruby/app/assets/javascripts/jscript.js
#	web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
#	web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
#	web/welcome/index.html
 2020-09-04 09:59:10 +03:00
Sergey Linnik
c9def721d2 3rd-party license 2020-09-03 13:08:44 +03:00
Sergey Linnik
8050ec572a apache 2020-09-02 12:06:52 +03:00
Sergey Linnik
5cefe5c3b2 Merge pull request #79 from ONLYOFFICE/feature/action-link 
Feature/action link
 2020-06-30 15:43:33 +03:00
Andrew
0cf0171721 fixed an issue when creating a second action link 2020-06-18 11:44:21 +03:00
Andrey Panov
44142da370 Merge branch 'develop' into dependabot/bundler/web/documentserver-example/ruby/ffi-1.12.2 2020-06-09 12:12:19 +03:00
Andrew
ecbae22fcc ruby: get link to bookmark 2020-05-21 14:39:10 +03:00
dependabot[bot]
1b90f16eb5 build(deps): bump ffi in /web/documentserver-example/ruby 
Bumps [ffi](https://github.com/ffi/ffi) from 1.9.18 to 1.12.2.
- [Release notes](https://github.com/ffi/ffi/releases)
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ffi/ffi/compare/1.9.18...1.12.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-04 15:33:27 +00:00
Sergey Linnik
cb91ba1620 bump 2020 2020-03-03 14:39:29 +03:00
Sergey Linnik
1bde1f66d3 change name 2020-03-03 11:55:24 +03:00
Andrey Panov
ad966cfc28 Merge branch 'feature/ruby-v2.6.5' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.10.8 
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
 2020-02-27 15:50:48 +03:00
dependabot[bot]
1f9b2b8230 build(deps): bump nokogiri in /web/documentserver-example/ruby 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.1...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-25 08:22:59 +00:00
Andrey Panov
be25001479 Fixed displaying mobile version cb5324381e 2019-12-13 13:09:28 +03:00
Andrey Panov
7466aba10f ruby: 'raise_in_transactional_callbacks' deprecated since rails 5.0.0 2019-11-21 14:43:53 +03:00
Andrey Panov
c4fc8c85e2 ruby: 'render :text' deprecated since rails 5.1.0 2019-11-21 14:41:48 +03:00
Andrey Panov
007efef742 ruby: rails manifest.js 2019-11-21 14:40:53 +03:00
Andrey Panov
a4bf9d76f6 ruby: updated dependencies to support ruby v2.6.5 2019-11-21 14:36:56 +03:00
Andrey Panov
7c5faa7c8a Merge pull request #66 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/loofah-2.3.1 
build(deps): bump loofah from 2.1.1 to 2.3.1 in /web/documentserver-example/ruby
 2019-11-21 14:33:02 +03:00
dependabot[bot]
3497eeea9f build(deps): bump loofah in /web/documentserver-example/ruby 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.1.1 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.1.1...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-08 16:23:59 +00:00
Andrey Panov
8887edefb3 ruby: blockcontent mode 2019-11-07 17:09:08 +03:00
Andrey Panov
6ab006e409 changed favicon 2019-11-06 10:29:09 +03:00
Andrey Panov
582ed3f61b changed logo 2019-11-06 10:28:24 +03:00
Alexander.Trofimov
b9dd792672 [all] Rename 
Rename web-apps-pro -> web-apps
 2019-10-24 12:27:30 +03:00
Alexander.Trofimov
48043e5d70 [all] Rename 
Rename web-apps -> web-apps-pro
 2019-10-18 15:41:55 +03:00
Andrey Panov
60cb77136a ruby: version history 2019-09-25 18:50:11 +03:00
Andrey Panov
d1d7d1e416 ruby: unique document key for each version 2019-09-25 17:05:32 +03:00
Andrey Panov
668a0e323a ruby: document list, different view/edit options 2019-09-25 14:46:30 +03:00
Andrey Panov
057d38d063 ruby: body overflow style issue 2019-09-25 14:08:25 +03:00
Andrey Panov
1ecf16085e ruby: jwt support 2019-09-25 11:54:16 +03:00
Andrey Panov
945c09f5d4 ruby: send POST instead of GET on convert request 2019-09-25 11:53:01 +03:00
Andrey Panov
b642053bc3 ruby: user and lang selectors 2019-09-25 11:52:12 +03:00
Andrey Panov
fef0179c7e ruby: create empty sample, new upload style 2019-09-25 09:54:18 +03:00
Sergey Linnik
16473b4e06 2019 2019-01-22 18:17:07 +03:00
Sergey Linnik
9fb0289af4 onAppReady (Fixed #54) 2019-01-22 09:23:29 +03:00
Sergey Linnik
4dc137cf96 ppsx is not editable 2018-08-17 10:44:27 +03:00
Sergey Linnik
b1352bd897 remove unusing code 2018-03-29 11:52:01 +03:00
Sergey Linnik
d8e1d4d6b7 Merge pull request #44 from ONLYOFFICE/feature/otf 
Feature/otf
 2018-03-28 16:36:50 +03:00
Alexey Golubev
fc2db9b47f v5.1.0 2018-03-28 12:09:01 +03:00
Sergey Linnik
6d1bda75b9 recognize type of otf 2018-03-27 10:41:35 +03:00
Sergey Linnik
db9287263c OpenDocument template 2018-03-19 12:31:58 +03:00
Sergey Linnik
ceb4db9de6 https://documentserver/ 2018-03-15 14:13:47 +03:00
Pavel Lobashov
20412f0c80 Update copyright and footer info to 2018 year 2018-03-01 12:41:44 +03:00