|
|
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 |
|
|
|
90dd2c837f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
|
2021-02-04 11:00:08 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
2748dbf5b3
|
csharp: fix tabulation
|
2021-01-28 11:28:24 +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 |
|
|
|
491f600dc0
|
csharp: added templates submodule
|
2021-01-25 12:22:42 +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 |
|
|
|
022f1bb16d
|
csharp: setFavorite
|
2021-01-24 15:41:45 +03:00 |
|
|
|
4dd4453599
|
csharp: jwt for HistoryData
|
2020-12-06 13:30:30 +03:00 |
|
|
|
aa5f1e3df4
|
csharp: compare-file
|
2020-12-05 12:22:35 +03:00 |
|
|
|
18a4dc20eb
|
csharp: insert-image
|
2020-12-04 19:03:02 +03:00 |
|
|
|
d5a6c1e605
|
csharp: fix mail-merge
|
2020-12-04 12:33:22 +03:00 |
|
|
|
301775aafd
|
csharp: mail-merge
|
2020-12-02 19:01:55 +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 |
|
|
|
220516c930
|
csharp: get link to bookmark
|
2020-05-18 16:31:16 +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 |
|
|
|
8770526316
|
csharp: blockcontent mode
|
2019-11-07 17:36:49 +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 |
|
|
|
31c23fbf49
|
csharp: user and lang selectors
|
2019-09-03 13:43:04 +03:00 |
|
|
|
95b4556884
|
csharp: create empty sample, new upload style
|
2019-09-03 11:54:37 +03:00 |
|
|
|
0f549db065
|
csharp: format
|
2019-09-02 14:53:06 +03:00 |
|
|
|
097a99b947
|
csharp: jwt support
|
2019-08-28 15:57:09 +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 |
|
|
|
680670294b
|
fileName is not the last parameter
|
2017-02-15 11:59:42 +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 |
|
