|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
988e336f43
|
forcesave is disabled by default (b541936473)
|
2021-03-05 11:20:12 +03:00 |
|
|
|
1cf5b1eea5
|
php: submit filled form
|
2021-02-19 15:00:17 +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 |
|
|
|
c5b67b4b00
|
php: added dynamic favicon
|
2021-02-17 20:19:30 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
0aaaedc4d6
|
php: download forcesaved file
|
2021-02-16 14:14:08 +03:00 |
|
|
|
d8afda9b56
|
php: added forcesave
|
2021-02-15 15:29:25 +03:00 |
|
|
|
cc488187b4
|
php: request user name
|
2021-02-08 22:27:14 +03:00 |
|
|
|
13250e18b3
|
php: reviewGroup instead reviewPermissions
|
2021-02-07 19:21:41 +03:00 |
|
|
|
1e023e58b2
|
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
|
2021-02-04 18:39:50 +03:00 |
|
|
|
7d2469cfe9
|
php: changed path to sample
|
2021-02-04 16:36:17 +03:00 |
|
|
|
5fdbd2954b
|
uploaded instead created
|
2021-02-04 16:06:40 +03:00 |
|
|
|
758291fd71
|
owner instead author
|
2021-02-04 15:43:09 +03:00 |
|
|
|
90dd2c837f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
|
2021-02-04 11:00:08 +03:00 |
|
|
|
620a097faa
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
|
2021-02-02 13:59:17 +03:00 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
e6ee57e09b
|
php: fix tabulation
|
2021-02-02 12:53:56 +03:00 |
|
|
|
4dd5f9d9f6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/add-jwt
# Conflicts:
# web/documentserver-example/python/src/utils/historyManager.py
|
2021-02-02 11:02:53 +03:00 |
|
|
|
a5929897ad
|
php: fix merge
|
2021-02-01 22:59:17 +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 |
|
|
|
bb19ea1a6f
|
рhp: fix serverPath
|
2021-01-29 14:41:02 +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 |
|
|
|
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 |
|
|
|
1a7fbe656b
|
php: added templates submodule
|
2021-01-16 20:36:14 +03:00 |
|
|
|
b197f4c258
|
php: setFavorite
|
2020-12-24 22:50:28 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
6250902a55
|
php: jwt for compare-file
|
2020-11-27 11:00:16 +03:00 |
|
|
|
7b017c15f8
|
php: compare-file
|
2020-11-27 10:57:50 +03:00 |
|
|
|
62060d2538
|
php: jwt for insert-image
|
2020-11-26 17:20:57 +03:00 |
|
|
|
2368354c6d
|
php: insert-image
|
2020-11-26 16:10:09 +03:00 |
|
|
|
48fa83b850
|
php: jwt for mailmerge
|
2020-11-26 01:16:33 +03:00 |
|
|
|
ca5ba06506
|
php: jwt for historyData
|
2020-11-25 18:47:12 +03:00 |
|
|
|
c0b520e440
|
php: config-refactor
|
2020-11-23 11:00:57 +03:00 |
|
|
|
9b7d54fdfb
|
php: mailmerge
|
2020-11-16 15:45:28 +03:00 |
|
|
|
ee077978b9
|
php: fix-history
|
2020-11-13 14:32:14 +03:00 |
|
|
|
cf4dd454f6
|
php: reviewPermission
|
2020-11-13 11:43:10 +03:00 |
|
|
|
5e852e024d
|
Merge branch 'hotfix/apache' into develop
# Conflicts:
# 3rd-Party.txt
# licences/3rd-Party.txt
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/java/src/main/webapp/index.jsp
# web/documentserver-example/js/LICENSE.txt
# web/documentserver-example/js/OnlineEditorsExampleJS.html
# web/documentserver-example/nodejs/licenses/formidable.license
# web/documentserver-example/nodejs/licenses/jsonwebtoken.license
# web/documentserver-example/nodejs/licenses/mime.license
# web/documentserver-example/nodejs/licenses/urllib.license
# web/documentserver-example/php/LICENSE.txt
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/functions.php
# web/documentserver-example/php/index.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/ruby/LICENSE.txt
# web/documentserver-example/ruby/app/assets/javascripts/jscript.js
# web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
# web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
# web/welcome/index.html
|
2020-09-04 09:59:10 +03:00 |
|
|
|
8050ec572a
|
apache
|
2020-09-02 12:06:52 +03:00 |
|
|
|
0cf0171721
|
fixed an issue when creating a second action link
|
2020-06-18 11:44:21 +03:00 |
|
|
|
b3a96f15ab
|
php: get link to bookmark
|
2020-05-18 14:19:25 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
1bde1f66d3
|
change name
|
2020-03-03 11:55:24 +03:00 |
|
|
|
710d4f4059
|
Fixed displaying mobile version cb5324381e
|
2019-12-13 13:20:39 +03:00 |
|
|
|
7ab292bc13
|
php: blockcontent mode
|
2019-11-07 16:41:16 +03:00 |
|
|
|
f639971861
|
object.assign is not available on IE
|
2019-09-26 15:21:09 +03:00 |
|
|
|
a60e7b9b6b
|
php: comment, fillforms, filter modes
|
2019-09-25 15:17:33 +03:00 |
|
