Commit Graph

824 Commits

Author SHA1 Message Date
988e336f43 forcesave is disabled by default (b541936473) v6.3.0.48 v6.3.0.56 v6.3.0.71 v6.3.0.72 v6.3.0.73 v6.3.0.74 v6.3.0.76 v6.3.0.77 v6.3.0.78 v6.3.0.79 v6.3.0.8 v6.3.0.82 v6.3.0.83 v6.3.0.84 v6.3.0.85 v6.3.0.86 v6.3.0.88 v6.3.0.89 v6.3.0.9 v6.3.0.91 v6.3.0.7 v6.3.0.69 v6.3.0.68 v6.3.0.67 v6.3.0.66 v6.3.0.65 v6.3.0.64 v6.3.0.63 v6.3.0.62 v6.3.0.61 v6.3.0.58 v6.3.0.57 v6.3.0.70 v6.3.0.55 v6.3.0.54 v6.3.0.53 v6.3.0.52 v6.3.0.51 v6.3.0.50 v6.3.0.49 v6.3.0.47 v6.3.0.46 v6.3.0.45 v6.3.0.43 v6.3.0.41 v6.3.0.40 v6.3.0.39 v6.3.0.37 v6.3.0.36 v6.3.0.35 v6.3.0.34 v6.3.0.33 v6.3.0.27 v6.3.0.26 v6.3.0.25 v6.3.0.24 v6.3.0.23 v6.3.0.22 v6.3.0.21 v6.3.0.10 v6.3.0.11 v6.3.0.12 v6.3.0.13 v6.3.0.14 v6.3.0.15 v6.3.0.16 v6.3.0.18 v6.3.0.19 v6.3.0.20 2021-03-05 11:20:12 +03:00
9ab94ee9c3 Merge remote-tracking branch 'origin/master' into release/v6.3.0 v6.3.0.6 2021-03-04 11:12:08 +03:00
fe02c4914c converting xml v99.99.99.2349 v99.99.99.2350 v6.3.0.5 v99.99.99.2351 v6.3.0.4 2021-03-01 14:26:43 +03:00
82981d3ce2 Merge remote-tracking branch 'remotes/origin/release/v6.2.0' into develop 2021-03-01 14:14:38 +03:00
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
7d5c90e9cf python: set version pyjwt 1.7.1 v99.99.99.2337 v99.99.99.2347 v99.99.99.2348 v99.99.99.2346 v99.99.99.2345 v99.99.99.2342 v99.99.99.2339 v99.99.99.2338 v99.99.99.2336 v99.99.99.2332 2021-02-19 16:08:43 +03:00
b541936473 Merge pull request #126 from ONLYOFFICE/feature/submit-form
Feature/submit form
2021-02-19 15:45:20 +03:00
a2e59cf705 ruby: submit filled form 2021-02-19 15:01:32 +03:00
dc074d4baf python: submit filled form 2021-02-19 15:00:42 +03:00
1cf5b1eea5 php: submit filled form 2021-02-19 15:00:17 +03:00
2635306e2e csharp-mvc: submit filled form 2021-02-19 14:59:59 +03:00
f0cc80fd53 csharp: submit filled form 2021-02-19 14:59:36 +03:00
c9f58e3ca6 java: submit filled form 2021-02-19 14:59:14 +03:00
821e481734 nodejs: improved forcesave submit filled form 2021-02-19 14:58:21 +03:00
f0309615d6 Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
#	web/documentserver-example/nodejs/app.js
2021-02-18 15:39:20 +03:00
47588d135e Merge pull request #115 from ONLYOFFICE/feature/reviewPermissions
Feature/review permissions
v99.99.99.2327
2021-02-18 15:33:56 +03:00
8e6ae3b915 Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
#	web/documentserver-example/csharp-mvc/Models/FileModel.cs
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/app/models/file_model.rb
2021-02-18 15:13:34 +03:00
8fc9d6125c Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
2021-02-18 14:14:00 +03:00
b427594248 Merge pull request #125 from ONLYOFFICE/feature/favicon
Feature/favicon
v99.99.99.2322
2021-02-18 09:09:36 +03:00
5c43308e14 ruby: added dynamic favicon 2021-02-17 20:19:51 +03:00
c5b67b4b00 php: added dynamic favicon 2021-02-17 20:19:30 +03:00
8442def83c csharp-mvc: added dynamic favicon 2021-02-17 20:18:43 +03:00
2cb91eb8d5 csharp: added dynamic favicon 2021-02-17 20:18:15 +03:00
cf82b0ffc9 java: added dynamic favicon 2021-02-17 20:17:15 +03:00
ffcf787f94 python: renamed favicon 2021-02-17 20:16:32 +03:00
ce2714c684 nodejs: renamed favicon 2021-02-17 20:15:47 +03:00
4ccd78053f renamed parameter reviewGroup on reviewGroups 2021-02-17 10:11:36 +03:00
7602183cf9 Merge pull request #124 from ONLYOFFICE/feature/forcesave
Feature/forcesave
v99.99.99.2321
2021-02-17 09:48:34 +03:00
1a6744a814 Merge branch 'develop' into feature/forcesave
# Conflicts:
#	web/documentserver-example/java/src/main/resources/settings.properties
2021-02-16 15:07:23 +03:00
6a89a073fa ruby: download forcesaved file 2021-02-16 15:02:19 +03:00
353119145c python: download forcesaved file 2021-02-16 14:59:04 +03:00
0aaaedc4d6 php: download forcesaved file 2021-02-16 14:14:08 +03:00
246ddc9f9c csharp-mvc: download forcesaved file 2021-02-16 13:28:30 +03:00
3e8b6aaffa csharp: download forcesaved file 2021-02-16 13:28:14 +03:00
c95439c0db java: download forcesaved file 2021-02-16 13:27:53 +03:00
62873e4ce4 nodejs: fix forcesave conversion 2021-02-16 11:00:45 +03:00
e04155e7ad csharp: added forcesave 2021-02-15 17:27:29 +03:00
733f798968 csharp-mvc: added forcesave 2021-02-15 17:26:16 +03:00
f7f0a07239 ruby: added forcesave 2021-02-15 17:24:56 +03:00
ee79e02c54 python: added forcesave 2021-02-15 16:52:44 +03:00
d8afda9b56 php: added forcesave 2021-02-15 15:29:25 +03:00
0569dc7271 java: added forcesave 2021-02-15 13:37:40 +03:00
fef62baa2b Merge pull request #123 from ONLYOFFICE/feature/remove-resource
Feature/remove resource
v99.99.99.2313 v99.99.99.2311 v99.99.99.2318 v99.99.99.2309 v99.99.99.2317 v99.99.99.2316 v99.99.99.2315 v99.99.99.2320 v99.99.99.2312 v99.99.99.2319 v99.99.99.2310
2021-02-11 11:19:56 +03:00
be82ae7078 java: ResourceService.ashx is not used anymore 2021-02-11 11:15:57 +03:00
0a4fcc0cdc nodejs: ResourceService.ashx is not used anymore 2021-02-11 08:58:38 +03:00
823374e2fe csharp-mvc: request user name 2021-02-08 22:28:56 +03:00
3b89aae808 csharp: request user name 2021-02-08 22:28:19 +03:00
cc488187b4 php: request user name 2021-02-08 22:27:14 +03:00
0e191eed91 python: request user name 2021-02-08 22:26:24 +03:00
6d27c1866b ruby: request user name 2021-02-08 22:25:08 +03:00