|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
71e1b28f47
|
jwt signature for prev.* files C# (via handler)
|
2021-12-21 17:45:42 +03:00 |
|
|
|
95ea50210f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
|
2021-11-18 12:54:57 +03:00 |
|
|
|
ad9d627c82
|
csharp: docxf
|
2021-11-17 16:46:09 +03:00 |
|
|
|
8688ef1db5
|
Merge pull request #224 from ONLYOFFICE/feature/oform
Feature/oform
|
2021-11-17 13:01:49 +03:00 |
|
|
|
f1a64c92d2
|
csharp: oform
|
2021-11-17 10:47:50 +03:00 |
|
|
|
4418d8e5d5
|
csharp and csharp-mvc: fix error messages
|
2021-11-15 17:38:46 +03:00 |
|
|
|
605028151f
|
csharp: add Copy File as...
|
2021-11-15 17:00:04 +03:00 |
|
|
|
a597c37684
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/document-server-integration into feature/change-files-folder
|
2021-10-17 15:38:48 +03:00 |
|
|
|
a9e2df73ca
|
add region(lang) param to convert
|
2021-10-15 13:50:15 +03:00 |
|
|
|
35afb7a8fe
|
csharp: add ability to custom path for files storage
|
2021-10-15 13:12:58 +03:00 |
|
|
|
42859d7a28
|
Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop
|
2021-09-14 09:29:48 +03:00 |
|
|
|
7027970b65
|
support oxps
|
2021-09-14 09:29:19 +03:00 |
|
|
|
563e02a5ba
|
Merge pull request #175 from ONLYOFFICE/feature/converter-downloadUrl-fix
fix downloadUrl for convert
|
2021-07-13 15:05:56 +03:00 |
|
|
|
b2980b5749
|
fix downloadUrl for convert
|
2021-07-13 14:32:39 +03:00 |
|
|
|
b58f33dddf
|
file versions on index page fix
|
2021-07-09 16:32:12 +03:00 |
|
|
|
f908bba727
|
csharp: add list users
|
2021-04-23 17:39:41 +03:00 |
|
|
|
0997d2fef5
|
csharp: added comments
|
2021-04-20 17:33:48 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
1dda4bbe5e
|
csharp: redesign window upload
|
2021-03-22 23:11:50 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +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 |
|
|
|
e04155e7ad
|
csharp: added forcesave
|
2021-02-15 17:27:29 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +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 |
|
|
|
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 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
0e3c759806
|
csharp: get-file
|
2021-01-25 01:45:57 +03:00 |
|
|
|
6427db4ea6
|
csharp: get-files
|
2021-01-25 01:39:28 +03:00 |
|
|
|
d624cdf0f6
|
csharp: fix-history
|
2021-01-25 00:50:04 +03:00 |
|
|
|
db0339d4e4
|
csharp: add files.docservice.url.example
|
2021-01-24 22:10:19 +03:00 |
|
|
|
1a46b8a215
|
csharp: config-refactor
|
2021-01-24 16:41:07 +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 |
|
|
|
aa289a6d85
|
csharp: history folder on convert
|
2019-09-10 11:30:03 +03:00 |
|
|
|
1f022f12a1
|
csharp: version history
|
2019-09-09 15:28:32 +03:00 |
|
|
|
cd94eb0401
|
csharp: different edit/view options
|
2019-09-03 16:11:14 +03:00 |
|
|
|
0f549db065
|
csharp: format
|
2019-09-02 14:53:06 +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 |
|
|
|
fbb23a5872
|
recognize type of otf
|
2018-04-16 15:58:00 +03:00 |
|
