4894 Commits

Author SHA1 Message Date
6eaa290557 Merge branch 'hotfix/v5.0.1' into develop v5.0.99.93 v5.0.99.97 v5.0.99.96 v5.0.99.90 v5.0.99.91 v5.0.99.92 v5.0.99.95 v5.0.99.94 2017-09-26 14:14:40 +03:00
ed8df66513 support OpenDocument Flat Document file type v5.0.1.31 v5.0.1.26 v5.0.1.20 v5.0.1.21 v5.0.1.35 v5.0.1.22 v5.0.1.39 v5.0.1.23 v5.0.1.43 v5.0.1.42 v5.0.1.41 v5.0.1.34 v5.0.1.37 v5.0.1.32 v5.0.1.40 v5.0.1.24 v5.0.1.29 v5.0.1.28 v5.0.1.27 v5.0.1.25 2017-09-26 14:11:18 +03:00
16d942a487 support OpenDocument Flat Document file type v5.0.99.89 2017-09-26 13:24:34 +03:00
5c6d9ec008 v5.0.0 v5.0.1.19 v5.0.1.17 v5.0.1.5 v5.0.1.6 v5.0.1.9 v5.0.1.8 v5.0.1.4 v5.0.1.7 v5.0.1.3 v5.0.1.16 v5.0.1.18 v5.0.1.15 v5.0.1.14 v5.0.1.13 v5.0.1.12 v5.0.1.11 v5.0.1.10 2017-09-19 17:04:59 +03:00
8e7f7c20e4 nodejs: fix opening history without changes v5.0.99.82 v5.0.99.84 v5.0.99.78 v5.0.99.80 v5.0.99.77 v5.0.99.76 v5.0.99.75 v5.0.99.74 v5.0.99.79 v5.0.99.73 v5.0.99.72 v5.0.99.71 v5.0.99.70 v5.0.99.69 v5.0.99.68 v5.0.99.67 v5.0.99.66 v5.0.99.87 v5.0.99.86 v5.0.99.85 v5.0.99.88 v5.0.99.83 v5.0.99.81 2017-09-14 16:07:53 +03:00
b3f7e9861f Merge remote-tracking branch 'remotes/origin/release/v5.0.0' into develop
# Conflicts:
#	web/documentserver-example/nodejs/config/default.json
#	web/documentserver-example/nodejs/helpers/fileUtility.js
v5.0.99.63 v5.0.99.65 v5.0.99.56 v5.0.99.60 v5.0.99.61 v5.0.99.62 v5.0.99.55 v5.0.99.59 v5.0.99.57 v5.0.99.52 v5.0.99.53 v5.0.99.54 v5.0.99.64
2017-09-07 15:58:30 +03:00
797696ceea Merge branch 'feature/m-formats' into develop 2017-09-07 15:54:54 +03:00
af30096d71 Fix editable formats list 2017-09-07 15:54:14 +03:00
8a7193a645 support template formats 2017-09-07 15:52:47 +03:00
84f5be3556 change viewed formats list 2017-09-07 15:47:47 +03:00
cff90de454 nodejs: edit link only for editable format v5.0.99.51 2017-09-07 13:51:33 +03:00
18b7bdb401 support convertation -m formats to -x 2017-09-07 12:28:46 +03:00
75155b4c54 Fix Bug 35704 - commenting in review mode v5.0.0.112 v5.0.0.96 v5.0.0.105 v5.0.0.104 v5.0.0.80 v5.0.0.107 v5.0.0.103 v5.0.0.102 v5.0.0.81 v5.0.0.115 v5.0.0.82 v5.0.0.83 v5.0.0.84 v5.0.0.108 v5.0.0.109 v5.0.0.79 v5.0.0.110 v5.0.0.85 v5.0.0.119 v5.0.0.118 v5.0.0.86 v5.0.0.87 v5.0.0.88 v5.0.0.100 v5.0.0.89 v5.0.0.90 v5.0.0.91 v5.0.0.92 v5.0.0.111 v5.0.0.93 v5.0.0.94 v5.0.0.117 v5.0.0.95 v5.0.0.106 v5.0.0.97 v5.0.0.98 v5.0.0.114 v5.0.0.113 v5.0.0.116 2017-09-06 11:19:11 +03:00
4c3bc0e7ef convert docm,dot,dotm,dotx,xlsm,xlt,xltm,xltx,pot,potm,potx,ppsm,pptm to OOX format 2017-09-06 11:09:29 +03:00
908affc61c Fix Bug 35704 - commenting in review mode v5.0.99.39 v5.0.99.47 v5.0.99.50 v5.0.99.28 v5.0.99.31 v5.0.99.32 v5.0.99.33 v5.0.99.34 v5.0.99.35 v5.0.99.36 v5.0.99.37 v5.0.99.38 v5.0.99.29 v5.0.99.27 v5.0.99.30 v5.0.99.41 v5.0.99.42 v5.0.99.43 v5.0.99.44 v5.0.99.45 v5.0.99.46 v5.0.99.40 v5.0.99.48 v5.0.99.49 2017-08-28 17:17:45 +03:00
c5b227d278 remove preselected lang value (Bug 35603) v5.0.99.26 2017-08-28 16:08:32 +03:00
364d24dda2 Added new formats. v5.0.0.32 v5.0.0.31 v5.0.0.77 v5.0.0.76 v5.0.0.75 v5.0.0.74 v5.0.0.73 v5.0.0.72 v5.0.0.71 v5.0.0.70 v5.0.0.69 v5.0.0.68 v5.0.0.67 v5.0.0.66 v5.0.0.64 v5.0.0.63 v5.0.0.62 v5.0.0.61 v5.0.0.60 v5.0.0.59 v5.0.0.58 v5.0.0.78 v5.0.0.56 v5.0.0.55 v5.0.0.54 v5.0.0.53 v5.0.0.52 v5.0.0.51 v5.0.0.50 v5.0.0.27 v5.0.0.28 v5.0.0.29 v5.0.0.49 v5.0.0.48 v5.0.0.47 v5.0.0.46 v5.0.0.45 v5.0.0.44 v5.0.0.43 v5.0.0.42 v5.0.0.41 v5.0.0.40 v5.0.0.39 v5.0.0.38 v5.0.0.36 v5.0.0.34 v5.0.0.33 v5.0.0.30 2017-08-18 16:37:03 +03:00
74537582d7 support -m formats 2017-08-04 17:39:02 +03:00
8057ef7cbc nodejs: siteUrl v5.0.99.13 v4.5.dev.153 v5.0.0.5 v5.0.0.6 v5.0.0.7 v5.0.0.26 v5.0.0.25 v5.0.0.24 v5.0.0.23 v5.0.0.22 v5.0.0.21 v5.0.0.20 v5.0.0.19 v5.0.0.18 v5.0.0.17 v5.0.0.16 v5.0.0.15 v5.0.0.14 v5.0.0.13 v5.0.99.10 v5.0.99.11 v4.5.dev.179 v5.0.99.14 v5.0.99.15 v5.0.99.16 v5.0.99.17 v5.0.99.18 v5.0.99.19 v5.0.99.20 v5.0.0.11 v5.0.99.8 v5.0.99.7 v5.0.99.21 v5.0.99.6 v5.0.99.9 v5.0.99.22 v5.0.99.23 v5.0.99.5 v5.0.99.24 v5.0.0.10 v5.0.99.3 v5.0.99.25 v5.0.99.4 v4.5.dev.178 v4.5.dev.176 v4.5.dev.175 v4.5.dev.174 v4.5.dev.173 v4.5.dev.172 v4.5.dev.171 v4.5.dev.170 v4.5.dev.169 v4.5.dev.168 v5.0.0.8 v4.5.dev.167 v4.5.dev.166 v4.5.dev.165 v4.5.dev.164 v4.5.dev.163 v4.5.dev.162 v4.5.dev.161 v4.5.dev.160 v4.5.dev.159 v4.5.dev.148 v4.5.dev.149 v4.5.dev.150 v4.5.dev.152 v5.0.0.9 v4.5.dev.154 v4.5.dev.155 v4.5.dev.156 v4.5.dev.157 v4.5.dev.158 2017-08-03 19:18:47 +03:00
8bab3ecbc6 nodejs: web-apps-pro for development 2017-08-03 16:33:29 +03:00
7e2a12c836 java: delete using javafx.util.Pair v4.5.dev.123 v4.5.dev.121 v4.5.dev.129 v4.5.dev.122 v4.5.dev.127 v4.5.dev.126 v4.5.dev.125 v4.5.dev.124 v4.5.dev.130 v4.5.dev.131 v4.5.dev.128 v4.5.dev.120 v4.5.dev.119 v4.5.dev.118 v4.5.dev.117 v4.5.dev.116 v4.5.dev.115 v4.5.dev.114 v4.5.dev.113 2017-07-31 16:41:47 +03:00
f4ed512fd0 Fix Bug 35281 - reload files list after closing upload dialog by Close button v4.5.dev.89 v4.5.dev.91 v4.5.dev.49 v4.5.dev.48 v4.5.dev.47 v4.5.dev.46 v4.5.dev.45 v4.5.dev.44 v4.5.dev.43 v4.5.dev.42 v4.5.dev.41 v4.5.dev.40 v4.5.dev.99 v4.5.dev.100 v4.5.dev.101 v4.5.dev.102 v4.5.dev.103 v4.5.dev.104 v4.5.dev.105 v4.5.dev.106 v4.5.dev.107 v4.5.dev.108 v4.5.dev.109 v4.5.dev.110 v4.5.dev.111 v4.5.dev.112 v4.5.dev.98 v4.5.dev.97 v4.5.dev.96 v4.5.dev.95 v4.5.dev.94 v4.5.dev.93 v4.5.dev.92 v4.5.dev.90 v4.5.dev.88 v4.5.dev.50 v4.5.dev.51 v4.5.dev.52 v4.5.dev.53 v4.5.dev.54 v4.5.dev.55 v4.5.dev.56 v4.5.dev.57 v4.5.dev.58 v4.5.dev.87 v4.5.dev.59 v4.5.dev.86 v4.5.dev.60 v4.5.dev.61 v4.5.dev.62 v4.5.dev.64 v4.5.dev.65 v4.5.dev.67 v4.5.dev.68 v4.5.dev.69 v4.5.dev.85 v4.5.dev.84 v4.5.dev.70 v4.5.dev.71 v4.5.dev.72 v4.5.dev.73 v4.5.dev.74 v4.5.dev.75 v4.5.dev.76 v4.5.dev.77 v4.5.dev.83 v4.5.dev.78 v4.5.dev.82 v4.5.dev.81 v4.5.dev.80 2017-07-07 17:27:59 +03:00
e729b21dad Merge tag 'v4.4.1' into develop
v4.4.1
v4.5.dev.28 v4.5.dev.39 v4.5.dev.38 v4.5.dev.37 v4.5.dev.36 v4.5.dev.35 v4.5.dev.34 v4.5.dev.33 v4.5.dev.32 v4.5.dev.31 v4.5.dev.30 v4.5.dev.29
2017-07-05 11:49:04 +03:00
26dec26f78 Merge branch 'release/v4.4.1' v4.4.2.2 v4.4.2.7 v1.new.toolbar.20 v1.new.toolbar.23 v1.new.toolbar.24 v4.5.devl.14 v4.4.2.10 v4.4.2.11 v4.4.2.12 v1.new.toolbar.19 v4.4.2.13 v4.4.2.14 v4.4.2.15 v4.4.2.16 v4.4.2.17 v4.4.2.18 v4.4.2.19 v4.4.2.20 v4.4.2.3 v4.4.2.4 v4.4.2.5 v4.4.2.6 v4.5.devl.7 v4.4.3.7 v4.4.3.6 v4.4.3.5 v4.4.2.9 v4.4.2.8 2017-07-05 11:48:53 +03:00
c456b697e1 Merge pull request #31 from ONLYOFFICE/develop
Develop
v4.4.1.30 v4.4.1.22 v4.4.1.19 v4.4.1.20 v4.4.1.21 v4.4.1.23 v4.4.1.24 v4.4.1.25 v4.4.1.26 v4.4.1.27 v4.4.1.28 v4.4.1.31 v4.4.1.32 v4.4.1.33 v4.4.1.34 v4.4.1.35 v4.4.1.36 v4.4.1.37 v4.4.1.38 v4.4.1.39
2017-06-28 18:40:04 +03:00
a17b419791 nodejs: comment only mode v4.5.dev.13 v4.5.dev.8 v4.5.dev.24 v4.5.dev.14 v4.5.dev.25 v4.5.dev.22 v4.5.dev.26 v4.5.dev.27 v4.5.dev.12 v4.5.dev.7 v4.5.dev.19 v4.5.dev.9 v4.5.dev.20 v4.5.dev.23 v4.5.dev.18 v4.5.dev.17 v4.5.dev.15 v4.5.dev.16 v4.5.dev.10 2017-06-28 18:09:17 +03:00
25e0d5692f nodejs: additional parameter for review mode 2017-06-28 17:36:47 +03:00
e8559cf67c nodejs: fix review mode 2017-06-28 17:36:17 +03:00
2882366ed6 Update Readme.md v4.4.1.18 v4.4.1.17 2017-06-28 17:27:09 +03:00
30829683ed Merge pull request #30 from ONLYOFFICE/fix/pptx-sample-lang
Update `new.pptx` files
v4.4.1.9 v4.4.1.8 v4.4.1.16 v4.4.1.14 v4.4.1.13 v4.4.1.12 v4.4.1.11 v4.4.1.10
2017-06-27 14:02:44 +03:00
0988e10500 Update new.pptx files
Old files were set with Russian language as default lang
for spellchecker.
Updated files were made by Denis Spitsyn.
2017-06-27 13:51:31 +03:00
af7dcbb700 corrected license type to MIT v4.5.dev.3 v4.5.dev.6 v4.5.dev.5 v4.5.dev.4 2017-06-26 18:04:43 +03:00
ba1358c116 Copyright 2017-06-26 16:29:01 +03:00
0325c421bf java: revert some changes v4.4.1.7 v4.4.0.240 v4.4.1.3 v4.4.1.4 v4.4.1.5 v4.4.1.6 v4.5.0.249 v4.4.0.248 v4.4.0.247 v4.4.1.2 v4.4.0.241 v4.4.0.242 v4.4.0.243 v4.4.0.244 v4.4.0.245 v4.4.0.246 2017-06-23 13:29:41 +03:00
9ee88881bf php: encoding v4.4.0.239 2017-06-23 11:41:06 +03:00
5d5ef36b48 mvc: include dependencies 2017-06-23 11:40:21 +03:00
6d4cf2089e Merge pull request #29 from ONLYOFFICE/feature/java
Feature/java
2017-06-23 11:38:52 +03:00
e7f492242f java: processing empty parameters 2017-06-13 19:11:08 +03:00
022acfb9cd Merge tag 'v4.3.5' into develop
v4.3.5 v4.3.5
v4.4.0.200 v4.4.0.210 v4.4.0.172 v4.4.0.173 v4.4.0.174 v4.4.0.175 v4.4.0.176 v4.4.0.177 v4.4.0.179 v4.4.0.180 v4.4.0.181 v4.4.0.182 v4.4.0.183 v4.4.0.184 v4.4.0.185 v4.4.0.186 v4.4.0.187 v4.4.0.188 v4.4.0.189 v4.4.0.190 v4.4.0.191 v4.4.0.192 v4.4.0.193 v4.4.0.194 v4.4.0.195 v4.4.0.196 v4.4.0.197 v4.4.0.198 v4.4.0.199 v4.4.0.170 v4.4.0.201 v4.4.0.202 v4.4.0.203 v4.4.0.204 v4.4.0.205 v4.4.0.206 v4.4.0.207 v4.4.0.208 v4.4.0.209 v4.4.0.171 v4.4.0.211 v4.4.0.212 v4.4.0.213 v4.4.0.214 v4.4.0.215 v4.4.0.216 v4.4.0.217 v4.4.0.218 v4.4.0.219 v4.4.0.220 v4.4.0.221 v4.4.0.222 v4.4.0.223 v4.4.0.224 v4.4.0.169 v4.4.0.168 v4.4.0.167 v4.4.0.166 v4.4.0.165 v4.4.0.164 v4.4.0.161 v4.4.0.160 v4.4.0.227 v4.4.0.225 v4.4.0.238 v4.4.0.237 v4.4.0.236 v4.4.0.235 v4.4.0.234 v4.4.0.233 v4.4.0.232 v4.4.0.231 v4.4.0.230 v4.4.0.226 v4.4.0.229 v4.4.0.228
2017-06-05 16:49:44 +03:00
66c19c1b89 qBBBBBBBBBAAAAAMerge branch 'hotfix/v4.3.5' v4.3.6 v4.3.5 v4.3.6.2 2017-06-05 16:49:28 +03:00
a32be5a464 java: ignore 2017-06-02 17:46:34 +03:00
f7a83caa64 java: URLEncoder.encode(string) is deprecated 2017-06-02 17:46:34 +03:00
899116b114 java: response from callback "error:0" 2017-06-02 17:46:24 +03:00
7d5d444108 java: closing scanner 2017-06-02 17:45:51 +03:00
bd3cb77bb6 java: project file 2017-06-02 17:14:54 +03:00
5e14e4d04f java: Fixed unused code 2017-06-02 17:14:31 +03:00
bbd8305ad9 nodejs: error when save deleted file v4.4.0.117 v4.4.0.86 v4.4.0.92 v4.4.0.143 v4.4.0.98 v4.4.0.99 v4.4.0.97 v4.4.0.96 v4.4.0.95 v4.4.0.94 v4.4.0.93 v4.4.0.144 v4.4.0.145 v4.4.0.146 v4.4.0.147 v4.4.0.148 v4.4.0.149 v4.4.0.141 v4.4.0.150 v4.4.0.151 v4.4.0.152 v4.4.0.153 v4.4.0.154 v4.4.0.155 v4.4.0.91 v4.4.0.100 v4.4.0.101 v4.4.0.102 v4.4.0.103 v4.4.0.104 v4.4.0.105 v4.4.0.106 v4.4.0.107 v4.4.0.108 v4.4.0.109 v4.4.0.110 v4.4.0.111 v4.4.0.112 v4.4.0.113 v4.4.0.114 v4.4.0.115 v4.4.0.116 v4.4.0.90 v4.4.0.118 v4.4.0.119 v4.4.0.121 v4.4.0.122 v4.4.0.123 v4.4.0.124 v4.4.0.125 v4.4.0.126 v4.4.0.127 v4.4.0.128 v4.4.0.129 v4.4.0.130 v4.4.0.131 v4.4.0.132 v4.4.0.133 v4.4.0.134 v4.4.0.135 v4.4.0.136 v4.4.0.137 v4.4.0.138 v4.4.0.85 v4.4.0.142 v4.4.0.87 v4.4.0.88 v4.4.0.89 v4.4.0.139 v4.4.0.140 v4.4.0.159 v4.4.0.158 v4.4.0.157 v4.4.0.156 2017-05-18 19:53:56 +03:00
c5b6b7ab1b nodejs: use the date when creating the key 2017-05-18 19:53:23 +03:00
c854249add Merge pull request #27 from ONLYOFFICE/feature/nssm-startup
fixed crash on windows 2008r2
v4.3.5.9 v4.3.5.8 v4.3.5.7 v4.3.5.6 v4.3.5.5 v4.3.5.4 v4.3.5.3 v4.3.5.2 v4.3.5.14 v4.3.5.13 v4.3.5.12 v4.3.5.11 v4.3.5.10
2017-05-16 13:10:59 +03:00
837b56b20f fixed crash on windows 2008r2 2017-05-15 16:36:58 +03:00