|
|
578ecec9af
|
csharp-mvc: ext to lowercase
|
2021-03-29 18:28:52 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
61c388a7af
|
csharp-mvc: reviewGroup instead reviewPermissions
|
2021-02-07 19:35:29 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ac36df16d1
|
csharp-mvc: moved functions
|
2021-01-28 17:35:34 +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 |
|
|
|
c01afdec17
|
csharp-mvc: set favorite
|
2021-01-24 02:49:09 +03:00 |
|
|
|
a104aa6c61
|
csharp: add files.docservice.url.example
|
2021-01-22 11:47:53 +03:00 |
|
|
|
aa7132e467
|
csharp-mvc: fix-history
|
2021-01-20 22:31:01 +03:00 |
|
|
|
4e2a5fb175
|
csharp-mvc: reviewPermissions
|
2021-01-19 18:36:32 +03:00 |
|
|
|
7e2d83f04e
|
csharp-mvc: jwt for HistoryData
|
2020-12-06 13:28:13 +03:00 |
|
|
|
4193089de4
|
csharp-mvc: compare-file
|
2020-12-05 12:07:56 +03:00 |
|
|
|
7ced0591bd
|
csharp-mvc: insert-image
|
2020-12-04 18:19:54 +03:00 |
|
|
|
a010088395
|
csharp-mvc: fix mail-merge
|
2020-12-04 12:35:06 +03:00 |
|
|
|
ab68d95f5d
|
csharp-mvc: mail-merge
|
2020-12-02 19:22:20 +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 |
|
|
|
b0ea8ed388
|
csharp-mvc: get link to bookmark
|
2020-05-21 12:50:48 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
fddc08c24b
|
csharp: removed c#7 features
|
2020-03-03 11:40:00 +03:00 |
|
|
|
bd4c3543d7
|
csharp-mvc: blockcontent mode
|
2019-11-07 17:40:52 +03:00 |
|
|
|
5382c43ec5
|
csharp-mvc: document key
|
2019-09-10 12:50:43 +03:00 |
|
|
|
8af7c45e7d
|
csharp-mvc: version history
|
2019-09-10 12:50:24 +03:00 |
|
|
|
b93aeebe3c
|
csharp-mvc: different edit/view options
|
2019-09-09 18:21:35 +03:00 |
|
|
|
fe38ca4a08
|
csharp-mvc: user and lang selectors
|
2019-09-09 17:31:10 +03:00 |
|
|
|
96bfe3c58a
|
csharp-mvc: format
|
2019-09-02 15:02:18 +03:00 |
|
|
|
490a6cd8b6
|
csharp-mvc: jwt support
|
2019-08-28 16:30:01 +03:00 |
|
|
|
16473b4e06
|
2019
|
2019-01-22 18:17:07 +03:00 |
|
|
|
fa8e2cf975
|
[[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
|
2019-01-17 17:32:01 +03:00 |
|
|
|
20412f0c80
|
Update copyright and footer info to 2018 year
|
2018-03-01 12:41:44 +03:00 |
|
|
|
ba1358c116
|
Copyright
|
2017-06-26 16:29:01 +03:00 |
|
