|
|
422bb36b53
|
delete logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby
|
2021-01-28 14:46:00 +03:00 |
|
|
|
ee23e7948e
|
ruby: jwt for insert-image
|
2021-01-28 11:13:10 +03:00 |
|
|
|
badcd6e110
|
ruby: fix merge
|
2021-01-28 10:50:24 +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 |
|
|
|
267fe7d260
|
Merge pull request #105 from ONLYOFFICE/feature/favorite
Feature/favorite
|
2021-01-27 11:49:21 +03:00 |
|
|
|
9ee379e8df
|
ruby: setFavorite
|
2021-01-26 17:04:38 +03:00 |
|
|
|
8cf4eb2fc2
|
Merge branch 'develop' into feature/new-banner
|
2021-01-26 16:06:46 +03:00 |
|
|
|
eba3f15587
|
ruby: fix banner
|
2021-01-26 16:02:48 +03:00 |
|
|
|
3f52fd5563
|
ruby: insert-image
|
2021-01-26 15:41:33 +03:00 |
|
|
|
848229f79c
|
ruby: new banner
|
2021-01-26 13:22:17 +03:00 |
|
|
|
a76ec17e70
|
Add languages
|
2020-11-20 12:59:46 +03:00 |
|
|
|
951f5f9887
|
corrected comments syntax
|
2020-10-02 14:23:32 +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 |
|
|
|
ecbae22fcc
|
ruby: get link to bookmark
|
2020-05-21 14:39:10 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
1bde1f66d3
|
change name
|
2020-03-03 11:55:24 +03:00 |
|
|
|
be25001479
|
Fixed displaying mobile version cb5324381e
|
2019-12-13 13:09:28 +03:00 |
|
|
|
c4fc8c85e2
|
ruby: 'render :text' deprecated since rails 5.1.0
|
2019-11-21 14:41:48 +03:00 |
|
|
|
007efef742
|
ruby: rails manifest.js
|
2019-11-21 14:40:53 +03:00 |
|
|
|
8887edefb3
|
ruby: blockcontent mode
|
2019-11-07 17:09:08 +03:00 |
|
|
|
6ab006e409
|
changed favicon
|
2019-11-06 10:29:09 +03:00 |
|
|
|
582ed3f61b
|
changed logo
|
2019-11-06 10:28:24 +03:00 |
|
|
|
60cb77136a
|
ruby: version history
|
2019-09-25 18:50:11 +03:00 |
|
|
|
d1d7d1e416
|
ruby: unique document key for each version
|
2019-09-25 17:05:32 +03:00 |
|
|
|
668a0e323a
|
ruby: document list, different view/edit options
|
2019-09-25 14:46:30 +03:00 |
|
|
|
057d38d063
|
ruby: body overflow style issue
|
2019-09-25 14:08:25 +03:00 |
|
|
|
1ecf16085e
|
ruby: jwt support
|
2019-09-25 11:54:16 +03:00 |
|
|
|
945c09f5d4
|
ruby: send POST instead of GET on convert request
|
2019-09-25 11:53:01 +03:00 |
|
|
|
b642053bc3
|
ruby: user and lang selectors
|
2019-09-25 11:52:12 +03:00 |
|
|
|
fef0179c7e
|
ruby: create empty sample, new upload style
|
2019-09-25 09:54:18 +03:00 |
|
|
|
16473b4e06
|
2019
|
2019-01-22 18:17:07 +03:00 |
|
|
|
9fb0289af4
|
onAppReady (Fixed #54)
|
2019-01-22 09:23:29 +03:00 |
|
|
|
b1352bd897
|
remove unusing code
|
2018-03-29 11:52:01 +03:00 |
|
|
|
d8e1d4d6b7
|
Merge pull request #44 from ONLYOFFICE/feature/otf
Feature/otf
|
2018-03-28 16:36:50 +03:00 |
|
|
|
6d1bda75b9
|
recognize type of otf
|
2018-03-27 10:41:35 +03:00 |
|
|
|
20412f0c80
|
Update copyright and footer info to 2018 year
|
2018-03-01 12:41:44 +03:00 |
|
|
|
fb1715eebc
|
Document Editors (#39)
* Document Editors
* Update OnlineEditorsExampleJS.html
|
2017-10-31 19:05:29 +03:00 |
|
|
|
ebd309dabc
|
ruby: remove storage service
|
2017-10-09 17:29:09 +03:00 |
|
|
|
d143e3c80d
|
ruby: json response
|
2017-10-09 16:24:09 +03:00 |
|
|
|
56d6388603
|
ruby: change track event
|
2017-10-09 15:47:21 +03:00 |
|
|
|
16d942a487
|
support OpenDocument Flat Document file type
|
2017-09-26 13:24:34 +03:00 |
|
|
|
8a7193a645
|
support template formats
|
2017-09-07 15:52:47 +03:00 |
|
|
|
74537582d7
|
support -m formats
|
2017-08-04 17:39:02 +03:00 |
|
|
|
ba1358c116
|
Copyright
|
2017-06-26 16:29:01 +03:00 |
|
|
|
d83c103a31
|
update favicon.ico
|
2017-02-17 15:22:16 +03:00 |
|
|
|
680670294b
|
fileName is not the last parameter
|
2017-02-15 11:59:42 +03:00 |
|
|
|
63cea1cecb
|
Fix Bug 33279 - add onOutdatedVersion event
|
2017-02-09 18:58:45 +03:00 |
|
