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
529 Commits 28 Branches 8,560 Tags
v6.2.1.13
Commit Graph

529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
papacarlo
6870923b94 Merge branch release/v6.2.0 into master v6.2.1.25 v6.2.1.15 v6.2.1.23 v6.2.1.22 v6.2.1.21 v6.2.1.20 v6.2.1.26 v6.2.1.2 v6.2.1.19 v6.2.1.17 v6.2.1.16 v6.2.1.24 v6.2.1.14 v6.2.1.3 v6.2.1.4 v6.2.1.5 v6.2.1.6 v6.2.1.1 v6.2.1.11 v6.2.1.12 v6.2.1.13 v6.2.1.9 2021-03-01 08:43:26 +00:00
Steklov Sergei
4ba7b3f02e Add Dockerfile for nodejs (#110) 
* Add Dockerfile for nodejs DS Example

* Removed unnecessary lines

* Add expose 3000 port to Dockerfile

Co-authored-by: Cyger <cyger@centos7.server>
v6.2.0.147 v6.2.0.146 v6.2.0.83 v6.2.0.92 v6.2.0.93 v6.2.0.94 v6.2.0.95 v6.2.0.96 v6.2.0.97 v6.2.0.98 v6.2.0.99 v6.2.0.103 v6.2.0.102 v6.2.0.100 v6.2.0.150 v6.2.0.149 v6.2.0.148 v6.2.0.144 v6.2.0.129 v6.2.0.128 v6.2.0.143 v6.2.0.127 v6.2.0.126 v6.2.0.142 v6.2.0.125 v6.2.0.124 v6.2.0.123 v6.2.0.122 v6.2.0.121 v6.2.0.141 v6.2.0.119 v6.2.0.118 v6.2.0.117 v6.2.0.116 v6.2.0.115 v6.2.0.114 v6.2.0.113 v6.2.0.111 v6.2.0.140 v6.2.0.139 v6.2.0.108 v6.2.0.107 v6.2.0.106 v6.2.0.105 v6.2.0.104 v6.2.0.138 v6.2.0.137 v6.2.0.136 v6.2.0.135 v6.2.0.134 v6.2.0.133 v6.2.0.131 v6.2.0.130 		2021-02-03 11:32:10 +03:00
Alexander Trofimov
feee808453 Merge remote-tracking branch 'origin/hotfix/v6.1.1' into release/v6.2.0 v6.2.0.71 v6.2.0.70 v6.2.0.75 v6.2.0.56 v6.2.0.57 v6.2.0.58 v6.2.0.59 v6.2.0.61 v6.2.0.74 v6.2.0.62 v6.2.0.66 v6.2.0.73 v6.2.0.63 v6.2.0.72 v6.2.0.64 v6.2.0.65 v6.2.0.82 v6.2.0.80 v6.2.0.69 2021-01-19 10:27:25 +03:00
Sergey Linnik
c96659ed9c nodejs: mime v2 lookup renamed to getType (0a2056b1b1) v6.2.0.49 v6.2.0.51 v6.2.0.55 v6.2.0.42 v6.2.0.43 v6.2.0.41 v6.2.0.33 v6.2.0.45 v6.2.0.44 v6.2.0.50 v6.2.0.46 v6.2.0.52 v6.2.0.54 v6.2.0.40 v6.2.0.39 2020-12-30 12:08:26 +03:00
Sergey Konovalov
1de2571c1b [bug] Fix invalid request to relative url after changing urllib version to 2.36.1 v6.2.0.18 v6.2.0.19 v6.2.0.20 v6.2.0.21 v6.2.0.22 v6.2.0.23 v6.2.0.24 v6.2.0.26 v6.2.0.28 v6.2.0.32 v6.2.0.29 v6.2.0.30 v6.2.0.17 v6.2.0.16 v6.2.0.31 2020-12-15 17:52:20 +03:00
Sergey Konovalov
a2c0527882 Merge pull request #101 from ONLYOFFICE/fix/jwt-issuer 
[bug] Fix "Error: "issuer" must be a string" on conversion
v6.2.0.15 v6.2.0.10 v6.2.0.13 v6.2.0.12 v6.2.0.14 v6.2.0.11 		2020-12-09 15:43:44 +03:00
Sergey Konovalov
a7f7b3ebf7 [bug] Fix "Error: "issuer" must be a string" on conversion 2020-12-09 15:19:43 +03:00
Alexander Trofimov
95dfc9796d Merge remote-tracking branch 'origin/release/v6.1.0' into release/v6.2.0 v6.2.0.7 v6.2.0.8 v6.2.0.9 2020-12-07 12:45:32 +03:00
papacarlo
b7bda80f48 Merge branch release/v6.1.0 into master v6.1.1.33 v6.1.1.34 v6.1.1.53 v6.1.1.54 v6.1.1.55 v6.1.1.56 v6.1.1.6 v6.1.1.7 v6.1.1.8 v6.1.1.9 v6.1.1.51 v6.1.1.5 v6.1.1.49 v6.1.1.48 v6.1.1.43 v6.1.1.42 v6.1.1.41 v6.1.1.52 v6.1.1.26 v6.1.1.25 v6.1.1.24 v6.1.1.23 v6.1.1.22 v6.1.1.21 v6.1.1.4 v6.1.1.37 v6.1.1.35 v6.1.1.27 v6.1.1.32 v6.1.1.3 v6.1.1.29 v6.1.1.28 v6.1.1.1 v6.1.1.10 v6.1.1.11 v6.1.1.12 v6.1.1.13 v6.1.1.14 v6.1.1.15 v6.1.1.16 v6.1.1.17 v6.1.1.18 v6.1.1.2 2020-12-01 07:46:23 +00:00
Sergey Linnik
02ee872d4c Merge pull request #99 from ONLYOFFICE/feature/add-languages 
Add languages
v99.99.99.2192 v99.99.99.2193 v99.99.99.2194 v99.99.99.2195 v99.99.99.2196 v6.2.0.1 v99.99.99.2190 v99.99.99.2189 		2020-11-20 13:01:28 +03:00
Julia Radzhabova
a76ec17e70 Add languages 2020-11-20 12:59:46 +03:00
Julia Radzhabova
9591995b9c Add languages 2020-11-20 12:13:15 +03:00
Sergey Linnik
74af4cf734 Merge pull request #98 from ONLYOFFICE/feature/node-start 
nodejs: remove shebang line
 2020-11-19 12:49:54 +03:00
Sergey Linnik
cefcba3b04 nodejs: remove shebang line 2020-11-19 11:31:17 +03:00
Sergey Linnik
fb4bc9c38e Merge pull request #97 from ONLYOFFICE/feture/update-dependencies 
[nodejs] Dependencies
 2020-11-19 11:26:21 +03:00
Sergey Linnik
cb245efbb2 nodejs: fix ejs compilation 2020-11-19 11:11:43 +03:00
Alexander Trofimov
0a2056b1b1 [nodejs] Dependencies 
Update nodejs dependencies
 2020-11-19 10:13:45 +03:00
Sergey Linnik
65b4e453a4 Merge pull request #96 from ONLYOFFICE/feature/Gurovcsharp 
Feature/csharp_and_csharp-mvc
 2020-11-17 13:58:07 +03:00
Gurov Max
157e6d3121 /csharp-MVC 
Added work with packages and etc
 2020-11-17 13:56:56 +03:00
Gurov Max
d62a760439 csharp: 
Changed path to the WebApplication.targets
Added new libs for Web.Helpers
 2020-11-17 13:23:47 +03:00
Alexandr Fedorov
e79cb3c3f3 Merge pull request #95 from ONLYOFFICE/feature/fixLicense 
fixed license comment 8050ec572a
v99.99.99.2173 v99.99.99.2172 		2020-11-10 17:21:04 +03:00
Alexandr Fedorov
ddb31bd4e8 fixed license comment 8050ec572a 2020-11-10 17:10:43 +03:00
Alexander Yuzhin
7a7503be6a [macos] Fixed run example (#94) v6.1.0.85 v6.1.0.58 v6.1.0.93 v6.1.0.91 v6.1.0.90 v6.1.0.89 v6.1.0.88 v6.1.0.87 v6.1.0.86 v6.1.0.84 v6.1.0.83 v6.1.0.82 v6.1.0.53 v6.1.0.54 v6.1.0.55 v6.1.0.56 v6.1.0.57 v6.1.0.76 v6.1.0.59 v6.1.0.60 v6.1.0.61 v6.1.0.64 v6.1.0.66 v6.1.0.70 v6.1.0.71 v6.1.0.72 v6.1.0.73 v6.1.0.95 v6.1.0.74 v6.1.0.75 v6.1.0.77 v6.1.0.81 v6.1.0.79 v6.1.0.78 2020-11-09 13:05:06 +03:00
EugeneZverev
651e161680 Feature/get file method (#93) 
* added method for getting information about files

* added version attribute to response object and new method logic

* old code has been removed

* fixed a code structure

* improvement of the getFilesInfo method

* edited readme file. format code

* format

Co-authored-by: Sergey Linnik <sergey.linnik@onlyoffice.com>
v99.99.99.2170 		2020-11-09 12:21:34 +03:00
EugeneZverev
2e3fd4725a Feature/get files method (#92) 
* added method for getting information about files

* added version attribute to response object and new method logic

* old code has been removed

* fixed a code structure

* format

* edited readme file

* code formatting

Co-authored-by: Sergey Linnik <sergey.linnik@onlyoffice.com>
 2020-11-09 09:45:03 +03:00
Nikita Khromov
986c51483d Add linux config (#91) v99.99.99.2167 v99.99.99.2169 v99.99.99.2168 v99.99.99.2165 v99.99.99.2164 2020-10-26 11:51:25 +03:00
Alexander Trofimov
1ea1a3f904 [run] Fix 
Fix config port for mac
 2020-10-26 11:49:08 +03:00
Andrew
4c62e12822 updated dependencies to support ruby 2.7 v99.99.99.2150 v99.99.99.2149 v99.99.99.2148 v99.99.99.2146 v99.99.99.2144 v99.99.99.2128 v99.99.99.2125 v99.99.99.2124 v99.99.99.2123 v99.99.99.2122 v99.99.99.2121 v99.99.99.2120 v99.99.99.2119 2020-10-02 14:24:05 +03:00
Andrew
951f5f9887 corrected comments syntax 2020-10-02 14:23:32 +03:00
Sergey Linnik
1184402f94 fix table v6.1.0.20 v6.1.0.32 v6.1.0.1 v6.1.0.10 v6.1.0.12 v99.99.99.2118 v6.1.0.52 v6.1.0.13 v6.1.0.19 v6.1.0.2 v6.1.0.21 v6.1.0.22 v6.1.0.23 v6.1.0.25 v6.1.0.26 v6.1.0.27 v6.1.0.28 v6.1.0.29 v6.1.0.3 v6.1.0.30 v6.1.0.31 v6.1.0.6 v6.1.0.33 v6.1.0.37 v6.1.0.38 v6.1.0.39 v6.1.0.4 v6.1.0.40 v6.1.0.41 v6.1.0.42 v6.1.0.44 v6.1.0.45 v6.1.0.46 v6.1.0.47 v6.1.0.48 v6.1.0.49 v6.1.0.5 v6.1.0.50 v6.1.0.51 v6.1.0.9 2020-10-01 11:37:15 +03:00
Alexander Trofimov
5c0d8b8dd9 Merge branch 'release/v6.0.0' into develop 
# Conflicts:
#	Readme.md
#	web/documentserver-example/nodejs/licenses/urllib.license
v99.99.99.2117 		2020-09-30 19:12:05 +03:00
Alexander Trofimov
cadeb19ece Merge branch 'master' into release/v6.0.0 
# Conflicts:
#	LICENSE.txt
v6.0.1.27 v6.0.2.14 v6.0.2.22 v6.0.2.23 v6.0.2.24 v6.0.2.25 v6.0.2.27 v6.0.2.28 v6.0.2.29 v6.0.2.3 v6.0.1.1 v6.0.1.10 v6.0.1.11 v6.0.1.12 v6.0.1.14 v6.0.1.15 v6.0.1.2 v6.0.1.21 v6.0.1.23 v6.0.1.24 v6.0.1.25 v6.0.1.28 v6.0.1.29 v6.0.1.3 v6.0.1.30 v6.0.1.31 v6.0.2.30 v6.0.2.4 v6.0.2.5 v6.0.2.6 v6.0.1.32 v6.0.1.33 v6.0.1.34 v6.0.1.4 v6.0.1.5 v6.0.1.6 v6.0.1.7 v6.0.1.8 v6.0.1.9 v6.0.2.1 v6.0.2.10 v6.0.2.7 v6.0.2.9 v6.0.2.20 v6.0.2.2 v6.0.2.19 v6.0.2.18 v6.0.2.17 v6.0.2.16 v6.0.2.15 v6.0.2.21 v6.0.2.13 v6.0.2.12 		2020-09-30 18:58:24 +03:00
papacarlo
001b9a2cf6 Merge branch hotfix/v5.6.4 into develop v99.99.99.2090 v99.99.99.2089 v99.99.99.2102 v99.99.99.2108 v99.99.99.2099 v99.99.99.2110 v99.99.99.2113 v99.99.99.2116 v99.99.99.2114 v99.99.99.2115 v99.99.99.2100 v99.99.99.2098 v99.99.99.2096 v99.99.99.2095 v99.99.99.2094 v99.99.99.2091 v99.99.99.2101 2020-09-15 13:40:43 +00: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
v99.99.99.2080 v99.99.99.2076 v99.99.99.2084 v99.99.99.2082 v99.99.99.2081 v99.99.99.2077 v99.99.99.2078 v99.99.99.2088 v99.99.99.2079 		2020-09-04 09:59:10 +03:00
Alexey Bannov
875dfaaec4 Merge pull request #82 from ONLYOFFICE/hotfix/apache 
Apache License
v5.6.5.8 v5.6.5.7 v5.6.5.6 v5.6.5.5 v5.6.5.4 v5.6.5.3 v5.6.5.2 v5.6.5.1 		2020-09-03 20:50:34 +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
6918016dda Apache License 2020-08-31 15:22:12 +03:00
Alexander Trofimov
fb039100e1 Update Readme.md v6.0.0.9 v6.0.0.23 v6.0.0.10 v6.0.0.101 v6.0.0.103 v6.0.0.104 v6.0.0.105 v6.0.0.106 v6.0.0.107 v6.0.0.108 v6.0.0.109 v6.0.0.11 v6.0.0.110 v6.0.0.111 v6.0.0.12 v6.0.0.17 v6.0.0.20 v6.0.0.21 v6.0.0.24 v6.0.0.25 v6.0.0.26 v6.0.0.27 v6.0.0.28 v6.0.0.29 v6.0.0.30 v6.0.0.31 v6.0.0.32 v6.0.0.33 v6.0.0.34 v6.0.0.35 v6.0.0.36 v6.0.0.39 v6.0.0.42 v6.0.0.43 v6.0.0.48 v6.0.0.49 v6.0.0.5 v6.0.0.50 v6.0.0.51 v6.0.0.98 v6.0.0.96 v6.0.0.95 v6.0.0.94 v6.0.0.93 v6.0.0.92 v6.0.0.91 v6.0.0.52 v6.0.0.88 v6.0.0.86 v6.0.0.84 v6.0.0.83 v6.0.0.80 v6.0.0.8 v6.0.0.79 v6.0.0.7 v6.0.0.65 v6.0.0.64 v6.0.0.63 v6.0.0.62 v6.0.0.61 v6.0.0.60 v6.0.0.6 v6.0.0.59 v6.0.0.58 v6.0.0.57 v6.0.0.54 v6.0.0.53 2020-07-23 18:51:17 +03:00
hellonadya
4a6b549eaa Update Readme.md (#80) 
* Update Readme.md

- add API methods for text examples
 2020-07-23 18:37:46 +03:00
Sergey Konovalov
3d09910cf3 [format] Add fb2 to convertedDocs v99.99.99.2050 v99.99.99.2049 v99.99.99.2048 v99.99.99.2047 v99.99.99.2043 v99.99.99.2042 v99.99.99.2041 v99.99.99.2040 v99.99.99.2058 v99.99.99.2039 v99.99.99.2038 v99.99.99.2037 v99.99.99.2036 v99.99.99.2073 v99.99.99.2035 v99.99.99.2059 v99.99.99.2034 v99.99.99.2071 v99.99.99.2033 v99.99.99.2032 v99.99.99.2060 v99.99.99.2061 v99.99.99.2062 v99.99.99.2063 v99.99.99.2057 v99.99.99.2064 v99.99.99.2065 v99.99.99.2056 v99.99.99.2066 v99.99.99.2067 v99.99.99.2068 v99.99.99.2069 v99.99.99.2070 v99.99.99.2072 v99.99.99.2055 v99.99.99.2075 v99.99.99.2074 v99.99.99.2054 v99.99.99.2053 v99.99.99.2052 v99.99.99.2051 2020-07-22 11:58:18 +03:00
Sergey Linnik
5cefe5c3b2 Merge pull request #79 from ONLYOFFICE/feature/action-link 
Feature/action link
v5.5.99.2013 v5.5.99.2008 v6.0.99.2026 v6.0.99.2027 v6.0.99.2029 v6.0.99.2030 v6.0.99.2031 v6.0.0.1 v6.0.0.2 v6.0.99.2025 v6.0.0.3 v5.5.99.2024 v5.5.99.2023 v5.5.99.2015 v5.5.99.2014 v6.0.0.4 v5.5.99.2012 v5.5.99.2011 v5.5.99.2010 v5.5.99.2009 		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
f8a1587109 Merge pull request #74 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/ffi-1.12.2 
build(deps): bump ffi from 1.9.18 to 1.12.2 in /web/documentserver-example/ruby
v5.5.99.1988 v5.5.99.1987 v5.5.99.2006 v5.5.99.2005 v5.5.99.2004 v5.5.99.2003 v5.5.99.2002 v5.5.99.2001 v5.5.99.2000 v5.5.99.1999 v5.5.99.1998 v5.5.99.1997 v5.5.99.1996 v5.5.99.1995 v5.5.99.1992 v5.5.99.1991 v5.5.99.1990 v5.5.99.2007 		2020-06-09 12:13:09 +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
Andrew
b3a79deef8 python: get link to bookmark 2020-05-21 12:51:07 +03:00
Andrew
c4f278d58a java: get link to bookmark 2020-05-21 12:51:07 +03:00
Andrew
b0ea8ed388 csharp-mvc: get link to bookmark 2020-05-21 12:50:48 +03:00
Andrew
220516c930 csharp: get link to bookmark 2020-05-18 16:31:16 +03:00