Commit Graph

55 Commits

Author SHA1 Message Date
01e0cefae5 ruby: deleting uid cookie 2022-12-01 10:46:31 +03:00
dbf1047f29 ruby: option to send directUrl 2022-12-01 10:46:23 +03:00
d2d98df5ab support ruby v.3 2022-09-01 16:56:38 +03:00
e041baeef7 Merge branch 'feature/extension-on-rename' into develop 2022-08-02 14:18:22 +03:00
089fc8bfa0 ruby: function created 2022-03-28 09:31:01 +03:00
c4c2fbb945 ruby: certificate was ignored 2022-03-23 14:25:53 +03:00
eb196613e7 format 2022-03-17 10:36:38 +03:00
a192c6ce1f ruby: refactoring 2022-03-15 18:45:35 +03:00
0e1a580a86 refactoring 2022-03-11 14:13:09 +03:00
8a04e5fbc4 ruby:meta command 2022-03-09 13:50:47 +03:00
507a7f3162 Ruby: Merge jwt prev + diff 2022-01-13 18:08:40 +03:00
096102fa59 Merge branch 'develop' into feature/jwtHistoryFiles 2021-12-22 17:13:10 +03:00
dac09bd1e1 jwt signature for prev.* files. Ruby (by redirection) 2021-12-14 19:26:56 +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
cf2f60f8cd ruby: docxf 2021-11-17 16:24:46 +03:00
2429668b57 ruby: add Copy File as... 2021-11-15 16:02:11 +03:00
11e8f40f8c ruby: fix embedded mode; fix media.css connect 2021-11-02 18:13:45 +03:00
a9e2df73ca add region(lang) param to convert 2021-10-15 13:50:15 +03:00
b2980b5749 fix downloadUrl for convert 2021-07-13 14:32:39 +03:00
2132798ee3 ruby: add list users 2021-04-23 17:11:52 +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
8d34ff2ed2 ruby: add jwt for download files 2021-04-21 15:54:21 +03:00
56a65a9f3e ruby: added comments 2021-04-20 17:33:48 +03:00
a85ea5c551 ruby: add password for convert 2021-04-14 18:13:09 +03:00
492b8b6c81 ruby: change api/convert method to post 2021-04-14 17:51:40 +03:00
abe807f288 Merge pull request #135 from ONLYOFFICE/feature/fix-filename
Feature/fix filename
2021-03-30 12:06:34 +03:00
bfa0984daf ruby: extname to downcase 2021-03-29 17:31:39 +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
8ca58370e9 ruby: redesign window upload 2021-03-25 16:31:48 +03:00
714b514f66 Copyright 2021 2021-03-15 11:54:47 +03:00
a2e59cf705 ruby: submit filled form 2021-02-19 15:01:32 +03:00
6a89a073fa ruby: download forcesaved file 2021-02-16 15:02:19 +03:00
f7f0a07239 ruby: added forcesave 2021-02-15 17:24:56 +03:00
ec90b2ff98 ruby: check filename from url 2021-02-05 13:40:13 +03:00
f9f757bd0d ruby: added templates submodule 2021-02-04 17:42:56 +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
2b217de9b4 ruby: get-file 2021-02-02 22:01:48 +03:00
6f64d40e5d ruby: get-files 2021-02-02 21:44:50 +03:00
9759839cd0 Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
2021-02-02 13:09:41 +03:00
bcd114d089 ruby: fix-history 2021-02-02 12:29:04 +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
48694f0f31 ruby: mailmerge 2021-02-01 12:33:23 +03:00
7bfa4229de ruby: add Rails.configuration.header 2021-01-29 12:35:10 +03:00
1c6c45606b ruby: add Rails.configuration.urlExample 2021-01-29 12:09:16 +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
ecbae22fcc ruby: get link to bookmark 2020-05-21 14:39:10 +03:00
c4fc8c85e2 ruby: 'render :text' deprecated since rails 5.1.0 2019-11-21 14:41:48 +03:00
60cb77136a ruby: version history 2019-09-25 18:50:11 +03:00
668a0e323a ruby: document list, different view/edit options 2019-09-25 14:46:30 +03:00