Commit Graph

225 Commits

Author SHA1 Message Date
0b0919568c 1.0.0 2021-10-06 16:48:03 +03:00
e3304792c4 0.0.0 2021-10-04 14:05:11 +03:00
ffa883644a format config 2021-10-04 14:02:34 +03:00
971cf5745e fix rebase (e2a04ffb89) 2021-10-04 13:15:46 +03:00
1b6d08e9bb rename email.com to example.com 2021-10-01 12:41:12 +03:00
bb9411a82c rename mails 2021-09-30 18:55:22 +03:00
418a7a2712 ruby: user tooltip layout 2021-09-29 10:56:13 +03:00
ce18f76698 cors, fix regexp, fix manifest 2021-09-23 21:56:08 +03:00
8abd7e69a9 misprint 2021-09-20 12:33:46 +03:00
7e06add085 ruby: changed the command 2021-09-17 18:01:51 +03:00
9193cf1d4b ruby: specified the Ruby version 2021-09-17 17:08:03 +03:00
42859d7a28 Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop 2021-09-14 09:29:48 +03:00
d3581658b7 update templates 2021-09-14 09:29:20 +03:00
7027970b65 support oxps 2021-09-14 09:29:19 +03:00
2942324696 layout fix 2021-09-02 13:41:14 +03:00
a546f1a1f4 Merge pull request #187 from ONLYOFFICE/feature/ie11-layout-fix
update layout for ie11
2021-08-29 15:43:25 +03:00
7a6afed510 Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
2021-08-29 15:39:13 +03:00
344f5e1652 Merge pull request #183 from ONLYOFFICE/feature/corrupt-url
Feature/corrupt url
2021-08-29 15:32:45 +03:00
2ef34bc769 Merge pull request #182 from ONLYOFFICE/feature/header-height
set header height 48px
2021-08-29 15:27:10 +03:00
093fadaf74 update layout for ie11 2021-08-26 20:09:59 +03:00
e165c695fb ruby: new comments 2021-08-26 14:00:52 +03:00
1749ae6a52 Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.11.5
# Conflicts:
#	web/documentserver-example/ruby/Gemfile.lock
2021-08-24 14:18:48 +03:00
f0a86d924f saving without url 2021-08-24 13:08:08 +03:00
6a75f23020 set header height 48px 2021-08-23 16:56:42 +03:00
fdcc6e24db Merge pull request #180 from ONLYOFFICE/feature/readme
Readme
2021-08-06 12:31:03 +03:00
3142b86d9e some changed for readme 2021-08-05 17:44:29 +03:00
3df2773867 change image url to "" for Blank template 2021-07-29 13:48:55 +03:00
f5f0ce4e06 adaptive layout: add media for main-panel 2021-07-20 12:34:06 +03:00
563e02a5ba Merge pull request #175 from ONLYOFFICE/feature/converter-downloadUrl-fix
fix downloadUrl for convert
2021-07-13 15:05:56 +03:00
b2980b5749 fix downloadUrl for convert 2021-07-13 14:32:39 +03:00
b58f33dddf file versions on index page fix 2021-07-09 16:32:12 +03:00
2205e6252e footer content margin 596-610px fix 2021-07-08 15:25:38 +03:00
68f950aac5 adaptive layout: change media from 970px to 986px 2021-07-08 14:58:56 +03:00
05215ffd4b adaptive layout: long file names width fix on smallscreen 2021-07-08 11:10:51 +03:00
582a0d0612 adaptive layout: border line fix 2021-07-06 15:41:01 +03:00
44fc7a8215 line space fix 2021-06-29 15:56:55 +03:00
af16f147ba ruby: adaptive layout 2021-06-29 15:31:12 +03:00
05cd67a2f1 Merge pull request #158 from ONLYOFFICE/hellonadya-patch-1-1
Update README.md
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 2021-06-18 11:07:30 +03:00
b00a4dba31 update document templates 2021-06-18 11:07:11 +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
75e14c9452 added a description for users about creating a file from the editor 2021-06-16 16:56:25 +03:00
4e69a7dfa5 ruby: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:54:38 +03:00
66d977abaf ruby: new sets of comment permissions to demonstate comment groups 2021-06-15 16:14:28 +02:00
b732f6e8cc ruby: commentGroups 2021-06-15 11:49:56 +02:00
badc6644c2 Merge pull request #164 from ONLYOFFICE/feature/document-password
Fixed password bug for blank document
2021-05-31 13:51:53 +03:00
3bf8d72454 ruby: fixed bug for setting and removing password for blank document 2021-05-31 13:44:05 +03:00
b36668468e added description by mentions for anonymous user 2021-05-31 10:22:56 +03:00