|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
c9def721d2
|
3rd-party license
|
2020-09-03 13:08:44 +03:00 |
|
|
|
8050ec572a
|
apache
|
2020-09-02 12:06:52 +03:00 |
|
|
|
6918016dda
|
Apache License
|
2020-08-31 15:22:12 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
0cf0171721
|
fixed an issue when creating a second action link
|
2020-06-18 11:44:21 +03:00 |
|
|
|
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 |
|
|
|
44142da370
|
Merge branch 'develop' into dependabot/bundler/web/documentserver-example/ruby/ffi-1.12.2
|
2020-06-09 12:12:19 +03:00 |
|
|
|
ecbae22fcc
|
ruby: get link to bookmark
|
2020-05-21 14:39:10 +03:00 |
|
|
|
b3a79deef8
|
python: get link to bookmark
|
2020-05-21 12:51:07 +03:00 |
|
|
|
c4f278d58a
|
java: get link to bookmark
|
2020-05-21 12:51:07 +03:00 |
|
|
|
b0ea8ed388
|
csharp-mvc: get link to bookmark
|
2020-05-21 12:50:48 +03:00 |
|
|
|
220516c930
|
csharp: get link to bookmark
|
2020-05-18 16:31:16 +03:00 |
|
|
|
3be28877ab
|
fixed header name
|
2020-05-18 16:30:56 +03:00 |
|
|
|
b3a96f15ab
|
php: get link to bookmark
|
2020-05-18 14:19:25 +03:00 |
|
|
|
14a68befd2
|
v5.5.2
v5.5.99.1977
v5.5.99.1934
v5.5.99.1984
v5.5.99.1983
v5.5.99.1982
v5.5.99.1981
v5.5.99.1980
v5.5.99.1979
v5.5.99.1978
v5.5.99.1974
v5.5.99.1976
v5.5.99.1975
v5.5.99.1928
v5.5.99.1929
v5.5.99.1931
v5.5.99.1932
v5.5.99.1933
v5.5.99.1986
v5.5.99.1935
v5.5.99.1936
v5.5.99.1937
v5.5.99.1939
v5.5.99.1955
v5.5.99.1956
v5.5.99.1961
v5.5.99.1962
v5.5.99.1964
v5.5.99.1965
v5.5.99.1966
v5.5.99.1968
v5.5.99.1969
v5.5.99.1970
v5.5.99.1971
v5.5.99.1972
v5.5.99.1973
|
2020-04-27 17:01:53 +03:00 |
|
|
|
b1af12a78d
|
v5.5.1r2
|
2020-04-15 14:18:33 +03:00 |
|
|
|
83bab147d0
|
v5.5.1
v5.6.3.2
v5.5.3.29
v5.5.4.66
v5.5.4.65
v5.5.4.64
v5.5.4.63
v5.5.4.62
v5.5.4.61
v5.5.4.60
v5.5.4.6
v5.5.4.59
v5.5.4.7
v5.5.4.8
v5.5.2.2
v5.5.2.6
v5.5.2.7
v5.5.2.9
v5.5.3.18
v5.5.3.21
v5.5.4.58
v5.5.4.57
v5.5.4.56
v5.5.4.55
v5.5.4.54
v5.5.4.53
v5.5.4.52
v5.6.0.10
v5.6.0.11
v5.6.0.12
v5.6.0.13
v5.6.0.14
v5.6.0.15
v5.6.0.16
v5.6.0.17
v5.6.0.18
v5.6.0.19
v5.6.0.20
v5.6.0.21
v5.6.0.4
v5.6.0.6
v5.6.0.7
v5.6.0.8
v5.6.0.9
v5.6.1.1
v5.6.1.2
v5.6.1.6
v5.6.2.1
v5.6.2.2
v5.6.2.3
v5.6.3.1
v5.5.4.51
v5.6.3.3
v5.6.4.1
v5.6.4.10
v5.6.4.11
v5.6.4.12
v5.6.4.13
v5.6.4.14
v5.6.4.15
v5.6.4.16
v5.6.4.17
v5.6.4.18
v5.6.4.19
v5.6.4.20
v5.6.4.21
v5.6.4.22
v5.6.4.23
v5.6.4.5
v5.6.4.6
v5.5.4.45
v5.5.4.44
v5.5.4.42
v5.5.4.41
v5.5.4.40
v5.5.4.39
v5.5.4.38
v5.5.4.37
v5.5.4.36
v5.5.4.31
v5.5.4.28
v5.5.4.27
v5.5.4.26
v5.5.4.25
v5.5.4.24
v5.5.4.23
v5.5.4.22
v5.5.4.21
v5.5.4.20
v5.5.4.19
v5.5.4.17
v5.5.4.16
v5.5.4.15
v5.5.4.14
v5.5.4.13
v5.5.4.12
v5.5.4.11
v5.5.4.10
v5.5.3.8
v5.5.3.42
v5.5.3.41
v5.5.3.40
v5.5.3.39
v5.5.3.38
v5.5.3.34
v5.5.3.33
v5.5.3.32
v5.5.3.31
v5.5.4.67
v5.5.3.28
v5.5.3.26
v5.5.3.25
v5.5.3.24
v5.5.3.22
|
2020-04-09 12:40:23 +03:00 |
|
|
|
80670a0d64
|
Update copyright year
v5.5.1.84
v5.5.1.76
v5.5.1.77
v5.5.1.78
v5.5.1.79
v5.5.1.81
v5.5.1.83
v5.5.1.85
|
2020-04-06 11:59:41 +03:00 |
|
|
|
75f137470b
|
nodejs: get link to bookmark
|
2020-03-19 13:39:29 +03:00 |
|
|
|
870a3ee799
|
[run] Platform
Add platform for run
(cherry picked from commit 8b9f07e46e)
v5.5.1.64
v5.5.1.57
v5.5.1.18
v5.5.1.30
v5.5.1.17
v5.5.1.31
v5.5.1.32
v5.5.1.33
v5.5.1.72
v5.5.1.71
v5.5.1.34
v5.5.1.68
v5.5.1.19
v5.5.1.61
v5.5.1.60
v5.5.1.35
v5.5.1.59
v5.5.1.36
v5.5.1.55
v5.5.1.54
v5.5.1.53
v5.5.1.49
v5.5.1.47
v5.5.1.45
v5.5.1.44
v5.5.1.43
v5.5.1.42
v5.5.1.37
|
2020-03-13 11:29:22 +03:00 |
|
|
|
c3c1689170
|
nodejs: fix upload files
(cherry picked from commit af7101844a)
|
2020-03-13 11:29:09 +03:00 |
|
|
|
a271b847d5
|
nodejs: add run-develop
(cherry picked from commit b58bf412fa)
|
2020-03-13 11:28:52 +03:00 |
|
|
|
45ea1a8c1d
|
v5.5.0
|
2020-03-04 18:33:54 +03:00 |
|
|
|
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 |
|
|
|
422429e742
|
v5.5.0
v5.5.1.9
v5.5.1.6
v5.5.1.7
v5.5.1.10
v5.5.1.11
v5.5.1.14
v5.5.1.8
|
2020-03-04 18:09:04 +03:00 |
|
|
|
29072e3d5c
|
bump 2020
|
2020-03-04 10:13:12 +03:00 |
|
|
|
b82c2c68d5
|
Merge pull request #71 from ONLYOFFICE/feature/python
Feature/python
|
2020-03-04 10:09:03 +03:00 |
|
|
|
67d6eaa18b
|
python: env vars
|
2020-03-03 19:03:05 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
0e91256847
|
python: 2020
|
2020-03-03 14:32:11 +03:00 |
|
|
|
ce16625091
|
python: converted filename was not sent to client
|
2020-03-03 13:27:15 +03:00 |
|
|
|
4d538fc35d
|
python: footer copyright
|
2020-03-03 13:26:36 +03:00 |
|
|
|
36c9583a2c
|
nodejs: remove trade
|
2020-03-03 11:55:24 +03:00 |
|
|
|
1bde1f66d3
|
change name
|
2020-03-03 11:55:24 +03:00 |
|
|
|
fddc08c24b
|
csharp: removed c#7 features
|
2020-03-03 11:40:00 +03:00 |
|
|
|
06305ee262
|
python: zip build script
|
2020-03-03 11:08:30 +03:00 |
|
|
|
e55e27cee8
|
python: reload on dialog close
|
2020-03-03 11:03:57 +03:00 |
|
|
|
8fa77cb9ba
|
python: copyrights & cleanup
|
2020-03-03 11:00:23 +03:00 |
|
|
|
f038327928
|
python: sorting by date
|
2020-03-03 10:45:08 +03:00 |
|
|
|
0adaf8a84b
|
python: lower file extension
|
2020-03-03 10:35:52 +03:00 |
|
|
|
85cb88b0fc
|
python: fixed editors language
|
2020-03-03 10:26:49 +03:00 |
|
|
|
4c8ac0457f
|
Merge pull request #69 from ONLYOFFICE/feature/ruby-v2.6.5
Feature/ruby v2.6.5
|
2020-03-02 17:36:46 +03:00 |
|
|
|
3ba6072b3e
|
Merge pull request #68 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.10.8
build(deps): bump nokogiri from 1.8.1 to 1.10.8 in /web/documentserver-example/ruby
|
2020-02-27 15:52:34 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
61826dc813
|
Merge branch 'feature/pkg' into release/v5.5.0
v5.5.0.115
v5.5.0.136
v5.5.0.166
v5.5.0.165
v5.5.0.161
v5.5.0.160
v5.5.0.159
v5.5.0.158
v5.5.0.156
v5.5.0.151
v5.5.0.148
v5.5.0.147
v5.5.0.141
v5.5.0.140
v5.5.0.139
v5.5.0.138
v5.5.0.137
v5.5.0.135
v5.5.0.134
v5.5.0.131
v5.5.0.167
v5.5.0.130
v5.5.0.129
v5.5.0.127
v5.5.0.126
v5.5.0.122
v5.5.0.121
v5.4.99.5
v5.5.0.111
v5.5.0.112
v5.5.0.113
v5.5.0.114
v5.5.0.116
|
2020-02-12 12:00:19 +03:00 |
|
