|
|
c89fa0e869
|
csharp: add password for convert
|
2021-04-14 14:46:30 +03:00 |
|
|
|
83395efc2b
|
csharp: change api/convert method to post
|
2021-04-14 13:26:52 +03:00 |
|
|
|
6eaa948d3a
|
csharp: permissions.edit add condition view
|
2021-04-11 19:43:44 +03:00 |
|
|
|
8a0a1d3a42
|
csharp: fix null user
|
2021-04-09 12:51:32 +03:00 |
|
|
|
5e6d45cfd0
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: changed min-height page
|
2021-04-05 18:02:21 +03:00 |
|
|
|
abe807f288
|
Merge pull request #135 from ONLYOFFICE/feature/fix-filename
Feature/fix filename
|
2021-03-30 12:06:34 +03:00 |
|
|
|
25804d0c0a
|
csharp: ext to lowercase
|
2021-03-29 18:16:53 +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 |
|
|
|
d4e984e6b3
|
nodejs, java, php, python, csharp, csharp-mvc, ruby: fix remove upload name
|
2021-03-25 21:24:04 +03:00 |
|
|
|
1dda4bbe5e
|
csharp: redesign window upload
|
2021-03-22 23:11:50 +03:00 |
|
|
|
899df4f39f
|
csharp: added tooltips
|
2021-03-22 21:17:33 +03:00 |
|
|
|
c416712ac3
|
csharp: redesign
|
2021-03-22 16:42:25 +03:00 |
|
|
|
3335a135a0
|
csharp: added postfix -form isSubmitForm
|
2021-03-19 14:34:25 +03:00 |
|
|
|
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 |
|
|
|
fe02c4914c
|
converting xml
|
2021-03-01 14:26:43 +03:00 |
|
|
|
f0cc80fd53
|
csharp: submit filled form
|
2021-02-19 14:59:36 +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 |
|
|
|
2cb91eb8d5
|
csharp: added dynamic favicon
|
2021-02-17 20:18:15 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
3e8b6aaffa
|
csharp: download forcesaved file
|
2021-02-16 13:28:14 +03:00 |
|
|
|
e04155e7ad
|
csharp: added forcesave
|
2021-02-15 17:27:29 +03:00 |
|
|
|
3b89aae808
|
csharp: request user name
|
2021-02-08 22:28:19 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +03:00 |
|
|
|
c6deb13712
|
csharp: reviewGroup instead reviewPermissions
|
2021-02-07 19:30:32 +03:00 |
|
|
|
212fd26807
|
csharp: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-06 20:36:55 +03:00 |
|
|
|
856613d644
|
csharp: check filename from url
|
2021-02-05 13:25:12 +03:00 |
|
|
|
1e023e58b2
|
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
|
2021-02-04 18:39:50 +03:00 |
|
|
|
96d6c521ef
|
csharp: changed path to sample
|
2021-02-04 16:56:28 +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 |
|
|
|
506b55a201
|
update submodule (csharp-mvc, csharp, php, java, nodejs, python)
|
2021-02-04 14:26:15 +03:00 |
|
|
|
90dd2c837f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
|
2021-02-04 11:00:08 +03:00 |
|
|
|
50921b278b
|
csharp: improved GetFilesInfo
|
2021-02-03 12:42:39 +03:00 |
|
|
|
f8f15d2191
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/get-files
# Conflicts:
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/urls.py
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/controllers/home_controller.rb
# web/documentserver-example/ruby/config/routes.rb
|
2021-02-02 22:12:21 +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 |
|
|
|
49592f66bf
|
Merge pull request #113 from ONLYOFFICE/feature/fix-history-cors
Feature/fix history cors
|
2021-02-02 11:13:40 +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 |
|
|
|
4f02a4957f
|
csharp: added function download
|
2021-02-01 23:05:25 +03:00 |
|
|
|
8b9a2d2481
|
csharp: fix merge
|
2021-02-01 23:02:15 +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 |
|
|
|
d667a62a24
|
csharp: fix GetServerUrl
|
2021-01-29 14:28:56 +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 |
|
|
|
979f001fd0
|
csharp: fixed tabulation
|
2021-01-28 17:47:48 +03:00 |
|
|
|
e845cc498b
|
csharp: moved functions
|
2021-01-28 17:34:45 +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 |
|
|
|
15580ee144
|
add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 14:48:44 +03:00 |
|
|
|
422bb36b53
|
delete logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 14:46:00 +03:00 |
|
