|
|
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 |
|
|
|
7f95d59394
|
java: fix jwtHeader
|
2021-01-29 12:38:23 +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 |
|
|
|
15580ee144
|
add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 14:48:44 +03:00 |
|
|
|
422bb36b53
|
delete logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 14:46:00 +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 |
|
|
|
c28e12e31e
|
add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 10:32:04 +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 |
|
|
|
1fc1fb2b76
|
Merge pull request #106 from ONLYOFFICE/feature/add-format
Feature/add format
|
2021-01-27 11:51:38 +03:00 |
|
|
|
267fe7d260
|
Merge pull request #105 from ONLYOFFICE/feature/favorite
Feature/favorite
|
2021-01-27 11:49:21 +03:00 |
|
|
|
8cf4eb2fc2
|
Merge branch 'develop' into feature/new-banner
|
2021-01-26 16:06:46 +03:00 |
|
|
|
0b03093c53
|
java: setFavorite
|
2020-12-24 22:49:22 +03:00 |
|
|
|
502f001cfa
|
Merge branch 'feature/csharp' into feature/add-format
|
2020-11-27 17:02:04 +03:00 |
|
|
|
aa16df8de7
|
java: fix filename (38cc631e2e)
|
2020-11-27 15:25:47 +03:00 |
|
|
|
e08e6f5f27
|
java: jwt for compare-file
|
2020-11-27 11:34:10 +03:00 |
|
|
|
38cc631e2e
|
java: compare-file
|
2020-11-27 11:31:13 +03:00 |
|
|
|
eb8cf75bc0
|
java: jwt for insert-image
|
2020-11-26 17:23:21 +03:00 |
|
|
|
17cad4a0dc
|
java: insert-image
|
2020-11-26 14:54:09 +03:00 |
|
|
|
ea22efdac8
|
java: fix 773aa62478
|
2020-11-24 22:24:19 +03:00 |
|
|
|
773aa62478
|
java: add files.docservice.url.example
|
2020-11-23 17:22:02 +03:00 |
|
|
|
fd95aca32b
|
java: config-refactor
|
2020-11-23 10:42:32 +03:00 |
|
|
|
a76ec17e70
|
Add languages
|
2020-11-20 12:59:46 +03:00 |
|
|
|
9f806aa48a
|
java: fix banner
|
2020-11-19 17:48:51 +03:00 |
|
|
|
85dd8f8b77
|
java: add fb2 to ConverExtList
|
2020-11-19 17:18:13 +03:00 |
|
|
|
ddb31bd4e8
|
fixed license comment 8050ec572a
|
2020-11-10 17:10:43 +03:00 |
|
|
|
17f651c47a
|
java: new banner
|
2020-11-06 11:29:47 +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 |
|
|
|
0cf0171721
|
fixed an issue when creating a second action link
|
2020-06-18 11:44:21 +03:00 |
|
|
|
c4f278d58a
|
java: get link to bookmark
|
2020-05-21 12:51:07 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
1bde1f66d3
|
change name
|
2020-03-03 11:55:24 +03:00 |
|
|
|
710d4f4059
|
Fixed displaying mobile version cb5324381e
|
2019-12-13 13:20:39 +03:00 |
|
|
|
51ecf3afeb
|
java: blockcontent mode
|
2019-11-07 17:23:29 +03:00 |
|
|
|
6ab006e409
|
changed favicon
|
2019-11-06 10:29:09 +03:00 |
|
|
|
582ed3f61b
|
changed logo
|
2019-11-06 10:28:24 +03:00 |
|
|
|
b9dd792672
|
[all] Rename
Rename web-apps-pro -> web-apps
|
2019-10-24 12:27:30 +03:00 |
|
|
|
13c3164ca1
|
java: header null ref error
|
2019-10-23 13:22:14 +03:00 |
|
|
|
48043e5d70
|
[all] Rename
Rename web-apps -> web-apps-pro
|
2019-10-18 15:41:55 +03:00 |
|
|
|
9b6e90718a
|
java: version history
|
2019-09-18 17:41:11 +03:00 |
|
|
|
14f8419f00
|
java: different edit/view options
|
2019-09-12 14:19:08 +03:00 |
|
|
|
0899644f32
|
java: user and lang selectors
|
2019-09-12 11:12:01 +03:00 |
|
|
|
036c0fb19a
|
java: create empty sample, new upload style
|
2019-09-10 16:42:28 +03:00 |
|
|
|
71103b802e
|
java: send jwt token in body
|
2019-02-21 14:27:59 +03:00 |
|
|
|
a945870c6a
|
java: jwt in headers
|
2019-02-20 14:55:35 +03:00 |
|
|
|
cafaa27e92
|
java: json passed to docserver contained escaped parameters
|
2019-02-20 14:50:38 +03:00 |
|
|
|
16473b4e06
|
2019
|
2019-01-22 18:17:07 +03:00 |
|
|
|
30d26df97d
|
Merge remote-tracking branch 'remotes/origin/hotfix/v5.2.8' into develop
|
2019-01-22 09:28:29 +03:00 |
|
|
|
9fb0289af4
|
onAppReady (Fixed #54)
|
2019-01-22 09:23:29 +03:00 |
|
|
|
fa8e2cf975
|
[[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
|
2019-01-17 17:32:01 +03:00 |
|
