|
|
b417633c3f
|
csharp-mvc: add editorConfig.createUrl
|
2021-04-18 18:23:59 +03:00 |
|
|
|
5dedcedb60
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: bugfix window conversion
|
2021-04-16 10:38:26 +03:00 |
|
|
|
1f7b085455
|
csharp-mvc: add password for convert
|
2021-04-14 15:07:55 +03:00 |
|
|
|
d6db3cae2b
|
csharp-mvc: change api/convert method to post
|
2021-04-14 14:47:22 +03:00 |
|
|
|
f22c698cb6
|
csharp-mvc: fix onRequestEditRights
|
2021-04-11 19:45:26 +03:00 |
|
|
|
f788379eb5
|
csharp-mvc: permissions.edit add condition view
|
2021-04-11 19:44:37 +03:00 |
|
|
|
9d46cb6b4e
|
csharp-mvc: fix null user
|
2021-04-09 12:42:54 +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 |
|
|
|
578ecec9af
|
csharp-mvc: ext to lowercase
|
2021-03-29 18:28:52 +03:00 |
|
|
|
1fb48547ed
|
csharp: fix documentType
|
2021-03-25 22:10:44 +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 |
|
|
|
1baf3617b0
|
csharp-mvc: redesign window upload
|
2021-03-23 15:46:38 +03:00 |
|
|
|
367629d01f
|
csharp-mvc: added tooltips
|
2021-03-23 14:39:38 +03:00 |
|
|
|
76b4693a54
|
csharp-mvc: redesign
|
2021-03-23 14:28:09 +03:00 |
|
|
|
1ba0577521
|
csharp-mvc: added postfix -form isSubmitForm
|
2021-03-19 14:43:58 +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 |
|
|
|
2635306e2e
|
csharp-mvc: submit filled form
|
2021-02-19 14:59:59 +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 |
|
|
|
8442def83c
|
csharp-mvc: added dynamic favicon
|
2021-02-17 20:18:43 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
246ddc9f9c
|
csharp-mvc: download forcesaved file
|
2021-02-16 13:28:30 +03:00 |
|
|
|
733f798968
|
csharp-mvc: added forcesave
|
2021-02-15 17:26:16 +03:00 |
|
|
|
823374e2fe
|
csharp-mvc: request user name
|
2021-02-08 22:28:56 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +03:00 |
|
|
|
61c388a7af
|
csharp-mvc: reviewGroup instead reviewPermissions
|
2021-02-07 19:35:29 +03:00 |
|
|
|
c9ef51a361
|
csharp-mvc: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-06 20:20:38 +03:00 |
|
|
|
b76c532569
|
csharp-mvc: check filename from url
|
2021-02-05 13:29:08 +03:00 |
|
|
|
1e023e58b2
|
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
|
2021-02-04 18:39:50 +03:00 |
|
|
|
a213b635f2
|
csharp-mvc: changed path to sample
|
2021-02-04 17:05:40 +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 |
|
|
|
9d16bee672
|
csharp-mvc: improved GetFilesInfo
|
2021-02-03 12:42:00 +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 |
|
|
|
eb4e6b4bc0
|
csharp-mvc: added function download
|
2021-02-01 23:09:49 +03:00 |
|
|
|
c0f459132e
|
csharp-mvc: fix merge
|
2021-02-01 21:07:49 +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 |
|
|
|
a92907135d
|
csharp-mvc: fix GetServerUrl
|
2021-01-29 14:14:25 +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 |
|
|
|
d0edb368ac
|
csharp-mvc: fixed tabulation
|
2021-01-28 17:46:41 +03:00 |
|