|
|
a412f3f591
|
ruby and php: delete misprint quotes
|
2021-10-11 14:19:02 +03:00 |
|
|
|
c3774d8cb6
|
replace hiding portal-info block from js to templates
|
2021-10-06 15:14:45 +03:00 |
|
|
|
418a7a2712
|
ruby: user tooltip layout
|
2021-09-29 10:56:13 +03:00 |
|
|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
e165c695fb
|
ruby: new comments
|
2021-08-26 14:00:52 +03:00 |
|
|
|
b58f33dddf
|
file versions on index page fix
|
2021-07-09 16:32:12 +03:00 |
|
|
|
af16f147ba
|
ruby: adaptive layout
|
2021-06-29 15:31:12 +03:00 |
|
|
|
4e69a7dfa5
|
ruby: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:54:38 +03:00 |
|
|
|
5c3c0b4361
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mentions
|
2021-05-31 10:02:04 +03:00 |
|
|
|
07d11f0bae
|
fixed the no ability to add mentions for anonymous users
|
2021-05-28 15:10:06 +03:00 |
|
|
|
b3dd5bc15d
|
ruby: add mentions
|
2021-05-21 10:15:19 +03:00 |
|
|
|
6b54e18aad
|
ruby: changed icons from png to svg
|
2021-05-17 16:31:41 +03:00 |
|
|
|
99a7c667b3
|
ruby: add description for user rights
|
2021-04-27 01:05:59 +03:00 |
|
|
|
2132798ee3
|
ruby: add list users
|
2021-04-23 17:11:52 +03:00 |
|
|
|
495435c8ff
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwt-download-files
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
# web/documentserver-example/nodejs/helpers/docManager.js
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/utils/docManager.py
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/controllers/home_controller.rb
# web/documentserver-example/ruby/app/models/document_helper.rb
# web/documentserver-example/ruby/app/models/file_model.rb
|
2021-04-21 17:53:53 +03:00 |
|
|
|
8d34ff2ed2
|
ruby: add jwt for download files
|
2021-04-21 15:54:21 +03:00 |
|
|
|
56a65a9f3e
|
ruby: added comments
|
2021-04-20 17:33:48 +03:00 |
|
|
|
72ec12d297
|
ruby: edit link only for editable format
|
2021-04-16 16:08:18 +03:00 |
|
|
|
a85ea5c551
|
ruby: add password for convert
|
2021-04-14 18:13:09 +03:00 |
|
|
|
ef064992f2
|
ruby: fix onRequestEditRights
|
2021-04-11 19:47:22 +03:00 |
|
|
|
7884f3c64c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/redesign
# Conflicts:
# web/documentserver-example/nodejs/views/index.ejs
# web/documentserver-example/python/templates/index.html
|
2021-03-25 21:31:22 +03:00 |
|
|
|
8ca58370e9
|
ruby: redesign window upload
|
2021-03-25 16:31:48 +03:00 |
|
|
|
599da25503
|
ruby: added tooltips
|
2021-03-25 15:27:32 +03:00 |
|
|
|
1bfe1b383b
|
ruby: redesign
|
2021-03-25 15:15:35 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
8fc9d6125c
|
Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
|
2021-02-18 14:14:00 +03:00 |
|
|
|
5c43308e14
|
ruby: added dynamic favicon
|
2021-02-17 20:19:51 +03:00 |
|
|
|
6a89a073fa
|
ruby: download forcesaved file
|
2021-02-16 15:02:19 +03:00 |
|
|
|
6d27c1866b
|
ruby: request user name
|
2021-02-08 22:25:08 +03:00 |
|
|
|
e4eb8366bd
|
ruby: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-05 18:46:21 +03:00 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
bcd114d089
|
ruby: fix-history
|
2021-02-02 12:29:04 +03:00 |
|
|
|
361b8bd0f4
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-02-01 16:57:59 +03:00 |
|
|
|
48694f0f31
|
ruby: mailmerge
|
2021-02-01 12:33:23 +03:00 |
|
|
|
dae246e8a2
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor
# Conflicts:
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/config/application.rb
|
2021-01-29 12:49:30 +03:00 |
|
|
|
1c6c45606b
|
ruby: add Rails.configuration.urlExample
|
2021-01-29 12:09:16 +03:00 |
|
|
|
1c0a742f54
|
ruby: config-refactor
|
2021-01-28 22:05:09 +03:00 |
|
|
|
dcd4adf5ad
|
ruby: fix merge
|
2021-01-28 15:16:19 +03:00 |
|
|
|
6e81fa8996
|
Merge branch 'develop' into feature/insert-image
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 15:12:36 +03:00 |
|
|
|
e90ba356fe
|
ruby: fix merge
|
2021-01-28 13:49:14 +03:00 |
|
|
|
54c6025bc5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/compare-file
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 13:38:00 +03:00 |
|
|
|
b867d75bac
|
ruby: compare-file
|
2021-01-28 13:28:28 +03:00 |
|
|
|
badcd6e110
|
ruby: fix merge
|
2021-01-28 10:50:24 +03:00 |
|
|
|
b94704adf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/insert-image
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-27 17:13:14 +03:00 |
|
|
|
267fe7d260
|
Merge pull request #105 from ONLYOFFICE/feature/favorite
Feature/favorite
|
2021-01-27 11:49:21 +03:00 |
|
|
|
9ee379e8df
|
ruby: setFavorite
|
2021-01-26 17:04:38 +03:00 |
|
|
|
8cf4eb2fc2
|
Merge branch 'develop' into feature/new-banner
|
2021-01-26 16:06:46 +03:00 |
|
|
|
eba3f15587
|
ruby: fix banner
|
2021-01-26 16:02:48 +03:00 |
|
|
|
3f52fd5563
|
ruby: insert-image
|
2021-01-26 15:41:33 +03:00 |
|
|
|
a76ec17e70
|
Add languages
|
2020-11-20 12:59:46 +03:00 |
|
