|
|
c3774d8cb6
|
replace hiding portal-info block from js to templates
|
2021-10-06 15:14:45 +03:00 |
|
|
|
bee5e4724b
|
python: user tooltip layout
|
2021-09-29 10:55:27 +03:00 |
|
|
|
d6bddd86f3
|
python: remade detecting document type
|
2021-09-16 16:33:44 +03:00 |
|
|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
b979f667f2
|
python: new comments
|
2021-08-26 13:52:21 +03:00 |
|
|
|
b58f33dddf
|
file versions on index page fix
|
2021-07-09 16:32:12 +03:00 |
|
|
|
c52dbdde4e
|
python: adaptive layout
|
2021-06-29 15:28:41 +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 |
|
|
|
60992ecb38
|
variable users renamed to usersForMentions
|
2021-05-26 17:01:47 +03:00 |
|
|
|
25ccda7e89
|
python: add mentions
|
2021-05-21 10:15:20 +03:00 |
|
|
|
d0977de4ca
|
python: changed icons from png to svg
|
2021-05-17 16:30:25 +03:00 |
|
|
|
69c16e0441
|
python: add description for user rights
|
2021-04-27 00:56:45 +03:00 |
|
|
|
9ff5523631
|
python: add list users
|
2021-04-23 11:53:27 +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 |
|
|
|
fb38127ebc
|
python: add jwt for download files
|
2021-04-21 14:55:45 +03:00 |
|
|
|
6a1ecf8d0b
|
python: added comments for python example
|
2021-04-20 15:46:41 +03:00 |
|
|
|
6ea6e35d54
|
python: edit link only for editable format
|
2021-04-16 16:07:50 +03:00 |
|
|
|
a899483e5c
|
python: add password for convert
|
2021-04-14 15:40:23 +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 |
|
|
|
0645fba83d
|
python: redesign window upload
|
2021-03-25 10:58:56 +03:00 |
|
|
|
7dade2ff46
|
python: added tooltips
|
2021-03-24 21:17:27 +03:00 |
|
|
|
d2b5335de9
|
python: redesign
|
2021-03-24 21:09:35 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
353119145c
|
python: download forcesaved file
|
2021-02-16 14:59:04 +03:00 |
|
|
|
bcfa08b43c
|
python: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-05 18:36:58 +03:00 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fec328ad9d
|
python: setFavorite
|
2020-12-24 22:51:35 +03:00 |
|
|
|
c75f9166c5
|
python: compare-file
|
2020-11-26 18:30:27 +03:00 |
|
|
|
31337cc9c9
|
python: insert-image
|
2020-11-26 15:33:16 +03:00 |
|
|
|
6f6e80cf68
|
python: jwt for mailmerge
|
2020-11-26 00:14:12 +03:00 |
|
|
|
e8eb607325
|
python: fix-history
|
2020-11-19 12:17:04 +03:00 |
|
|
|
974840bbac
|
python: new banner
|
2020-11-18 18:26:53 +03:00 |
|
|
|
be5f6e3a6e
|
python: fix 4903c017f4
|
2020-11-18 18:14:59 +03:00 |
|
|
|
0cf0171721
|
fixed an issue when creating a second action link
|
2020-06-18 11:44:21 +03:00 |
|
|
|
b3a79deef8
|
python: get link to bookmark
|
2020-05-21 12:51:07 +03:00 |
|
|
|
4d538fc35d
|
python: footer copyright
|
2020-03-03 13:26:36 +03:00 |
|
|
|
8fa77cb9ba
|
python: copyrights & cleanup
|
2020-03-03 11:00:23 +03:00 |
|
|
|
1c59409ce2
|
python: blockcontent mode
|
2019-11-07 17:50:30 +03:00 |
|
|
|
6ba9b33606
|
python: version history
|
2019-11-05 17:51:22 +03:00 |
|
|
|
c1454eff13
|
python: document list
|
2019-11-01 10:58:20 +03:00 |
|
|
|
f7867e4bc3
|
python: document editing
|
2019-10-28 12:58:31 +03:00 |
|
|
|
f94e057492
|
python: upload, convert, create sample
|
2019-10-25 17:05:20 +03:00 |
|
