Commit Graph

1153 Commits

Author SHA1 Message Date
d8e229df2c replace set filepass null v6.4.1.24 v6.4.1.20 v6.4.1.18 v6.4.1.16 v6.4.1.15 v6.4.1.14 v6.4.1.13 v6.4.1.10 v6.4.1.5 v6.4.1.6 v6.4.1.7 v6.4.1.19 v6.4.1.21 v6.4.1.22 v6.4.1.23 v6.4.1.25 v6.4.1.26 v6.4.1.27 v6.4.1.8 2021-08-30 18:56:18 +03:00
5b3f62a011 fix for IE 11 2021-08-30 18:56:00 +03:00
3639e9706f Merge pull request #184 from ONLYOFFICE/feature/wopi-url-fix
href fix
2021-08-30 18:54:59 +03:00
28e2f61dc4 Merge branch release/v6.4.0 into master v6.5.0.23 v6.5.0.2 v6.5.0.1 v6.5.0.11 v6.5.0.12 v6.5.0.13 v6.4.1.2 v6.4.1.3 v6.4.1.4 v6.5.0.8 v6.5.0.7 v6.5.0.6 v6.5.0.5 v6.5.0.3 v6.5.0.27 v6.5.0.26 v6.5.0.25 v6.5.0.24 v6.4.1.1 v6.5.0.22 v6.5.0.21 v6.5.0.10 v6.5.0.20 v6.5.0.14 v6.5.0.15 v6.5.0.16 v6.5.0.17 v6.5.0.18 v6.5.0.19 2021-08-26 11:34:50 +00:00
9ba69f6aef href fix 2021-08-25 17:55:48 +03:00
1ef88d1f6d Merge branch hotfix/v6.3.2 into release/v6.4.0 v6.4.0.121 v6.4.0.111 v6.4.0.120 v6.4.0.119 v6.4.0.118 v6.4.0.117 v6.4.0.116 v6.4.0.115 v6.4.0.112 v6.4.0.104 v6.4.0.110 v6.4.0.109 v6.4.0.108 v6.4.0.107 v6.4.0.106 v6.4.0.105 v6.4.0.124 2021-08-10 12:24:33 +00:00
9e34ed7f67 Merge pull request #172 from ONLYOFFICE/feature/wopi
Feature/wopi
v99.99.99.2501 v6.4.0.101 v6.4.0.91 v6.4.0.92 v6.4.0.93 v6.4.0.94 v6.4.0.95 v6.4.0.96 v6.4.0.97 v6.4.0.98 v6.4.0.99 v6.4.0.89 v6.4.0.88 v6.4.0.87 v6.4.0.86 v6.4.0.85 v6.4.0.84 v6.4.0.83 v6.4.0.82 v6.4.0.81 v6.4.0.80 v6.4.0.79 v6.4.0.78 v6.4.0.77 v6.4.0.76 v6.4.0.75 v6.4.0.74 v6.4.0.73 v6.4.0.72 v6.4.0.71 v6.4.0.70 v6.4.0.67 v6.4.0.66 v6.4.0.62 v6.4.0.61 v6.4.0.60 v6.4.0.59 v6.4.0.58 v6.4.0.57 v6.4.0.56 v6.4.0.55 v6.4.0.54 v6.4.0.52 v6.4.0.45 v6.4.0.44 v6.4.0.43 v6.4.0.42 v6.4.0.41 v6.4.0.40 v6.4.0.39 v6.4.0.38 v6.4.0.37 v6.4.0.36 v6.4.0.35 v6.4.0.34 v6.4.0.33 v6.4.0.103 v6.4.0.90 v6.4.0.100 v99.99.99.2506 v99.99.99.2505 v99.99.99.2504 v99.99.99.2503 v99.99.99.2502 v99.99.99.2499 v99.99.99.2498 v99.99.99.2497 v99.99.99.2496 v99.99.99.2495 v99.99.99.2492 v99.99.99.2491 v99.99.99.2490 v99.99.99.2489
2021-06-21 16:07:53 +03:00
eee6246d0c nodejs: get discovery on wopi page only (9295d83609) 2021-06-21 16:03:56 +03:00
36513d3544 nodejs: stop retrying 2021-06-21 15:42:38 +03:00
fafc3d3d4f nodejs: license 2021-06-21 15:23:29 +03:00
c1e4abf362 Merge remote-tracking branch 'remotes/origin/develop' into feature/wopi 2021-06-21 15:14:49 +03:00
06c1c1bf21 nodejs: copyright 2021-06-21 15:14:32 +03:00
24a2e0bd14 nodejs: move wopi config 2021-06-21 15:12:21 +03:00
05cd67a2f1 Merge pull request #158 from ONLYOFFICE/hellonadya-patch-1-1
Update README.md
v99.99.99.2488
2021-06-21 11:25:13 +03:00
6f691b6b9f Update Users (#171)
Small issues with English fixed
2021-06-21 10:41:48 +03:00
85e3f83d84 Merge remote-tracking branch 'remotes/origin/release/v6.4.0' into develop v99.99.99.2487 v99.99.99.2486 2021-06-18 11:07:30 +03:00
b00a4dba31 update document templates v6.4.0.32 v6.4.0.31 v6.4.0.30 2021-06-18 11:07:11 +03:00
3d12d3c38c Merge pull request #170 from ONLYOFFICE/feature/comment-group
Comment groups examples
v99.99.99.2484
2021-06-17 12:07:20 +03:00
5d0f190dc8 change full permission value for commentGroups 2021-06-17 12:05:45 +03:00
2782f8f9bd Merge remote-tracking branch 'remotes/origin/develop' into feature/comment-group
# Conflicts:
#	web/documentserver-example/csharp-mvc/Helpers/Users.cs
#	web/documentserver-example/csharp/Users.cs
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/java/src/main/java/entities/User.java
#	web/documentserver-example/java/src/main/java/helpers/Users.java
#	web/documentserver-example/nodejs/helpers/users.js
#	web/documentserver-example/php/users.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb
2021-06-17 10:11:07 +03:00
54ed6d8913 Merge pull request #169 from ONLYOFFICE/feature/create-blank-and-with-sample-document
Сreated blank and with sample content document, and removed ability to Create New for anonymous users
v99.99.99.2483
2021-06-16 17:02:12 +03:00
75e14c9452 added a description for users about creating a file from the editor 2021-06-16 16:56:25 +03:00
e1b800aa69 php: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:56:16 +03:00
4e69a7dfa5 ruby: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:54:38 +03:00
61cbba05f3 python: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:53:33 +03:00
ab03bb5490 nodejs: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:51:56 +03:00
1deeade91e java: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:50:37 +03:00
417bd3b9f2 csharp-mvc: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:48:48 +03:00
c3fa000cea csharp: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:46:28 +03:00
f8484cfe0e csharp-mvc: changed users description 2021-06-16 15:53:54 +03:00
b396419d05 csharp: changed users description 2021-06-16 15:53:09 +03:00
2d4490e21a csharp-mvc: added commentGroups and sets comment permissions 2021-06-16 15:41:23 +03:00
61295628de csharp: added commentGroups and sets comment permissions 2021-06-16 15:39:33 +03:00
90c7a8440e php: permissions information 2021-06-16 08:09:00 +02:00
40eada3a17 java: new sets of comment permissions to demonstate comment groups 2021-06-15 16:26:03 +02:00
66d977abaf ruby: new sets of comment permissions to demonstate comment groups 2021-06-15 16:14:28 +02:00
e259b303be python: new sets of comment permissions to demonstate comment groups 2021-06-15 16:08:37 +02:00
4d091e892e nodejs: new sets of comment permissions to demonstate comment groups 2021-06-15 16:03:52 +02:00
34bc5d53ee php: new sets of comment permissions to demonstate comment groups 2021-06-15 15:58:15 +02:00
3b514b7f5f nodejs: users description changes 2021-06-15 14:53:35 +02:00
ee0c1571f6 java: commentGroups 2021-06-15 14:49:52 +02:00
ba5a4e64f5 python: commentGroups 2021-06-15 12:18:34 +02:00
500f93deb8 php: commentGroups 2021-06-15 12:06:18 +02:00
b732f6e8cc ruby: commentGroups 2021-06-15 11:49:56 +02:00
a815d30725 nodejs: commentGroups 2021-06-15 11:16:12 +02:00
c38c3ab0d6 Merge branch hotfix/v6.3.1 into master v6.3.2.7 v6.3.2.5 v6.3.2.6 v6.3.2.4 v6.3.2.8 v6.3.2.2 2021-06-08 11:53:18 +00:00
b9e70b913a Merge pull request #167 from ONLYOFFICE/release/v6.4.0
Release/v6.4.0
v99.99.99.2470 v99.99.99.2473 v99.99.99.2474 v99.99.99.2478 v99.99.99.2479 v99.99.99.2480 v99.99.99.2481 v99.99.99.2482 v99.99.99.2472 v99.99.99.2471 v99.99.99.2469
2021-06-04 14:08:57 +03:00
31cd3c2dad Merge pull request #166 from ONLYOFFICE/hotfix/v6.3.1
Hotfix/v6.3.1
v6.4.0.19 v6.4.0.21 v6.4.0.17 v6.4.0.16 v6.4.0.18 v6.4.0.15 v6.4.0.20 v6.4.0.14 v6.4.0.22 v6.4.0.23 v6.4.0.25 v6.4.0.13
2021-06-04 14:08:28 +03:00
2082d24132 nodejs: wopi: edit icons 2021-06-01 13:36:03 +03:00
cdf629e863 nodejs: wopi: return correct version 2021-06-01 13:24:17 +03:00