|
|
c679f7ddd3
|
csharp-mvc: add list users
|
2021-04-23 17:17:35 +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 |
|
|
|
a2116bf3f7
|
csharp-mvc: add jwt for download files
|
2021-04-21 12:42:22 +03:00 |
|
|
|
f2714cb554
|
csharp-mvs: added comments
|
2021-04-20 17:33:49 +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 |
|
|
|
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 |
|
|
|
1baf3617b0
|
csharp-mvc: redesign window upload
|
2021-03-23 15:46:38 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +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 |
|
|
|
b76c532569
|
csharp-mvc: check filename from url
|
2021-02-05 13:29:08 +03:00 |
|
|
|
a213b635f2
|
csharp-mvc: changed path to sample
|
2021-02-04 17:05:40 +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 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +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 |
|
|
|
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 |
|
|
|
b2ee170ecb
|
csharp: add files.docservice.header
|
2021-01-22 14:43:51 +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 |
|
|
|
14840847bf
|
csharp-mvc: get-file
|
2021-01-20 21:10:39 +03:00 |
|
|
|
06cf08822b
|
csharp-mvc: get-files
|
2021-01-20 17:50:46 +03:00 |
|
|
|
4193089de4
|
csharp-mvc: compare-file
|
2020-12-05 12:07:56 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4f21721901
|
change license to 2017
|
2017-01-18 10:46:50 +03:00 |
|
|
|
8c5cff604a
|
Document Service Integration
|
2016-03-23 12:55:12 +03:00 |
|
