1ac382d3c0
java-spring: https
2023-02-10 10:39:03 +03:00
5933aa83ad
Merge remote-tracking branch 'remotes/origin/master' into develop
2023-02-09 12:27:46 +05:00
2e1854f6c1
Merge pull request #342 from ONLYOFFICE/fix/actions-on
...
fix: remove on develop pull request
2023-02-09 10:27:10 +03:00
2d9a7ed502
fix: remove on develop pull request
2023-02-09 11:49:50 +05:00
78bd037486
Merge pull request #340 from ONLYOFFICE/refactor/linter-formatting
...
Refactor/linter formatting
2023-02-09 09:31:32 +03:00
17beef45f4
php: linter to changelog
2023-02-09 11:30:13 +05:00
b11a1be481
php: PSR1.Files.SideEffects disabled in ruleset.xml
2023-02-09 09:16:46 +03:00
a3e140981d
php: correct license type
2023-02-08 22:53:48 +05:00
e0386f7cf9
php: added licenses of new dependency (PHP_CodeSniffer)
2023-02-03 17:25:17 +03:00
0521f20413
php: deleted unused ruleset (uses - ruleset.xml)
2023-02-03 17:23:02 +03:00
61b5746ddf
php: deleted dependency: cs-fixer
2023-02-03 17:17:40 +03:00
57d823acb1
Merge branch 'develop' into refactor/linter-formatting
2023-02-03 14:47:29 +03:00
4d99e2e406
php: example namespace for class User (users.php) added
2023-02-03 12:01:22 +03:00
bec48ed834
php: spaces in "mixed"-php files auto-fixed
2023-02-03 11:17:45 +03:00
e856f5bcb1
php: fixed spaces and new lines for multi-line functions
2023-02-03 11:06:05 +03:00
c57a710bca
Merge pull request #339 from ONLYOFFICE/fix/phpcs-ruleset
...
ci: custom ruleset
2023-02-03 09:09:39 +03:00
248e9213a1
ci: custom ruleset
2023-02-03 11:06:55 +05:00
a035adcbd9
php: function names converted to camelCase (exclude mime_content_type)
2023-02-02 17:23:42 +03:00
7fd1b65fec
php: fixed doc comments and multi-line assignments
2023-02-02 16:48:58 +03:00
8ee0aa45b9
php: line exceeds maximum limit of 120 characters
2023-02-02 15:28:05 +03:00
dfcf244dc8
php: comments for functions are standardized to PEAR Docblock Comment standards
2023-02-02 14:14:57 +03:00
0563795494
php: spaces and new lines around operators fixed
2023-02-02 11:27:14 +03:00
b6b6e80ffb
php: no additional blank lines at end of doc comment
2023-02-02 10:53:15 +03:00
bd3b91d02f
php: include/require and file path should be divided with a single space
2023-02-02 10:34:58 +03:00
555f8d43cd
php: braces after functions and oop constructs on the next line
2023-02-01 16:46:31 +03:00
3f48a8d492
php: trailing whitespace at the end of blank line removed
2023-02-01 15:57:27 +03:00
bb921e7eff
php: method argument spaces normalized
2023-02-01 14:48:48 +03:00
13d5e6fa94
php: binary operators should be surrounded by single space
2023-02-01 14:12:28 +03:00
cbfcf5de96
php: no spaces after function name
2023-02-01 14:06:41 +03:00
4771d96819
php: unary operators should be placed adjacent to their operands
2023-02-01 13:47:04 +03:00
d2aa6f0653
php: used null coalescing operator ?? where possible
2023-02-01 13:44:26 +03:00
cf2a00a374
php: used operator ?: where possible
2023-02-01 13:39:40 +03:00
bdfb75dc84
php: standardized spaces around ternary operator
2023-02-01 13:37:03 +03:00
9e21ca625c
Merge pull request #334 from ONLYOFFICE/feature/token-and-address-required-on-download
...
Feature/token and address required on download
2023-02-01 12:59:22 +03:00
02def07f23
php: require user address on download
2023-02-01 14:30:54 +05:00
fc4dac6c4b
java-spring: token and user address required on download
2023-02-01 14:29:52 +05:00
486a09f3b2
java: token and address required on download
2023-02-01 14:28:28 +05:00
9a22fc854b
csharp-mvc: user address required on download
2023-02-01 14:27:32 +05:00
ac4d5561a2
c-sharp: user address required on download
2023-02-01 14:26:37 +05:00
98cdda06c4
ruby: user address required on download
2023-02-01 14:25:24 +05:00
744fccf913
python: user address required on download
2023-02-01 14:24:34 +05:00
349ff5d61d
php: all classes must be final, except abstract ones and doctrine entities
2023-02-01 11:22:29 +03:00
dbba22df23
php: array_push() converted to short usage
2023-02-01 09:21:35 +03:00
2ddd822b24
php: replace non multibyte-safe functions with corresponding mb function
2023-02-01 09:09:58 +03:00
6b4d6baf4b
php: short scalar cast
2023-01-31 17:29:58 +03:00
2c8d151cc7
php: there must be no trailing spaces inside comment or PHPDoc
2023-01-31 17:10:22 +03:00
60c7c025a3
Merge remote-tracking branch 'remotes/origin/hotfix/v7.3.1' into develop
2023-01-31 18:44:33 +05:00
7aaf5243cb
Merge pull request #337 from ONLYOFFICE/feature/add-oform-parameter
...
nodejs: disable oform module
2023-01-31 16:15:43 +03:00
44b0f4d53d
php: There must not be a space after the opening parenthesis
2023-01-31 16:05:35 +03:00
b765d43612
nodejs: disable oform module
2023-01-31 18:01:46 +05:00
70b63636e3
php: there must not be spaces around offset brace
2023-01-31 16:00:00 +03:00
8d4582e379
php: each statement must be indented
2023-01-31 15:54:07 +03:00
a1ec2cf366
php: remove trailing whitespace at the end of non-blank lines
2023-01-31 15:46:55 +03:00
4907e9d3c8
php: header comment needed
2023-01-31 15:43:37 +03:00
88f3d6da59
php: closing ?> tag must be omitted from files containing only PHP
2023-01-31 15:20:22 +03:00
481b111cb2
php: multi-line arrays must have a trailing comma
2023-01-31 15:14:01 +03:00
a1e13f3315
php: visibility must be declared on all methods
2023-01-31 14:58:18 +03:00
d1dd289c77
php: replace control structure alternative syntax to use braces
2023-01-31 14:52:04 +03:00
7b4e40c4e4
php: keyword elseif should be used instead of else if
2023-01-31 12:56:57 +03:00
6d4cad2215
php: curly opening braces after control structures and oop-structures on the same line
2023-01-31 12:31:33 +03:00
f43a4471ef
php: whitespace after each comma in array declaration
2023-01-31 11:42:13 +03:00
0cf90e86c7
php: trim array spaces
2023-01-31 11:32:59 +03:00
406de99b01
php: single space or none should be between cast and variable
2023-01-31 10:30:26 +03:00
f4bcb15d33
php: each element of an array must be indented exactly once
2023-01-31 10:17:54 +03:00
d2a0164738
Merge branch 'refactor/linter-formatting' of https://github.com/ONLYOFFICE/document-server-integration into refactor/linter-formatting
2023-01-31 10:02:56 +03:00
a49ef4cc13
php: lower case for constants "true", "false" and "null"
2023-01-31 09:59:37 +03:00
3ca29cd402
Merge branch 'feature/deploy' into develop
2023-01-31 00:48:16 +05:00
c398b30e33
build: exclude packages from csharp examples
2023-01-31 00:45:02 +05:00
8caea9fab0
java: fix dockerfile path
2023-01-31 00:45:02 +05:00
f44c62540c
php: lower case for constants "true", "false" and "null"
2023-01-30 17:33:48 +03:00
7644db80e3
php: no multiple statements per line
2023-01-30 17:26:31 +03:00
880497cd01
php: curly opening braces on the same line
2023-01-30 17:18:37 +03:00
34f8174d9d
php: no mixed "print" and "echo"
2023-01-30 17:02:09 +03:00
99bc9d3fdf
php: useless "else" deleted
2023-01-30 16:36:58 +03:00
165c292ab8
php: extra blank lines deleted
2023-01-30 16:26:04 +03:00
8fe41cd8e6
php: used short syntax for arrays
2023-01-30 15:23:00 +03:00
705ea097e2
php: used PSR-2 standart for linter
2023-01-30 14:56:32 +03:00
f4799bebb4
php: added needed dependencies
2023-01-30 14:42:05 +03:00
4ffa524de0
Merge pull request #336 from ONLYOFFICE/bugfix/java-dockerfile
...
java: fix dockerfile path
2023-01-30 13:16:21 +03:00
cd055317e0
java: fix dockerfile path
2023-01-30 09:46:27 +00:00
b1941c5980
Merge branch 'develop' of https://github.com/ONLYOFFICE/document-server-integration into develop
2023-01-30 08:58:52 +03:00
83bc0fed5e
Merge remote-tracking branch 'remotes/origin/master' into develop
2023-01-27 18:54:25 +05:00
8b71bb0433
Merge pull request #335 from ONLYOFFICE/release/1.5.0
...
Release/1.5.0
2023-01-27 13:48:34 +03:00
5620f49f8f
Merge pull request #321 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/loofah-2.19.1
...
build(deps): bump loofah from 2.19.0 to 2.19.1 in /web/documentserver-example/ruby
2023-01-27 11:53:41 +03:00
d9fefef834
Merge branch 'develop' into dependabot/bundler/web/documentserver-example/ruby/loofah-2.19.1
2023-01-27 10:40:40 +03:00
37591d847c
Merge pull request #323 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/rails-html-sanitizer-1.4.4
...
build(deps): bump rails-html-sanitizer from 1.4.3 to 1.4.4 in /web/documentserver-example/ruby
2023-01-26 17:36:27 +03:00
77290d88f3
build(deps): bump rails-html-sanitizer
...
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases )
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4 )
---
updated-dependencies:
- dependency-name: rails-html-sanitizer
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-26 19:35:36 +05:00
6befd87761
Merge pull request #330 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/rack-2.2.6.2
...
build(deps): bump rack from 2.2.4 to 2.2.6.2 in /web/documentserver-example/ruby
2023-01-26 17:13:57 +03:00
f3e270c1ad
Merge pull request #332 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/globalid-1.0.1
...
build(deps): bump globalid from 1.0.0 to 1.0.1 in /web/documentserver-example/ruby
2023-01-26 17:13:11 +03:00
f5f1e4b391
Merge pull request #333 from ONLYOFFICE/bugfix/saving-file
...
Bugfix/saving file
2023-01-26 15:20:30 +03:00
8ba389d02f
Merge pull request #328 from ONLYOFFICE/bugfix/php-example-warnings
...
php: empty GET parameters warnings fixed
2023-01-25 22:33:06 +03:00
45910ff1f3
php: empty GET parameters warnings fixed
...
Empty GET-parameters "user", "directUrl", "fileUrl", "fileExt" no longer give a warning, the example can work without them.
2023-01-26 00:11:03 +05:00
3bd6f51edc
1.5.0
2023-01-24 00:55:41 +05:00
fe9791f03d
Merge pull request #320 from ONLYOFFICE/feature/putRelativeFile
...
Feature/put relative file
2023-01-22 11:57:22 +03:00
531137dca4
nodejs: log X-WOPI-FileConversion header
2023-01-22 13:57:01 +05:00
e267b30b26
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.3.0
2023-01-22 13:14:39 +05:00
8733baa04b
Merge pull request #327 from ONLYOFFICE/dependabot/npm_and_yarn/web/documentserver-example/nodejs/jsonwebtoken-9.0.0
...
build(deps): bump jsonwebtoken from 8.5.1 to 9.0.0 in /web/documentserver-example/nodejs
2023-01-22 11:11:08 +03:00
8cec9fc465
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.3.0
2023-01-22 12:57:46 +05:00
7ec969f4d9
ruby: check file availability when saving
2023-01-22 12:51:46 +05:00
c7e13ef8a8
python: check file availability when saving
2023-01-22 12:51:46 +05:00
3d488f89b2
java: check file availability when saving
2023-01-22 12:50:30 +05:00
cc00af1510
java-spring: check file availability when saving
2023-01-22 12:23:07 +05:00
f8aa55143c
csharp: check file availability when saving
2023-01-22 02:16:20 +05:00
1b44c04893
csharp-mvc: check file availability when saving
2023-01-22 02:16:20 +05:00
1585d1821e
Merge pull request #325 from ONLYOFFICE/refactor/java-linter
...
Refactor/java linter
2023-01-22 00:01:26 +03:00
e996c4d265
Merge remote-tracking branch 'remotes/origin/develop' into refactor/java-linter
...
# Conflicts:
# web/documentserver-example/java/src/main/java/entities/CommentGroups.java
# web/documentserver-example/java/src/main/java/helpers/TrackManager.java
2023-01-22 01:59:44 +05:00
cc0c6189bd
Merge pull request #324 from ONLYOFFICE/refactor/java-spring-linter
...
Refactor/java spring linter
2023-01-21 23:47:25 +03:00
ef7662c069
java-spring: Header formatting
2023-01-22 01:46:01 +05:00
79ff84a4cc
Merge remote-tracking branch 'remotes/origin/develop' into refactor/java-spring-linter
...
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Template.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/FileStorageMutator.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/FileStoragePathBuilder.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/Misc.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/SSLUtils.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesHistory.java
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ChangesUser.java
2023-01-22 01:40:46 +05:00
e4bab17b08
Merge pull request #326 from ONLYOFFICE/fix/java-spring-example-link
...
Java Spring example fix in Readme
2023-01-21 23:20:53 +03:00
c734f5dd69
Merge pull request #322 from ONLYOFFICE/feature/remove-parsing-url
...
Feature/remove parsing url
2023-01-21 22:14:07 +03:00
d79feca18c
remove parsing url for getting ext
2023-01-22 00:11:47 +05:00
3181c7449d
Copyright 2023
2023-01-20 15:27:03 +05:00
8ea2edefb9
python: apache ( 8050ec572a)
2023-01-20 15:25:28 +05:00
1a51759154
build(deps): bump globalid in /web/documentserver-example/ruby
...
Bumps [globalid](https://github.com/rails/globalid ) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/rails/globalid/releases )
- [Commits](https://github.com/rails/globalid/compare/v1.0.0...v1.0.1 )
---
updated-dependencies:
- dependency-name: globalid
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 23:00:11 +00:00
77c4caa26f
Merge branch 'feature/referenceData' into release/v7.3.0
...
# Conflicts:
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
2023-01-19 10:27:07 +05:00
5944e41cb4
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.3.0
2023-01-19 10:26:40 +05:00
09ccde3f84
nodejs: token in referenceData
2023-01-19 10:25:28 +05:00
b27e532a83
nodejs: referenceData
2023-01-19 10:15:41 +05:00
e9632eb5e2
nodejs: fileType in empty history ( a7db14811f)
2023-01-19 10:03:31 +05:00
8807328180
build(deps): bump rack in /web/documentserver-example/ruby
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.4 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.2.4...v2.2.6.2 )
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-19 01:22:30 +00:00
827e96c506
Merge branch 'develop' into release/v7.3.0
2023-01-17 13:45:43 +05:00
491cbbc843
nodejs: require token on download
2023-01-17 13:45:29 +05:00
68d26c9c66
Merge branch 'release/v7.3.0' into feature/putRelativeFile
2023-01-14 12:26:35 +05:00
80924be536
Merge branch 'develop' into release/v7.3.0
2023-01-14 12:25:50 +05:00
0ca829181c
nodejs: convert icon
...
# Conflicts:
# web/documentserver-example/nodejs/views/wopiIndex.ejs
2023-01-14 12:24:53 +05:00
64f085d4b7
build(deps): bump jsonwebtoken in /web/documentserver-example/nodejs
...
Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken ) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases )
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md )
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0 )
---
updated-dependencies:
- dependency-name: jsonwebtoken
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-01-11 03:15:32 +00:00
39c2267468
fixed commands for Java Spring example
2023-01-09 18:22:57 +03:00
22af4e097f
java: MissingJavadocMethod suppress
2022-12-22 11:22:15 +03:00
1a1cde0f67
java: JavadocVariable suppress
2022-12-22 11:21:14 +03:00
1265ecdee1
java-spring: removed constant EXT_LENGTH_PART
2022-12-22 11:18:18 +03:00
19d11a97f9
java-spring: MissingJavadocMethod suppress
2022-12-22 11:15:58 +03:00
bf6f3373a6
java-spring: JavadocVariable suppress
2022-12-22 11:14:51 +03:00
1fb4d759a3
java-spring: JavadocPackage suppress
2022-12-22 10:49:28 +03:00
de33efa599
java: suppress JavadocPackage
2022-12-22 10:25:00 +03:00
6fa150ade6
java-spring: LineLength formatting
2022-12-22 09:49:09 +03:00
88f4b6327d
java-spring: changing LineLength rules
2022-12-22 01:45:17 +03:00
82905fca6c
java: LineLength formatting
2022-12-22 01:39:33 +03:00
ccb67ad73d
java: changing fileExtensions rules
...
Max length lines is 120
2022-12-21 17:30:38 +03:00
5a233b8dc7
Revert "java: adding check files by ext"
...
This reverts commit 8924304bdb .
2022-12-21 17:00:40 +03:00
127183bb16
java: Header formatting
2022-12-21 16:55:10 +03:00
8924304bdb
java: adding check files by ext
2022-12-21 16:51:09 +03:00
68dd1fc369
java: filling onlyoffice.header
2022-12-21 16:49:47 +03:00
7251cb1681
java: enable Header rule with template
2022-12-21 16:41:47 +03:00
a82e4b6bdf
java: AvoidStarImport formatting
2022-12-21 16:36:32 +03:00
d2f2031fa7
java: HideUtilityClassConstructor formatting
2022-12-21 16:31:04 +03:00
4a902dff94
java: VisibilityModifier formatting
2022-12-21 16:22:54 +03:00
f26220683c
java: MagicNumber formatting
2022-12-21 13:14:47 +03:00
c3e4533d1a
java: suppress DesignForExtension
2022-12-21 12:15:00 +03:00
f6618c8c92
java: suppress ParameterNumber
2022-12-21 12:14:11 +03:00
efd710c6c0
java: added checkstyle-suppressions.xml
2022-12-21 12:12:06 +03:00
e106677efb
java: FinalParameters formatting
2022-12-21 12:08:52 +03:00
ecd02e07c0
java: HiddenField formatting
2022-12-21 11:36:42 +03:00
847902fad9
java: ConstantName formatting
2022-12-21 11:29:45 +03:00
d4b5f86822
java: LocalVariableName formatting
2022-12-21 11:24:50 +03:00
7c35d8127d
java: MethodName formatting
2022-12-21 11:03:59 +03:00
d023b23fc9
java: StaticVariableName formatting
2022-12-20 22:04:46 +03:00
8b10c5ac2e
java: RegexpSingleline formatting
2022-12-20 22:00:15 +03:00
54bc536329
java: MethodParamPad formatting
2022-12-20 21:54:33 +03:00
07d7e5d887
java: ParenPad formatting
2022-12-20 21:50:49 +03:00
009577b52e
java: NoWhitespaceAfter formatting
2022-12-20 21:49:05 +03:00
c1fd896be4
java: WhitespaceAfter formatting
2022-12-20 21:45:04 +03:00
033126583b
java: WhitespaceAround formatting
2022-12-20 21:40:20 +03:00
3140d31e9c
java: UpperEll formatting
2022-12-20 19:18:05 +03:00
92ea5151ad
java: ParameterName formatting
2022-12-20 19:16:33 +03:00
ae4e4c14ad
java: OperatorWrap formatting
2022-12-20 19:14:57 +03:00
9a9d3c0b35
java: NewlineAtEndOfFile formatting
2022-12-20 19:12:53 +03:00
13d3fe97d9
java: RightCurly formatting
2022-12-20 19:10:43 +03:00
5bfe32f796
java: MemberName formatting
2022-12-20 19:05:07 +03:00
5a1ad9139f
java: SimplifyBooleanExpression formatting
2022-12-20 19:00:54 +03:00
91fbc384f3
java: MissingSwitchDefault formatting
2022-12-20 18:58:27 +03:00
9d275ebe6c
java: NeedBraces formatting
2022-12-20 18:56:18 +03:00
09a5d802ec
java: InnerAssignment formatting
2022-12-20 18:30:27 +03:00
b548ffb97e
java: LeftCurly formatting
2022-12-20 18:23:24 +03:00
50b0c3d29e
java: UnusedImports formatting
2022-12-20 16:40:47 +03:00
93b4560c31
java: EmptyBlock formatting
2022-12-20 16:38:24 +03:00
2e9807814a
java: used custom checkstyle rules
2022-12-20 16:36:48 +03:00
d0cfd03bf8
java: updated maven-checkstyle-plugin to 3.2.0
2022-12-20 16:34:51 +03:00
72c14a4e7b
java: used oracle rules for linter
2022-12-20 16:16:51 +03:00
44a3f29a79
java-spring: Header formatting
2022-12-20 12:09:37 +03:00
98dceacc4c
java-spring: add header rule template
2022-12-20 12:08:50 +03:00
05f4063ba6
java-spring: enable Header rule
2022-12-20 12:07:19 +03:00
d5797f7c02
java-spring: HiddenField formatting
2022-12-20 11:41:06 +03:00
5f40faac2a
java-spring: AvoidStarImport formatting
2022-12-20 11:34:36 +03:00
c062e554db
java-spring: suppress ParameterNumber
2022-12-20 11:23:42 +03:00
41e44985d6
java-spring: suppress DesignForExtension
2022-12-20 11:22:35 +03:00
95e1135e86
java-spring: MagicNumber formatting
2022-12-20 11:18:57 +03:00
cafb79c8d5
java-spring: RegexpSingleline formatting
2022-12-19 18:50:55 +03:00
1dbc275a57
java-spring: FinalParameters formatting
2022-12-19 18:46:30 +03:00
6dd44d2094
java-spring: WhitespaceAfter formatting
2022-12-19 16:20:47 +03:00
b74a3c5565
java-spring: LocalVariableName formatting
2022-12-19 15:41:06 +03:00
27e5fa8482
java-spring: MemberName formatting
2022-12-19 12:35:04 +03:00
46dab40432
java-spring: UpperEll formatting
2022-12-19 12:27:20 +03:00
ebd4ead751
java-spring: NoWhitespaceAfter formatting
2022-12-19 12:23:37 +03:00
9014f96da3
java-spring: FileTabCharacter formatting
2022-12-19 12:19:59 +03:00
273e4d5b77
java-spring: OperatorWrap formatting
2022-12-19 12:14:07 +03:00
d8b6cdcf78
java-spring: TodoComment formatting
2022-12-19 11:57:33 +03:00
6e0899daaf
java-spring: NewlineAtEndOfFile formatting
2022-12-19 11:49:15 +03:00
a5d459a744
java-spring: ParenPad formatting
2022-12-19 11:43:41 +03:00
dcb48f3849
java-spring: VisibilityModifier formatting
2022-12-19 11:36:09 +03:00
c8b3ed761e
java-spring: WhitespaceAround formatting
2022-12-19 11:23:28 +03:00
01c8b23d1d
java-spring: suppress HideUtilityClassConstructor
2022-12-16 16:32:16 +03:00
bf9373842b
java-spring: added checkstyle-suppressions.xml
2022-12-16 16:30:19 +03:00
7eaf4f5ae7
java-spring: SimplifyBooleanExpression formatting
2022-12-16 16:22:22 +03:00
e09f258f25
java-spring: EqualsHashCode formatting
2022-12-16 16:16:17 +03:00
054e144d93
java-spring: EmptyStatement formatting
2022-12-16 16:12:00 +03:00
3b698eb974
java-spring: RightCurly formatting
2022-12-16 16:11:11 +03:00
c356d952be
java-spring: LeftCurly formatting
2022-12-16 16:04:04 +03:00
b1f3704624
java-spring: NeedBraces formatting
2022-12-16 15:47:51 +03:00
1dd545dc9c
java-spring: removed nested blocks
2022-12-16 15:07:25 +03:00
1f6dfb0677
java-spring: removed unused imports
2022-12-16 15:03:26 +03:00
b59874f54b
java-spring: updated maven-checkstyle-plugin to 3.2.0
2022-12-16 14:46:43 +03:00
4d9f02c606
java-spring: used oracle rules for linter
2022-12-16 14:37:13 +03:00
c344a1d6a6
Merge branch 'feature/referenceData' into release/v7.3.0
...
# Conflicts:
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/config.ejs
2022-12-15 17:24:42 +03:00
a53f36eca3
nodejs: referenceData
2022-12-15 17:22:30 +03:00
ca49e5bdda
build(deps): bump loofah in /web/documentserver-example/ruby
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.19.0...v2.19.1 )
---
updated-dependencies:
- dependency-name: loofah
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-12-13 20:48:42 +00:00
4882459f51
Merge branch 'feature/referenceData' into release/v7.3.0
...
# Conflicts:
# web/documentserver-example/nodejs/app.js
2022-12-13 16:28:15 +03:00
0a0f5b556c
nodejs: referenceData
2022-12-13 16:27:18 +03:00
fdefc25479
Merge branch 'release/v7.3.0' into feature/putRelativeFile
...
# Conflicts:
# web/documentserver-example/nodejs/views/wopiIndex.ejs
2022-12-12 17:34:05 +03:00
2502c2a979
Merge branch 'develop' into release/v7.3.0
2022-12-12 17:31:17 +03:00
be85920ce4
nodejs: rename wopi icons
2022-12-12 17:30:24 +03:00
7d7c10b3bc
nodejs: update wopi editnew icon
2022-12-12 17:26:34 +03:00
1cbc6eca2e
nodejs: wopi embedview icon
2022-12-12 17:25:10 +03:00
df83585352
nodejs: putRelativeFile to changelog
2022-12-09 14:37:35 +03:00
6979ec815e
Merge remote-tracking branch 'remotes/origin/release/v7.3.0' into feature/putRelativeFile
...
# Conflicts:
# web/documentserver-example/nodejs/views/wopiIndex.ejs
2022-12-09 14:36:02 +03:00
d007b0a969
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.3.0
2022-12-09 14:34:36 +03:00
63f032d924
nodejs: revert editnew for existing file ( ee46a77684)
2022-12-09 14:34:19 +03:00
96a9dd7990
[wopi] proper putRelativeFile realizaion
2022-12-09 13:35:45 +03:00
91d8fc2487
[wopi] Add putRelativeFile handler
2022-12-09 13:35:12 +03:00
ae64081f97
nodejs: convert icon
2022-12-09 11:44:06 +03:00
820cafe202
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.3.0
2022-12-09 11:24:36 +03:00
e0d7e416d3
nodejs: format condition
2022-12-09 11:23:33 +03:00
806aba967c
csharp: replace equal("")
2022-12-09 10:45:41 +03:00
3ec226109e
Merge remote-tracking branch 'remotes/origin/feature/referenceData' into release/v7.3.0
2022-12-01 12:14:12 +03:00
b1f0fa6ecc
nodejs: referenceData
2022-12-01 11:55:32 +03:00
b02ffff33e
nodejs: do not send link in referenceData
2022-12-01 11:17:49 +03:00
f74f0ba376
Merge branch 'develop' into release/v7.3.0
...
# Conflicts:
# .github/workflows/lint-python.yml
# .github/workflows/lint-ruby.yml
# CHANGELOG.md
# web/documentserver-example/nodejs/app.js
2022-12-01 10:54:40 +03:00
96d3bf2e63
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# .github/workflows/lint-python.yml
# .github/workflows/lint-ruby.yml
2022-12-01 10:49:29 +03:00
daf4f62acd
nodejs: normal wopi url after release v7.1 ( fd456f59e8)
2022-12-01 10:46:35 +03:00
ade8a07e95
nodejs: fix wopi after restart
2022-12-01 10:46:34 +03:00
8b613627d1
ci: github actions
2022-12-01 10:46:34 +03:00
3d3a10005c
lang to changelog
2022-12-01 10:46:34 +03:00
801c451899
tooltip to changelog
2022-12-01 10:46:34 +03:00
df034c2af2
csharp-mvc: fixed tooltip
2022-12-01 10:46:33 +03:00
9726c06c84
csharp: fixed tooltip
2022-12-01 10:46:33 +03:00
3a45e1b0f3
python: fixed tooltip
2022-12-01 10:46:33 +03:00
ed8d0194b7
ruby: fixed tooltip
2022-12-01 10:46:32 +03:00
a59da2d5df
php: fixed tooltip
2022-12-01 10:46:32 +03:00
f5c9a9e924
java: fixed tooltip
2022-12-01 10:46:32 +03:00
7b12b970c0
java-spring: fixed tooltip
2022-12-01 10:46:32 +03:00
87a11c8633
ruby: deleting uid cookie
2022-12-01 10:46:31 +03:00
01e0cefae5
ruby: deleting uid cookie
2022-12-01 10:46:31 +03:00
98d42249fa
node: added fake language
2022-12-01 10:46:31 +03:00
fd9454dd5f
csharp: added fake language
2022-12-01 10:46:30 +03:00
fbf4153dea
csharp-mvc: added fake language
2022-12-01 10:46:30 +03:00
83b0411a4d
php: added fake language
2022-12-01 10:46:30 +03:00
c60e4e25e2
python: added fake language
2022-12-01 10:46:30 +03:00
4ebbecf580
ruby: added fake language
2022-12-01 10:46:29 +03:00
6dbf383e2d
java-spring: added fake language
2022-12-01 10:46:29 +03:00
1012bf13a6
java: added fake language
2022-12-01 10:46:29 +03:00
a24e081564
php: added request timeout for download
2022-12-01 10:46:28 +03:00
187ee212a9
csharp-mvc: added request timeout for download
2022-12-01 10:46:28 +03:00
106d9bfed3
csharp: added request timeout for download
2022-12-01 10:46:28 +03:00
13e243f900
python: added request status check for file
2022-12-01 10:46:28 +03:00
4ccc3fa35e
ruby: added request status check for file
2022-12-01 10:46:27 +03:00
be1fa2da14
java: added request status check for file
2022-12-01 10:46:27 +03:00
b6645427a8
java-spring: added request status check for file
2022-12-01 10:46:27 +03:00
39d7c366e3
nodejs: init type argument (fix ab03bb5490)
2022-12-01 10:46:26 +03:00
075f464701
fix changelog about directUrl task
2022-12-01 10:46:26 +03:00
9414dff70c
Change CHANGELOG.md
2022-12-01 10:46:26 +03:00
05b8989a87
csharp: option to send directUrl
2022-12-01 10:46:26 +03:00
43b6f53652
csharp-mvc: fix label for aspx
2022-12-01 10:46:25 +03:00
c22c0d72aa
Change CHANGELOG.md
2022-12-01 10:46:25 +03:00
d61c112aa2
Change CHANGELOG.md
2022-12-01 10:46:25 +03:00
ae3def67f5
python: option to send directUrl
2022-12-01 10:46:24 +03:00
7c22ba4e9e
csharp-mvc: option to send directUrl
2022-12-01 10:46:24 +03:00
320881f1cf
Change CHANGELOG.md
2022-12-01 10:46:24 +03:00
90c31eb887
php: option to send directUrl
2022-12-01 10:46:24 +03:00
702d0f1aa8
Change CHANGELOG.md
2022-12-01 10:46:23 +03:00
dbf1047f29
ruby: option to send directUrl
2022-12-01 10:46:23 +03:00
0d27d142d4
Change CHANGELOG.md
2022-12-01 10:46:23 +03:00
807cbbf236
java: option to send directUrl
2022-12-01 10:46:23 +03:00
e6b0bfd0be
Change CHANGELOG.md
2022-12-01 10:46:22 +03:00
943d059c7c
java-spring: fix option to send directUrl
2022-12-01 10:46:22 +03:00
399ab0714d
java-spring: option to send directUrl
2022-12-01 10:46:22 +03:00
8cabbe9c71
java-spring: tooltip fix
2022-12-01 10:46:21 +03:00
e40b6b2e28
java-spring: option to send directUrl
2022-12-01 10:46:21 +03:00
0a390094e5
java-spring: option to send directUrl
2022-12-01 10:46:21 +03:00
f7bb668f8b
Merge pull request #317 from ONLYOFFICE/feature/fix-linter
...
Feature/fix linter
2022-12-01 09:52:11 +03:00
808712ad34
fix: rubocop
2022-12-01 09:48:00 +03:00
2b0ba914dc
fix: pylint
2022-12-01 09:48:00 +03:00
249adaab48
fix: java linter
2022-12-01 09:48:00 +03:00
ee99a80ead
fix: nodejs eslint
2022-12-01 09:48:00 +03:00
d61fdaaa53
nodejs: normal wopi url after release v7.1 ( fd456f59e8)
2022-11-30 11:04:27 +03:00
270cbee160
nodejs: fix wopi after restart
2022-11-30 10:37:34 +03:00
e9721dd655
ci: github actions
2022-11-29 13:14:57 +03:00
a31a24a871
Merge pull request #313 from ONLYOFFICE/feature/actions
...
feature/actions
2022-11-29 13:13:50 +03:00
df0e197cb5
Merge pull request #315 from ONLYOFFICE/feature/fake-language
...
Feature/fake language
2022-11-28 16:53:24 +03:00
09802afc6f
lang to changelog
2022-11-28 16:52:06 +03:00
1c43679d87
Merge remote-tracking branch 'remotes/origin/develop' into feature/fake-language
2022-11-28 16:50:53 +03:00
573eeb6e18
node: added fake language
2022-11-28 16:49:47 +03:00
78cf6c35f8
csharp: added fake language
2022-11-28 16:49:47 +03:00
c7f5003d69
csharp-mvc: added fake language
2022-11-28 16:49:46 +03:00
19baff4340
php: added fake language
2022-11-28 16:49:46 +03:00
cc5c912658
Merge pull request #312 from ONLYOFFICE/bugfix/tooltip-fix
...
Bugfix/tooltip fix
2022-11-28 16:34:22 +03:00
64f2d605c2
tooltip to changelog
2022-11-28 16:33:43 +03:00
c9fca685bf
Merge pull request #311 from ONLYOFFICE/bugfix/delete-uid-cookie
...
ruby: deleting uid cookie
2022-11-28 16:22:37 +03:00
820883a584
python: added fake language
2022-11-24 13:15:33 +03:00
05a00a33a3
ruby: added fake language
2022-11-24 13:14:19 +03:00
613cb713cc
java-spring: added fake language
2022-11-24 13:13:45 +03:00
9216ff3a97
java: added fake language
2022-11-24 13:12:51 +03:00
dbaa7c5113
Merge pull request #310 from ONLYOFFICE/bugfix/file-request-status
...
Bugfix/file request status
2022-11-21 13:25:47 +03:00
d6ad145111
nodejs: init type argument (fix ab03bb5490)
2022-11-18 13:51:11 +03:00
456df162e6
ci: github actions
2022-11-16 17:53:02 +05:00
50fd47cf7c
csharp-mvc: fixed tooltip
2022-11-15 14:33:15 +03:00
f9c0da1696
csharp: fixed tooltip
2022-11-15 14:31:57 +03:00
a7807513c6
python: fixed tooltip
2022-11-15 13:55:25 +03:00
128430d698
ruby: fixed tooltip
2022-11-15 13:52:52 +03:00
8077a66f16
php: fixed tooltip
2022-11-15 13:51:15 +03:00
b3d8695a26
java: fixed tooltip
2022-11-15 13:23:24 +03:00
00872758ee
java-spring: fixed tooltip
2022-11-15 13:00:15 +03:00
3301c24de5
ruby: deleting uid cookie
2022-11-15 12:09:03 +03:00
dd0c049a70
ruby: deleting uid cookie
2022-11-15 10:55:02 +03:00
44fb3a089c
php: added request timeout for download
2022-11-11 14:58:36 +03:00
513bf99adb
csharp-mvc: added request timeout for download
2022-11-11 12:23:39 +03:00
6f92633ef8
csharp: added request timeout for download
2022-11-11 12:23:28 +03:00
b67e768dce
python: added request status check for file
2022-11-10 19:07:17 +03:00
751a886bfa
ruby: added request status check for file
2022-11-10 19:06:29 +03:00
66ea4b144b
java: added request status check for file
2022-11-10 19:05:32 +03:00
7a73422231
java-spring: added request status check for file
2022-11-10 19:04:49 +03:00
5319e18fb5
Merge pull request #309 from ONLYOFFICE/release/1.4.0
...
Release/1.4.0
2022-11-08 16:37:37 +03:00
93accdac7c
nodejs: do not send key in referenceData
2022-11-08 16:33:19 +03:00
def268f5f2
Merge remote-tracking branch 'remotes/origin/release/1.4.0' into develop
2022-11-08 10:42:00 +03:00
6054bffb3f
Merge pull request #305 from ONLYOFFICE/dependabot/maven/web/documentserver-example/java-spring/com.fasterxml.jackson.core-jackson-databind-2.13.4.1
...
build(deps): bump jackson-databind from 2.12.6.1 to 2.13.4.1 in /web/documentserver-example/java-spring
2022-11-08 10:31:57 +03:00
a7c917db3f
Merge remote-tracking branch 'remotes/origin/release/1.4.0' into develop
2022-11-08 09:18:02 +03:00
30481005a1
removed enum Language (Fix Bug 59624)
2022-11-08 09:17:30 +03:00
5544768500
set language from cookies (Fix Bug 59352)
2022-11-08 09:17:22 +03:00
14e53970c8
update pyjwt=2.6.0 (Fix Bug 59369)
2022-11-08 09:16:37 +03:00
82efd0f18a
fix 848cfb20bc
2022-11-07 14:23:01 +03:00
8ce90d89ed
removed enum Language (Fix Bug 59624)
2022-11-07 13:07:34 +03:00
2b184972dc
Merge pull request #306 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.9
...
build(deps): bump nokogiri from 1.13.8 to 1.13.9 in /web/documentserver-example/ruby
2022-11-03 14:46:55 +03:00
0fb9da4d89
update pom.xml
2022-11-03 14:11:05 +03:00
9277d3de58
Merge branch 'feature/optionDirectUrl' into develop
2022-11-03 13:34:47 +03:00
baf7a1e5dd
fix changelog about directUrl task
2022-11-03 13:34:15 +03:00
e2a14a74db
Merge pull request #308 from ONLYOFFICE/feature/optionDirectUrl
...
Feature/option direct url
2022-11-03 13:33:20 +03:00
848cfb20bc
set language from cookies (Fix Bug 59352)
2022-11-03 12:05:53 +03:00
ddd3ec82a8
update pyjwt=2.6.0 (Fix Bug 59369)
2022-11-03 10:47:39 +03:00
0ed08fd7b2
Change CHANGELOG.md
2022-11-02 14:58:12 +03:00
e1c5907003
csharp: option to send directUrl
2022-11-02 14:54:33 +03:00
9dd2d7c0db
csharp-mvc: fix label for aspx
2022-11-02 14:49:40 +03:00
8f0cbb78af
Change CHANGELOG.md
2022-11-02 13:10:39 +03:00
72e48914aa
Merge branch 'feature/optionDirectUrl' of https://github.com/ONLYOFFICE/document-server-integration into feature/optionDirectUrl
2022-11-02 13:05:45 +03:00
82a282029a
csharp-mvc: option to send directUrl
2022-11-02 13:05:08 +03:00
9b7c12b5c0
Change CHANGELOG.md
2022-11-01 23:10:46 +03:00
6ea5546099
python: option to send directUrl
2022-11-01 23:09:36 +03:00
92fbd1e293
Change CHANGELOG.md
2022-10-28 16:48:05 +03:00
855c1ed9f9
php: option to send directUrl
2022-10-28 16:47:08 +03:00
7e60ec15fd
Change CHANGELOG.md
2022-10-28 13:56:28 +03:00
3697a4a888
ruby: option to send directUrl
2022-10-28 13:55:48 +03:00
0b8107d167
Change CHANGELOG.md
2022-10-28 13:52:11 +03:00
885850ee33
java: option to send directUrl
2022-10-27 14:32:21 +03:00
98c61250a6
Change CHANGELOG.md
2022-10-26 16:54:16 +03:00
457487844c
java-spring: fix option to send directUrl
2022-10-26 16:47:43 +03:00
ff72956b68
java-spring: option to send directUrl
2022-10-26 16:41:59 +03:00
1593df6aec
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-26 10:46:51 +00:00
cda8a86c2a
Merge remote-tracking branch 'remotes/origin/release/1.4.0' into develop
2022-10-26 13:40:30 +03:00
16584c0abb
Merge remote-tracking branch 'remotes/origin/hotfix/1.3.1' into release/1.4.0
...
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/ruby/config/application.rb
2022-10-26 13:39:29 +03:00
1ddda89001
Merge pull request #307 from ONLYOFFICE/hotfix/1.3.1
...
Hotfix/1.3.1
2022-10-26 13:37:19 +03:00
5b76d798fb
1.3.1
2022-10-26 13:28:18 +03:00
e96200df85
java-spring: tooltip fix
2022-10-26 11:53:50 +03:00
de75b11e18
java-spring: option to send directUrl
2022-10-26 11:48:11 +03:00
f27afe1535
java-spring: option to send directUrl
2022-10-25 19:44:39 +03:00
59e17079ff
build(deps): bump jackson-databind
...
Bumps [jackson-databind](https://github.com/FasterXML/jackson ) from 2.12.6.1 to 2.13.4.1.
- [Release notes](https://github.com/FasterXML/jackson/releases )
- [Commits](https://github.com/FasterXML/jackson/commits )
---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-10-19 07:08:15 +00:00
1bdb3c03bc
Merge remote-tracking branch 'remotes/origin/feature/referenceData' into develop
2022-10-14 10:22:24 +03:00
111dc14f2b
nodejs: referenceData
2022-10-14 10:20:45 +03:00
4a656c025f
1.4.0
2022-10-14 10:12:48 +03:00
ce9930e5bc
java-spring: fixed footer positioning
2022-10-12 11:12:59 +03:00
9da22d7803
java-spring: fixed sorting of the list of languages
2022-10-12 11:00:01 +03:00
d78c677c99
java: fixed sorting of the list of languages
2022-10-12 10:59:41 +03:00
b204142c13
csharp: include assets
2022-10-11 18:04:21 +03:00
fd1c26ab9f
csharp-mvc: reload refs
2022-10-11 17:53:14 +03:00
5993d10bee
csharp-mvc: fix ref
2022-10-11 17:23:16 +03:00
c5771c9008
sharp-mvc: Fix merge 24aee6d194
2022-10-11 17:22:49 +03:00
2fad227272
Merge remote-tracking branch 'remotes/origin/release/v7.2.0' into develop
2022-10-05 13:33:43 +03:00
ada438ff0b
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
2022-09-28 09:13:23 +03:00
0dbd65a577
ruby: rails 7.0.3.1
2022-09-27 19:03:26 +03:00
48e5b8d4e0
Merge pull request #304 from ONLYOFFICE/dependabot/nuget/web/documentserver-example/csharp/Newtonsoft.Json-13.0.1
...
build(deps): bump Newtonsoft.Json from 10.0.3 to 13.0.1 in /web/documentserver-example/csharp
2022-09-27 18:26:31 +03:00
7f08a96681
Merge remote-tracking branch 'remotes/origin/develop' into dependabot/nuget/web/documentserver-example/csharp/Newtonsoft.Json-13.0.1
...
# Conflicts:
# web/documentserver-example/csharp/packages.config
2022-09-27 18:26:07 +03:00
3549b4bc2a
csharp: Newtonsoft.Json update
2022-09-27 18:24:53 +03:00
c9265d9ddc
csharp-mvc: fix dep path
2022-09-27 18:08:47 +03:00
44d9ca88c6
build(deps): bump Newtonsoft.Json in /web/documentserver-example/csharp
...
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json ) from 10.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases )
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/10.0.3...13.0.1 )
---
updated-dependencies:
- dependency-name: Newtonsoft.Json
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-09-27 14:59:15 +00:00
d964b43087
Merge pull request #303 from ONLYOFFICE/develop
...
Release/v1.3.0
2022-09-27 17:58:46 +03:00
5a0debd9e8
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
2022-09-27 17:55:26 +03:00
3b0f942eee
Merge pull request #302 from ONLYOFFICE/feature/ruby-3.0.0
...
support ruby v.3
2022-09-27 17:54:59 +03:00
4ee110c2d5
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
...
# Conflicts:
# web/documentserver-example/nodejs/views/config.ejs
# web/documentserver-example/ruby/app/models/document_helper.rb
2022-09-15 17:17:24 +03:00
ad1d93dd20
Merge pull request #301 from ONLYOFFICE/bugfix/file-request
...
added request status check for file
2022-09-15 14:43:19 +03:00
d2d98df5ab
support ruby v.3
2022-09-01 16:56:38 +03:00
7805f7dc91
added request status check for file
2022-09-01 09:34:30 +03:00
51ec27d67c
nodejs: removed trailing comma
2022-08-25 15:47:10 +03:00
9e94716df0
nodejs: reorder config items
2022-08-16 10:15:39 +03:00
988a8339b1
ruby: ERB::Util.url instead URI::encode
2022-08-15 11:10:02 +03:00
a482635e3f
Merge branch 'feature/directUrl' into release/v7.2.0
2022-08-03 12:20:57 +03:00
d2c679f6b1
nodejs: option to send directUrl
2022-08-03 12:20:39 +03:00
1da452d857
Merge branch 'feature/directUrl' into release/v7.2.0
2022-08-03 12:20:18 +03:00
d9b8d2b7e9
directUrl to changelog
2022-08-03 12:14:16 +03:00
24aee6d194
Merge branch 'release/v7.2.0' into feature/directUrl
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
2022-08-03 12:13:12 +03:00
bd108a9c77
fix changelog
2022-08-03 12:11:01 +03:00
e737e8ed48
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
2022-08-03 12:10:20 +03:00
b425d15f0a
Merge branch 'feature/tooltip' into develop
2022-08-03 12:09:47 +03:00
0f8dec1e6e
nodejs: revert tooltip for language ( e1753a154d)
2022-08-03 12:08:10 +03:00
193b31fe75
nodejs: id to info block
2022-08-03 11:59:58 +03:00
583403cf78
update empty files (Fix Bug 58202)
2022-08-02 16:50:01 +03:00
641e45e24f
1.3.0
2022-08-02 15:35:18 +03:00
53c30fbb7d
Merge branch 'develop' into release/v7.2.0
...
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/helpers/users.js
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
2022-08-02 15:04:09 +03:00
87a1755729
Merge pull request #300 from ONLYOFFICE/feature/ruby-bundle-update
...
ruby: bundle update
2022-08-02 14:32:40 +03:00
752a2a2364
Merge pull request #298 from ONLYOFFICE/fix/notification-incorrect-file-size
...
Fix/notification incorrect file size
2022-08-02 14:32:40 +03:00
d1affa2911
Merge pull request #297 from ONLYOFFICE/feature/refactoring-jwt-manager
...
Feature/refactoring jwt manager
# Conflicts:
# CHANGELOG.md
2022-08-02 14:32:31 +03:00
0ef2a4f3fd
Merge pull request #292 from ONLYOFFICE/Build(deps)/bot-recommendations
...
changes - ruby - raise gem version
2022-08-02 14:25:18 +03:00
675d3f318a
Merge pull request #294 from ONLYOFFICE/dependabot/nuget/web/documentserver-example/csharp-mvc/Newtonsoft.Json-13.0.1
...
build(deps): bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /web/documentserver-example/csharp-mvc
2022-08-02 14:25:18 +03:00
05512ffa23
Merge pull request #288 from ONLYOFFICE/feature/localhost-for-client
...
Localhost for client urls
2022-08-02 14:25:17 +03:00
2eeed5d26d
Fix #287 Fix #285 Fix #284 Fix #280
...
Build(deps)/bot recommendations
2022-08-02 14:24:11 +03:00
9e3dbd5eb5
Merge pull request #290 from ONLYOFFICE/fix/php-convert-manager
...
fix - php - add substrings to string
2022-08-02 14:21:09 +03:00
efbab7c113
nodejs: fix embed link for client request
2022-08-02 14:20:48 +03:00
b8f0f6447c
nodejs: remove getlocalFileUri
2022-08-02 14:20:48 +03:00
8779a90433
nodejs: fix history url for server request
2022-08-02 14:20:48 +03:00
b3162ee410
Merge pull request #278 from ONLYOFFICE/dependabot/maven/web/documentserver-example/java-spring/com.fasterxml.jackson.core-jackson-databind-2.12.6.1
...
build(deps): bump jackson-databind from 2.12.2 to 2.12.6.1 in /web/documentserver-example/java-spring
2022-08-02 14:18:23 +03:00
42edd5e208
Merge pull request #276 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.4
...
build(deps): bump nokogiri from 1.12.5 to 1.13.4 in /web/documentserver-example/ruby
2022-08-02 14:18:23 +03:00
e041baeef7
Merge branch 'feature/extension-on-rename' into develop
2022-08-02 14:18:22 +03:00
5bf682a007
nodejs: package lock
2022-08-02 14:18:22 +03:00
6dacf49faa
ruby: fix ( 23e616aade)
2022-08-02 14:18:22 +03:00
63c9c4242e
Merge pull request #291 from ONLYOFFICE/feature/chat
...
Feature/chat
# Conflicts:
# CHANGELOG.md
2022-08-02 14:18:21 +03:00
b5e345ed50
Merge branch 'feature/chat' into develop
2022-08-02 14:18:21 +03:00
33f8436d42
changelog
2022-08-02 14:18:20 +03:00
c5217242ab
Merge pull request #300 from ONLYOFFICE/feature/ruby-bundle-update
...
ruby: bundle update
2022-08-01 14:34:39 +03:00
c910d5193b
Merge remote-tracking branch 'remotes/origin/dependabot/bundler/web/documentserver-example/ruby/rails-html-sanitizer-1.4.3' into feature/ruby-bundle-update
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2022-08-01 14:34:05 +03:00
58c27f8f2f
ruby: bundle update
2022-08-01 12:56:57 +03:00
1ec831789b
Merge pull request #298 from ONLYOFFICE/fix/notification-incorrect-file-size
...
Fix/notification incorrect file size
2022-07-29 17:37:36 +03:00
0510fd1354
[fix] - node.js - don't send file size limit to incoming form
...
Revert "nodejs: upload big file"
This reverts commit fa4c3e3258 .
2022-07-29 17:31:22 +03:00
25238b5614
Merge pull request #293 from ONLYOFFICE/feature/liveview
...
Feature/liveview
2022-07-29 17:23:48 +03:00
901bb61883
Merge remote-tracking branch 'remotes/origin/develop' into feature/liveview
...
# Conflicts:
# CHANGELOG.md
2022-07-29 17:21:54 +03:00
7f3e6c6364
Merge pull request #291 from ONLYOFFICE/feature/chat
...
Feature/chat
2022-07-29 17:18:24 +03:00
b3512ea0ce
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
...
# Conflicts:
# CHANGELOG.md
2022-07-29 17:16:54 +03:00
642a1bd19a
Merge pull request #297 from ONLYOFFICE/feature/refactoring-jwt-manager
...
Feature/refactoring jwt manager
2022-07-29 17:13:08 +03:00
ac471588de
jwt to changelog
2022-07-29 17:12:20 +03:00
17674ef5bc
ruby: licenses
2022-07-29 17:12:12 +03:00
dc2ee2a997
php: jwt
2022-07-29 17:12:02 +03:00
c358fa814a
csharp-mvc: jwt
2022-07-29 17:11:05 +03:00
143a73e083
csharp: jwt
2022-07-29 17:10:37 +03:00
c266592434
Merge pull request #292 from ONLYOFFICE/Build(deps)/bot-recommendations
...
changes - ruby - raise gem version
2022-07-29 11:55:36 +03:00
19ed666d56
Merge pull request #294 from ONLYOFFICE/dependabot/nuget/web/documentserver-example/csharp-mvc/Newtonsoft.Json-13.0.1
...
build(deps): bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /web/documentserver-example/csharp-mvc
2022-07-29 11:53:18 +03:00
84b9202af0
Merge pull request #288 from ONLYOFFICE/feature/localhost-for-client
...
Localhost for client urls
2022-07-29 11:51:09 +03:00
8fb698bb75
Basque (Spain), Armenian and Malay (Malaysia) lang
2022-07-29 11:38:25 +03:00
00f46ef080
build(deps): bump rails-html-sanitizer
...
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases )
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.2...v1.4.3 )
---
updated-dependencies:
- dependency-name: rails-html-sanitizer
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-07-06 12:11:57 +00:00
5c194da95d
[add] - java - directUrl
2022-07-04 19:46:34 +03:00
0d5cebe28e
[add] - java spring - directUrl
2022-07-04 19:45:37 +03:00
dacf72cae2
[add] - csharp mvc - directUrl
2022-07-01 19:29:52 +03:00
208b8926be
[add] - csharp - directUrl
2022-07-01 19:28:55 +03:00
55c4853f04
[add] - php - directUrl
2022-07-01 17:30:18 +03:00
ccae7c6a06
[add] - python - directUrl
2022-06-30 20:29:04 +03:00
dc84dd3b29
[add] - ruby - fix
2022-06-30 19:53:44 +03:00
65d3671b09
[add] - ruby - directUrl
2022-06-30 19:15:15 +03:00
1fb5ef8bfd
build(deps): bump Newtonsoft.Json
...
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json ) from 12.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases )
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.3...13.0.1 )
---
updated-dependencies:
- dependency-name: Newtonsoft.Json
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-06-23 00:47:07 +00:00
b630c3802b
fix - ruby - coEditing from permissions to editorConfig
2022-06-16 16:56:18 +03:00
ad3993b532
fix - ruby - coEditing from permissions to editorConfig
2022-06-16 16:52:51 +03:00
35ee61e011
fix - python - checking mode view insert edit
2022-06-16 16:48:01 +03:00
ee59ab3dfd
fix - python - coEditing from permissions to editorConfig
2022-06-16 16:43:48 +03:00
500f076e38
fix - csharp - coEditing from permissions to editorConfig
2022-06-16 16:36:51 +03:00
e578f29d9d
fix - csharp mvc - coEditing from permissions to editorConfig
2022-06-16 16:35:57 +03:00
9de9bc90a4
fix - java - checking mode view insert edit
2022-06-16 16:32:36 +03:00
7a9ebdbbe5
fix - java - coEditing from permissions to editorConfig
2022-06-16 16:26:03 +03:00
887089bcad
add - java spring - anonymous without liveview
2022-06-16 16:11:29 +03:00
680e53823a
add - java - anonymous without liveview
2022-06-15 21:08:18 +03:00
33e1489cd6
add - charp mvc - anonymous without liveview
2022-06-15 20:41:32 +03:00
8c90737bf6
add - charp - anonymous without liveview
2022-06-15 20:38:16 +03:00
e5f1bc8ed6
add - php - anonymous without liveview
2022-06-15 20:23:52 +03:00
985b179475
add - python - anonymous without liveview
2022-06-15 20:03:07 +03:00
775d15132f
add - ruby - json transform
2022-06-15 19:39:00 +03:00
4a4298ca10
add - ruby - anonymous without liveview
2022-06-15 19:30:36 +03:00
cdbd264ed5
Merge branch 'feature/chat' into feature/liveview
...
# Conflicts:
# CHANGELOG.md
2022-06-15 19:21:30 +03:00
e61f6cae89
changes - ruby - raise gem version
2022-06-15 19:10:58 +03:00
22039078ef
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
2022-06-15 18:38:12 +03:00
62793a42ab
add - java spring - anonymous without permissions.chat
2022-06-15 18:09:14 +03:00
f49f96a2c2
add - java - anonymous without permissions.chat
2022-06-14 20:16:06 +03:00
2031d65adb
add - csharp mvc - anonymous without permissions.chat
2022-06-14 19:53:12 +03:00
7f54659d3b
add - csharp - anonymous without permissions.chat
2022-06-14 19:50:44 +03:00
a3bc13bb6e
add - php - anonymous without permissions.chat
2022-06-14 19:45:46 +03:00
29ea16c124
add - python - anonymous without permissions.chat
2022-06-14 19:37:42 +03:00
6d4c8b926e
add - ruby - anonymous without permissions.chat
2022-06-14 19:25:53 +03:00
22d2031426
fix - csharp - replace with regex
2022-06-14 18:10:18 +03:00
fcc51e8154
fix - csharp-mvc - check if '/' exist + replace with regex
2022-06-14 18:08:46 +03:00
8cd85ad63c
Fix #287 Fix #285 Fix #284 Fix #280
...
Build(deps)/bot recommendations
2022-06-14 17:20:47 +03:00
1d51688884
Merge pull request #290 from ONLYOFFICE/fix/php-convert-manager
...
fix - php - add substrings to string
2022-06-14 17:05:02 +03:00
2c63a85b00
fix - php - add substrings to string
2022-06-14 16:55:12 +03:00
d1545c4db4
csharp-mvc-fix folder display for localhost
2022-06-10 18:37:17 +03:00
bd8e4d6ec7
csharp-fix goback
2022-06-10 18:31:22 +03:00
e1c815b574
Fix folder display for localhost
2022-06-10 18:29:44 +03:00
4042d2bb8a
Merge remote-tracking branch 'remotes/origin/dependabot/maven/web/documentserver-example/java-spring/com.google.code.gson-gson-2.8.9' into build(deps)/bot-recommendations
2022-06-10 16:14:14 +03:00
8c9d2d80bd
Merge remote-tracking branch 'remotes/origin/dependabot/maven/web/documentserver-example/java/com.google.code.gson-gson-2.8.9' into build(deps)/bot-recommendations
2022-06-10 16:13:53 +03:00
3a9259d713
Merge remote-tracking branch 'remotes/origin/dependabot/bundler/web/documentserver-example/ruby/rack-2.2.3.1' into build(deps)/bot-recommendations
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2022-06-10 16:13:02 +03:00
39129a537e
Merge remote-tracking branch 'remotes/origin/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.6' into build(deps)/bot-recommendations
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2022-06-10 16:07:32 +03:00
dfaf552bf8
ruby-fix - use client URL in goBack
2022-06-09 19:30:43 +03:00
cc8b6f3716
nodejs: directUrl
2022-06-09 13:23:43 +03:00
13726b3c2f
nodejs: fix embed link for client request
2022-06-09 13:18:06 +03:00
8bcc15e320
nodejs: remove getlocalFileUri
2022-06-09 13:07:02 +03:00
8fca045dd7
nodejs: fix history url for server request
2022-06-09 12:15:04 +03:00
a018cc5787
Merge remote-tracking branch 'remotes/origin/master' into develop
2022-06-03 11:09:35 +03:00
054236ef8a
build(deps): bump rack in /web/documentserver-example/ruby
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.3 to 2.2.3.1.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1 )
---
updated-dependencies:
- dependency-name: rack
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-27 16:45:08 +00:00
05a3110c99
Remove workflow and disable build nodejs docker ( #286 )
...
* Remove workflow and disable build
* Remove Dockerfile
2022-05-27 15:34:59 +03:00
e662c765e6
build(deps): bump gson in /web/documentserver-example/java-spring
...
Bumps [gson](https://github.com/google/gson ) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.9 )
---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-20 22:07:08 +00:00
058bb0d2e2
build(deps): bump gson in /web/documentserver-example/java
...
Bumps [gson](https://github.com/google/gson ) from 2.8.5 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases )
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md )
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.5...gson-parent-2.8.9 )
---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-20 20:58:39 +00:00
8bafa3ff3a
Add submodule-init ( #283 )
2022-05-19 17:02:51 +03:00
56679a3b75
Change target repo ( #282 )
...
* Change target repo
* Add latest tag
2022-05-19 15:59:11 +03:00
d4d758770f
Add docs-example multiarch build ( #281 )
...
* Add multiarch build
* Cosmetic changes
* Cosmetic changes
2022-05-19 14:17:28 +03:00
ac78d1fc08
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.3 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.6 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-05-19 03:44:52 +00:00
874ebff886
Fix the launch of the example container ( #279 )
...
* Fix the launch of the example container
* Change the user home directory
* Change the command for create a user
2022-05-16 17:26:24 +03:00
070dac6878
Merge remote-tracking branch 'remotes/origin/master' into develop
2022-05-12 13:22:41 +03:00
4f2f877f0e
docxf update
2022-05-12 13:22:15 +03:00
cfa0fb1b74
Merge pull request #278 from ONLYOFFICE/dependabot/maven/web/documentserver-example/java-spring/com.fasterxml.jackson.core-jackson-databind-2.12.6.1
...
build(deps): bump jackson-databind from 2.12.2 to 2.12.6.1 in /web/documentserver-example/java-spring
2022-04-25 16:57:39 +03:00
1d624e6831
Merge pull request #276 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.4
...
build(deps): bump nokogiri from 1.12.5 to 1.13.4 in /web/documentserver-example/ruby
2022-04-25 16:56:55 +03:00
fe83e98b37
Merge branch 'feature/extension-on-rename' into develop
2022-04-25 14:27:32 +03:00
f9ea7f7b50
nodejs: package lock
2022-04-25 14:27:28 +03:00
328ea46693
format
2022-04-25 14:20:41 +03:00
41ec2742a7
csharp-mvc: with ext
2022-04-25 14:06:27 +03:00
76fc55c2d4
csharp: with ext
2022-04-25 14:04:01 +03:00
e10f3962b6
java: with ext
2022-04-25 13:28:35 +03:00
b9859ef5ca
java-spring: with ext
2022-04-25 12:53:28 +03:00
1cb2b586b1
ruby: with ext
2022-04-25 11:45:21 +03:00
e5d31eebbf
nodejs: fix
2022-04-25 11:43:52 +03:00
1ac40c539f
python: with ext
2022-04-25 11:13:09 +03:00
371366befa
nodejs: with ext
2022-04-25 10:41:59 +03:00
0bee4817e7
php: with ext
2022-04-25 09:38:12 +03:00
ad941e0ba4
ruby: fix ( 23e616aade)
2022-04-20 10:19:34 +03:00
93c69e51ed
changelog: offline viewer for anonymous
2022-04-18 15:37:45 +03:00
8b8b7d3938
Merge branch 'feature/liveview' into develop
2022-04-18 15:35:36 +03:00
f8f01a033e
nodejs: anonymous without liveview
2022-04-18 15:34:18 +03:00
f497f10913
changelog: anonymous without chat
2022-04-18 15:26:44 +03:00
8b2478ac71
Merge branch 'feature/chat' into develop
2022-04-18 15:25:42 +03:00
391c347419
nodejs: anonymous without permissions.chat
2022-04-18 15:25:04 +03:00
5a08009b7b
changelog: zh-TW, pt-PT
2022-04-18 15:24:31 +03:00
4e5b65f673
changelog
2022-04-18 15:23:43 +03:00
13e3d7673b
Merge pull request #275 from ONLYOFFICE/feature/new-langs-7.2
...
added langs
2022-04-18 15:20:53 +03:00
c0a46866ce
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.12.5 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.4 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-18 11:18:07 +00:00
e7b76729a4
build(deps): bump jackson-databind
...
Bumps [jackson-databind](https://github.com/FasterXML/jackson ) from 2.12.2 to 2.12.6.1.
- [Release notes](https://github.com/FasterXML/jackson/releases )
- [Commits](https://github.com/FasterXML/jackson/commits )
---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-04-18 11:17:36 +00:00
5cc6b4cb15
Merge pull request #277 from ONLYOFFICE/develop
...
Release/1.2.0
2022-04-18 14:16:23 +03:00
7a70a44bcb
1.2.0
2022-04-18 13:59:07 +03:00
ce2e7f97d6
added langs
2022-04-11 15:28:55 +03:00
e42bd53664
Merge pull request #274 from ONLYOFFICE/feature/languages-fix
...
languages sort fix
2022-04-11 10:42:55 +03:00
23e616aade
languages sort fix
2022-04-11 10:38:26 +03:00
f035da0db4
nodejs: disable X-Powered-By
2022-04-05 15:16:45 +03:00
3e12ec4ebe
Merge pull request #272 from ONLYOFFICE/feature/ignore-self-signed-certificate
...
Feature/ignore self signed certificate
2022-03-30 14:34:02 +03:00
589ca9b601
Merge branch 'develop' into feature/ignore-self-signed-certificate
2022-03-28 16:00:59 +03:00
32f1ec82d1
Merge pull request #271 from ONLYOFFICE/feature/uid-0-fix
...
Feature/uid 0 fix
2022-03-28 13:26:38 +03:00
54bb5b0a24
format
2022-03-28 13:26:17 +03:00
8274c16f6d
Merge pull request #273 from ONLYOFFICE/feature/update-readme
...
Update README.md
2022-03-28 13:09:24 +03:00
7a982fc785
format
2022-03-28 13:09:13 +03:00
6f5800fbde
Updated Readme files in examples
2022-03-28 12:05:45 +03:00
8ec632eebd
csharp-mvc: function created
2022-03-28 10:12:46 +03:00
b6ca4535ce
csharp: function created
2022-03-28 09:58:59 +03:00
089fc8bfa0
ruby: function created
2022-03-28 09:31:01 +03:00
0b4c17ea0a
Update README.md
2022-03-25 17:57:11 +03:00
405be2847b
java-spring: ignoring self-signed certificate was added
2022-03-25 16:54:04 +03:00
f809c7e525
python: certificate ignore was added
2022-03-25 13:26:00 +03:00
44061c82a9
csharp-mvc: ignore certificate in config
2022-03-24 11:24:46 +03:00
ef4e283804
csharp: ignore certificate in config
2022-03-24 10:26:31 +03:00
4b0ad1a192
csharp + csharp-mvc
2022-03-23 16:56:41 +03:00
60469b0dba
java: ignore certificate in config
2022-03-23 15:39:11 +03:00
f5ac95e1cc
nodejs: ignore certificate in config
2022-03-23 15:11:30 +03:00
c4c2fbb945
ruby: certificate was ignored
2022-03-23 14:25:53 +03:00
99b5fcd562
python
2022-03-23 13:29:24 +03:00
7e34067410
java
2022-03-23 12:38:38 +03:00
a44787c625
java-spring
2022-03-23 11:11:03 +03:00
105afb2c34
php
2022-03-23 10:57:33 +03:00
002f9b958e
nodejs
2022-03-23 10:53:51 +03:00
56d5913808
ruby
2022-03-23 10:48:28 +03:00
6664864bed
nodejs
2022-03-22 13:52:28 +03:00
6c9e6e9304
Merge pull request #268 from ONLYOFFICE/feature/language-update
...
Feature/language update
2022-03-22 12:21:43 +03:00
416b1fde8c
Merge pull request #270 from ONLYOFFICE/feature/hide-history-for-anonymous
...
Feature/hide history for anonymous
2022-03-22 11:54:12 +03:00
383f240825
Merge pull request #269 from ONLYOFFICE/feature/ban-renaming-for-anonymous
...
Feature/ban renaming for anonymous
2022-03-22 11:48:57 +03:00
642e145142
php: certificate was ignored
2022-03-22 11:15:09 +03:00
8f09dadfa0
ruby: java-spring: bugfix
2022-03-21 17:10:11 +03:00
495f1cf49a
nodejs: split filename
2022-03-21 11:18:30 +03:00
cf01b5e0ae
csharp: csharp-mvc: version history button was hidden
2022-03-21 09:38:48 +03:00
0673fed928
java: java-spring: version history button was hidden
2022-03-21 09:35:58 +03:00
9b0b30a0b0
nodejs: version history button was hidden
2022-03-21 09:32:27 +03:00
200187edce
python: version history button was hidden
2022-03-21 09:29:32 +03:00
23176ddf07
ruby: version history button was hidden
2022-03-21 09:27:26 +03:00
9857cef8fc
php: version history button was hidden
2022-03-21 09:22:31 +03:00
204f770401
java-spring: bugfix
2022-03-18 15:58:02 +03:00
61834e3ec6
Merge branch 'feature/language-update' of github.com:ONLYOFFICE/document-server-integration into feature/language-update
2022-03-18 15:24:45 +03:00
2ca6185ac4
php: bugfix
2022-03-18 15:24:30 +03:00
e818bb978b
csharp: removed rename action for anonymous
2022-03-18 15:08:20 +03:00
3a4cf5e6e6
csharp-mvc: removed rename action for anonymous
2022-03-18 15:06:46 +03:00
7ec16b90e3
java: removed rename action for anonymous
2022-03-18 15:04:28 +03:00
fcfb6efda7
java-spring: removed rename action for anonymous
2022-03-18 15:02:45 +03:00
e4c72c98d1
nodejs: removed rename action for anonymous
2022-03-18 14:59:27 +03:00
c2bbda542a
python: removed rename action for anonymous
2022-03-18 14:56:17 +03:00
2c12393c78
ruby: removed rename action for anonymous
2022-03-18 14:52:59 +03:00
4e93f6ebac
php: fix
2022-03-18 14:47:59 +03:00
d10ba9f773
Merge branch 'develop' into feature/ban-renaming-for-anonymous
2022-03-18 14:40:38 +03:00
a0bf7db118
php: removed rename action
2022-03-18 14:36:46 +03:00
e40e7cc41c
csharp-mvc: move languages to config
2022-03-18 11:25:54 +03:00
f616655f4c
csharp: move languages to config
2022-03-18 11:14:49 +03:00
4ba708631e
Merge pull request #266 from ONLYOFFICE/feature/renaming-files
...
Feature/renaming files
2022-03-18 10:31:19 +03:00
b9c1bc0f42
java-spring: changing arguments
2022-03-18 09:50:59 +03:00
215ade01a3
java: changing arguments
2022-03-18 09:32:34 +03:00
4d25418fc8
java: move languages to config
2022-03-17 14:05:56 +03:00
4539bac5db
Merge pull request #267 from ONLYOFFICE/feature/customization
...
Feature/customization
2022-03-17 11:10:14 +03:00
eb196613e7
format
2022-03-17 10:36:38 +03:00
7ac788f589
csharp: jwt in body
2022-03-17 10:27:47 +03:00
55119458af
java-spring: move languages to config
2022-03-17 10:14:02 +03:00
3c18add1fc
Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop
2022-03-17 09:56:20 +03:00
6bf63b7166
nodejs: move languages to config
2022-03-16 16:30:56 +03:00
32df2d3e34
php: move languages to config
2022-03-16 15:41:45 +03:00
97c7859db5
ruby: move languages to config
2022-03-16 15:32:47 +03:00
492f9c7baa
python: config
2022-03-16 14:58:16 +03:00
e0c0595796
removed chat
2022-03-16 13:06:37 +03:00
40b8fb88a8
Merge branch 'feature/renaming-files' of github.com:ONLYOFFICE/document-server-integration into feature/renaming-files
2022-03-16 11:36:17 +03:00
b0df0d72df
java-spring: refactoring
2022-03-16 10:48:43 +03:00
1053add1d9
csharp-mvc: refactoring
2022-03-16 09:47:49 +03:00
f1fc0e5fae
csharp: refactoring
2022-03-16 09:38:30 +03:00
a192c6ce1f
ruby: refactoring
2022-03-15 18:45:35 +03:00
e8aec0b68c
java: php: python: refactoring
2022-03-15 18:10:02 +03:00
d9667f9757
nodejs: fix
2022-03-15 15:17:19 +03:00
3a985da120
Merge branch 'feature/renaming-files' of github.com:ONLYOFFICE/document-server-integration into feature/renaming-files
2022-03-15 14:19:34 +03:00
a88f84ddac
nodejs: use commandRequest
2022-03-15 14:19:16 +03:00
6525d7210f
micro fix
2022-03-15 13:33:33 +03:00
6b93311ce5
customization change
2022-03-15 13:10:34 +03:00
999561ffd6
Merge branch 'feature/renaming-files' of github.com:ONLYOFFICE/document-server-integration into feature/renaming-files
2022-03-15 10:51:43 +03:00
e539c1205f
python: nodejs: jwt fix
2022-03-15 10:51:26 +03:00
9a52a538cb
csharp-mvc: jwt fix
2022-03-15 08:24:11 +03:00
e8038a8e88
csharp: jwt fix
2022-03-15 08:18:34 +03:00
1045b314b6
Merge pull request #265 from ONLYOFFICE/bugfix/wopi
...
fix wopi
2022-03-14 17:50:35 +03:00
1636732521
nodejs: fix userHost in wopi
2022-03-14 17:48:32 +03:00
daa9a5f3fa
fix wopi
2022-03-14 15:49:24 +03:00
9bf3973215
csharp-mvc: meta command
2022-03-14 14:00:05 +03:00
cad2a20cdf
csharp: meta command
2022-03-14 13:41:12 +03:00
82a5a68e6c
java: meta command
2022-03-11 14:59:10 +03:00
0e1a580a86
refactoring
2022-03-11 14:13:09 +03:00
c09f3fc4b9
Merge branch 'feature/renaming-files' of github.com:ONLYOFFICE/document-server-integration into feature/renaming-files
2022-03-11 11:02:39 +03:00
d4d7c4e222
java-spring: meta command
2022-03-11 10:58:54 +03:00
14429c5b05
php: rename refactoring
2022-03-11 09:45:42 +03:00
131e33c6af
Merge pull request #264 from ONLYOFFICE/feature/fix-mentions
...
Feature/fix mentions
2022-03-10 16:19:50 +03:00
8a04e5fbc4
ruby:meta command
2022-03-09 13:50:47 +03:00
1b6435a7dc
python:meta command
2022-03-08 10:50:05 +03:00
b8eecab45f
nodejs:meta command
2022-03-07 22:01:03 +03:00
a55cb60542
nodejs: file download url was incorrectly formed when converting file 69d2e14438
2022-03-05 16:03:13 +03:00
f7259409a2
php:jwt
2022-03-04 14:34:50 +03:00
0ea9e68c7c
meta command
2022-03-04 11:15:43 +03:00
4b72e0a664
php: add request rename in doceditor + add function renamefile() in webeditor
2022-03-03 14:34:57 +03:00
f4ae62e02d
nodejs: missing line for 69d2e14438
2022-03-03 11:25:38 +03:00
935377a941
all: fix link in mentions
2022-03-02 17:42:12 +03:00
3690aacb66
nodejs: fix link in mentions
2022-03-02 17:10:41 +03:00
b8b375a19a
Merge pull request #263 from ONLYOFFICE/feature/scroll
...
fixed scrolling due to footer : ab82be9b3d
2022-03-02 16:40:13 +03:00
69d2e14438
nodejs: fixed an issue when subfolders wouldn't create if storagefolder was set to an absolute path
2022-03-02 16:27:58 +03:00
fec77a9e75
fixed scrolling due to footer : ab82be9b3d
2022-03-02 14:30:57 +03:00
f0171cbb18
Merge pull request #262 from ONLYOFFICE/feature/anonymus-without-id
...
new branch + anonymus without id
2022-03-02 13:55:20 +03:00
fe49aeb815
Merge pull request #260 from ONLYOFFICE/feature/mobile-upload
...
Feature/mobile upload
2022-03-02 13:54:16 +03:00
8416f36581
mobile-upload:centering
2022-03-02 13:48:01 +03:00
b9f3bfd2e2
new branch + anonymus without id
2022-03-02 11:16:24 +03:00
02b22e9e26
Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-upload
2022-03-01 16:01:30 +03:00
f43f08012d
Merge pull request #261 from ONLYOFFICE/budfix/php-device-display
...
Budfix/php device display
2022-03-01 15:58:40 +03:00
1c27610e8d
Ruby - fix body display
2022-03-01 15:47:24 +03:00
148caf6225
Python - fix body display
2022-03-01 15:47:11 +03:00
b24e4503bc
Java Spring - fix body display
2022-03-01 15:46:53 +03:00
58378827d4
Java - fix body display
2022-03-01 15:46:34 +03:00
502f14c7be
C# mvc - fix body display
2022-03-01 15:46:15 +03:00
ded2d19672
C# - fix body display
2022-03-01 15:45:55 +03:00
6116f05625
Java - Add viewport device display on index page
2022-03-01 15:45:18 +03:00
1e2a9cf4f2
Java Spring - Add viewport device display on index page
2022-03-01 15:44:56 +03:00
1d7775f25b
C# - Add viewport device display on index page
2022-03-01 15:44:00 +03:00
05c7a5a6db
fix body display
2022-03-01 13:51:31 +03:00
c3500e39fd
Add viewport device display on index page
2022-03-01 13:50:44 +03:00
23169c6fea
block height fix:upload for mobile
2022-03-01 10:45:29 +03:00
f2fddc75c6
nodejs:fix
2022-02-28 18:29:54 +03:00
f542e9dcfc
csharp:upload for mobile
2022-02-28 18:27:42 +03:00
6737a7e0d0
csharp-mvc:upload for mobile
2022-02-28 18:22:31 +03:00
e9c17c55da
java:upload for mobile
2022-02-28 18:20:14 +03:00
f334bf4b19
java-spring:upload for mobile
2022-02-28 18:17:52 +03:00
f2139949de
nodejs:upload for mobile
2022-02-28 18:14:23 +03:00
48314b2c7f
ruby:upload for mobile
2022-02-28 18:09:20 +03:00
8804844281
python:upload for mobile
2022-02-28 17:59:15 +03:00
3a21d29568
php: fix centering
2022-02-28 17:17:30 +03:00
b6a08e242d
Add licenses of mimemagic on ruby ( 7a61fac6b7)
...
# Conflicts:
# web/documentserver-example/ruby/licenses/mimemagic.license
2022-02-28 16:59:02 +03:00
596235d34b
php:upload for mobile
2022-02-28 16:40:55 +03:00
254fbaccea
Merge pull request #259 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.3
...
build(deps): bump nokogiri from 1.12.5 to 1.13.3 in /web/documentserver-example/ruby
2022-02-28 12:03:45 +03:00
69c07a30a7
Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.3
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2022-02-28 12:02:41 +03:00
6283ff934d
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.12.5 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.3 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-02-26 03:34:12 +00:00
db231faca0
nodejs: pdf without comment and fillform permissions
2022-02-22 14:31:14 +03:00
a3dd0394d2
nodejs: remove unused code
2022-02-22 11:46:40 +03:00
f9fd73fc7e
nodejs: remove unused ( aadac3cca6)
2022-02-22 11:32:06 +03:00
0931936b3c
nodejs: remove unused ( 5c1d925d42)
2022-02-22 11:29:34 +03:00
b91b49c8fa
nodejs: fix ( b0a0050201)
2022-02-22 11:24:19 +03:00
b0a0050201
Merge pull request #258 from ONLYOFFICE/bugfix/non-static-docmanager
...
Bugfix Non static Docmanager
2022-02-22 11:06:10 +03:00
1c780a639f
nodejs: don't clean tmp folder while others uploads might be happening
2022-02-16 11:55:01 +03:00
ad6ac4dedd
nodejs: non static docmanager
2022-02-16 11:54:22 +03:00
8ba33f524b
Merge pull request #240 from ONLYOFFICE/feature/jwtHistoryFiles
...
Feature/jwt history files
2022-02-15 16:32:21 +03:00
2f5b25d6ab
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2022-02-15 16:31:57 +03:00
44eef53a03
python: fixed history path building
2022-02-14 12:41:37 +03:00
08388f739c
python: fixed cors issue when downloading history files
2022-02-14 12:41:14 +03:00
1d8175b88f
Merge pull request #256 from ONLYOFFICE/feature/ruby-deps-version
...
ruby: update dependencies version
2022-02-11 13:01:44 +03:00
1400ec5a4b
nodejs: fix opening history
2022-02-11 12:54:59 +03:00
e5f61ec95e
php format
2022-02-11 12:34:46 +03:00
7c669cca19
mvc: fix opening history
2022-02-11 12:20:05 +03:00
81f8bd1a9b
fix help
2022-02-11 11:31:00 +03:00
c4c819c513
format
2022-02-11 10:54:03 +03:00
03332b3cd9
csharp: revert coediting
2022-02-11 10:36:48 +03:00
ebc864736d
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
...
# Conflicts:
# web/documentserver-example/java/README.md
2022-02-11 10:22:04 +03:00
af86ec1ca3
update submodule
2022-02-11 10:19:44 +03:00
d1d9915953
Merge pull request #257 from ONLYOFFICE/feature/userInfoGroups
...
Feature/user info groups
2022-02-11 10:15:35 +03:00
c663bfe464
Merge remote-tracking branch 'remotes/origin/develop' into feature/userInfoGroups
...
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
2022-02-11 10:14:06 +03:00
1bb7dd152a
Merge pull request #231 from ONLYOFFICE/feature/page-icons-layout
...
nodejs: change position of icons for mobile editor and filling forms
2022-02-11 10:10:37 +03:00
a52000fc97
java-spring: userInfoGroups
2022-02-11 01:22:15 +03:00
88b7fbf55c
csharp: userInfoGroups
2022-02-11 00:43:01 +03:00
f9449f7742
csharp-mvc: userInfoGroups
2022-02-11 00:38:55 +03:00
9d2b8c4830
php: userInfoGroups
2022-02-11 00:28:22 +03:00
4068e23556
ruby: userInfoGroups
2022-02-11 00:20:29 +03:00
fc760af338
python: userInfoGroups
2022-02-11 00:00:58 +03:00
c55ab7cc75
java: userInfoGroups
2022-02-10 23:56:09 +03:00
00c9b3e2b9
nodejs: userInfoGroups to help
2022-02-10 15:01:21 +03:00
47074c588d
nodejs: userInfoGroups
2022-02-10 14:25:51 +03:00
018d1bbead
ruby: update dependencies version
2022-02-09 11:43:22 +03:00
82713572ab
Merge pull request #255 from ONLYOFFICE/feature/update-readme
...
Update README.md
2022-02-09 10:59:07 +03:00
34d06235f4
format
2022-02-09 10:58:53 +03:00
468488c384
note to index page
2022-02-09 10:55:02 +03:00
ff4b387acf
Update README.md
2022-02-09 10:50:20 +03:00
20012c7678
change note in readme
2022-02-09 10:17:36 +03:00
382160f2fc
Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop
...
# Conflicts:
# web/documentserver-example/csharp-mvc/assets
# web/documentserver-example/csharp/assets
# web/documentserver-example/java-spring/src/main/resources/assets
# web/documentserver-example/java/src/main/resources/assets
# web/documentserver-example/nodejs/public/assets
# web/documentserver-example/php/assets
# web/documentserver-example/python/assets
# web/documentserver-example/ruby/public/assets
2022-02-09 10:05:10 +03:00
761e578faf
update submodule
2022-02-07 16:14:53 +03:00
7b7cbebc75
Merge pull request #254 from ONLYOFFICE/feature/changing-wopi-edit-view-icons
...
Node.js(wopi): Change wopi icons for editing and viewing actions
2022-02-07 15:53:47 +03:00
dbc5ebf098
Node.js(wopi): Change wopi icons for editing and viewing actions
2022-02-07 15:52:53 +03:00
c5d61b685b
Merge pull request #253 from ONLYOFFICE/bugfix/xss
...
fix xss vulnerability
2022-02-06 16:32:39 +03:00
f3acca4b4b
python: fix xss vulnerability
2022-02-06 16:31:16 +03:00
b92c4191f9
xss in lang
2022-02-06 16:25:52 +03:00
5b6f2696d2
xss in type
2022-02-06 16:16:51 +03:00
625df85b51
xss in actionLink
2022-02-06 15:52:58 +03:00
6716d38a40
support xlsb
2022-02-06 11:15:20 +03:00
84d574906d
Python: remove unnecessary import
2022-02-03 17:32:26 +03:00
3c760c3136
Python: update pyjwt, fix jwtManager (remove decode)
2022-02-03 17:29:47 +03:00
bf28236d0d
Python: fix urls (accidental deletion of a path saveus)
2022-02-01 17:13:27 +03:00
6d71a553be
С#: add absolute path support for document history
2022-02-01 17:03:16 +03:00
fed5598294
С#: remove unnecessary construction
2022-02-01 16:00:50 +03:00
02351113e1
С# mvc: remove unnecessary functions and constructions
2022-02-01 15:55:36 +03:00
a07edeb5de
Python: linux support (bug with json jwt decoding)
2022-02-01 15:19:15 +03:00
5bbc4c6232
Ruby: remove unnecessary action (version encoding)
2022-01-31 16:28:34 +03:00
770c2fe551
PHP: fix code
2022-01-31 15:03:41 +03:00
4916537977
Java-spring: fix the code
2022-01-31 15:01:39 +03:00
77ec1649a5
Java: fix the code and remove the encoding of the url version
2022-01-31 15:00:27 +03:00
204ff947c3
Python: fix code
2022-01-31 14:02:06 +03:00
d36fe2466a
C#: add time for unique key
2022-01-27 11:53:10 +03:00
e927da28f5
C# mvc: add time for unique key
2022-01-27 11:52:49 +03:00
17b5c6e4c9
C#: Add history creation for the first version of the file
2022-01-27 11:50:30 +03:00
03f853dfef
C# mvc: Add history creation for the first version of the file
2022-01-27 11:49:21 +03:00
1d7e65b2ba
Python: fix bug with absolute storage path
2022-01-26 15:02:31 +03:00
8ebb67c925
Python: fix merge diff + prev
2022-01-26 14:59:40 +03:00
8524ff27ed
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
2022-01-26 13:45:33 +03:00
7bedc4b877
Merge pull request #250 from ONLYOFFICE/feature/add-wopi-users
...
Node.js (wopi): Add selected user to editor
2022-01-24 13:14:40 +03:00
f25c211630
Merge pull request #251 from ONLYOFFICE/feature/filetype
...
Feature/filetype
2022-01-24 12:12:12 +03:00
0f4785d14f
python: correct code (Support old versions)
2022-01-24 11:07:28 +03:00
288add4d45
python: correct code (Support old versions)
2022-01-24 10:56:57 +03:00
1ee492838c
python: correct filetype arg
2022-01-21 16:35:33 +03:00
f9ce3d1d33
nodejs: correct filetype arg
2022-01-21 15:51:16 +03:00
5f6687571a
Node.js (wopi): changing the receipt of a wopi query
2022-01-20 17:11:59 +03:00
a1e5a4d48e
Node.js (wopi): Add selected user to editor
2022-01-19 19:05:21 +03:00
6e9518631f
Merge pull request #246 from ONLYOFFICE/feature/add-upload-wopi
...
Feature/add upload wopi
2022-01-19 18:07:31 +03:00
88d8086853
Node.js (wopi): Add support InternetExplorer
2022-01-19 17:59:31 +03:00
d22f4f11ca
Java-Spring: jwt prev + diff
2022-01-19 17:20:48 +03:00
29cbe66d09
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
2022-01-18 18:16:53 +03:00
c2410268eb
Java: Merge jwt prev + diff
2022-01-18 17:41:59 +03:00
57cd71095d
С# mvc: Merge jwt prev + diff
2022-01-18 17:00:56 +03:00
224d2bc570
С#: Merge jwt prev + diff
2022-01-18 16:25:13 +03:00
c7f18f1085
Node.js (wopi): Fix filter
2022-01-18 15:39:16 +03:00
fb05ad32ab
Merge remote-tracking branch 'remotes/origin/develop' into feature/add-upload-wopi
2022-01-18 14:49:28 +03:00
bac989efd1
Node.js (wopi): Filter extensions from config that are in discovery for edit action (+ Checking the Fano condition)
2022-01-17 18:36:47 +03:00
8a203ac062
Node.js (wopi): button layout for upload
2022-01-17 18:33:49 +03:00
7e1386008b
Merge pull request #249 from ONLYOFFICE/feature/wopi-layout
...
Feature/wopi layout
2022-01-17 15:15:10 +03:00
8ff206a411
Node.js wopi: add information when hovering over the info icon
2022-01-17 14:06:59 +03:00
83a0330725
Merge pull request #245 from ONLYOFFICE/feature/wopi-editing
...
Feature/wopi editing
2022-01-17 11:23:27 +03:00
c5269a53cf
Merge pull request #244 from ONLYOFFICE/bugfix/customization-fix-JavaExample
...
fix Customization in Java and JavaSpringExample
2022-01-17 11:12:32 +03:00
f86b26928d
Node.js(wopi): create a unique version code
2022-01-14 19:29:46 +03:00
f8d77947c8
Node.js(wopi): layout of the index page (delete extra info users and checkbox simple)
2022-01-14 19:28:09 +03:00
a62ac23aeb
PHP: Merge jwt prev + diff (There is a bug with the history display)
2022-01-14 18:02:28 +03:00
a900183056
Merge pull request #241 from ONLYOFFICE/feature/fileTypeInsteadParsing
...
Feature/file type instead parsing
2022-01-14 16:52:30 +03:00
67d34f4bfa
format
2022-01-14 16:52:12 +03:00
507a7f3162
Ruby: Merge jwt prev + diff
2022-01-13 18:08:40 +03:00
703281aa07
Node.js: Fix code. The direct link has been replaced with a stream output
2022-01-13 16:00:19 +03:00
aefec3e105
Python: Merge jwt prev + diff
2022-01-12 18:14:48 +03:00
8cc211b011
Node.js: Merge jwt prew + diff
2022-01-12 17:49:52 +03:00
68ec626970
C# mvc: fix code
2022-01-11 18:19:14 +03:00
065f338a79
C#: fix code
2022-01-11 18:18:54 +03:00
43548c04b9
Node.js: fix code (Made links through ready-made functions)
2022-01-11 17:52:40 +03:00
c7c95ecfbe
Node.js: fix upload page (links [edit, view] ) for wopi upload files
2022-01-11 17:34:34 +03:00
064c0dcc35
C#: fix code
2022-01-11 16:42:26 +03:00
9a01f465d0
C# mvc: fix code
2022-01-11 16:42:01 +03:00
2d85a4166e
Ruby: fix code
2022-01-11 15:07:19 +03:00
77c598049c
I added universal content type in JavaSpringExample
2022-01-11 13:09:17 +03:00
c1baac3d6f
content type Python Example FIX Commit
2022-01-11 12:58:32 +03:00
c5e30b6512
fix Application header in Node JS example
2022-01-11 12:55:19 +03:00
0fa6f43716
FixCommit content-type for Ruby
2022-01-11 12:48:28 +03:00
edc43bdf31
fix commit С# and C# MVC content type
2022-01-11 12:42:03 +03:00
f75453bf2d
I fixed JWT for diff.zip Node JS Example
2022-01-11 12:35:26 +03:00
d03326a1e1
I fixed check JWT for Diff.zip in C# MVC Example
2022-01-11 11:39:43 +03:00
8be501a0ab
Fix Commit for Diff.zip JWT in C#
2022-01-11 11:26:59 +03:00
a4c71eb69a
JWT for diff.zip fix commit
2022-01-11 10:58:13 +03:00
132545c655
I added jwt check before giving diff in Python Example FIX Commit
2022-01-11 10:43:40 +03:00
5caaf0b1c6
Merge branch 'develop' into feature/jwtHistoryFiles
2022-01-10 19:00:27 +03:00
8f18cc8ab2
Merge branch 'feature/fileTypeInsteadParsing' of github.com:ONLYOFFICE/document-server-integration into feature/fileTypeInsteadParsing
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs
2022-01-10 18:49:43 +03:00
db976766cc
Ruby: fix[support old version] fileType instead parsing
2022-01-10 18:47:02 +03:00
57f6028829
Python: fix[support old version] fileType instead parsing
2022-01-10 18:46:03 +03:00
05706ff038
PHP: fix[support old version] fileType instead parsing
2022-01-10 18:45:27 +03:00
9cf7ce276e
Node.js: fix[support old version] fileType instead parsing
2022-01-10 18:45:03 +03:00
0b35179ef0
Java-spring: fix[support old version] fileType instead parsing
2022-01-10 18:44:35 +03:00
d396f92f4d
Java : fix[support old version] fileType instead parsing
2022-01-10 18:44:01 +03:00
1e78da4cfc
C#: fix[support old version] fileType instead parsing
2022-01-10 18:42:41 +03:00
a8c9c331c1
C# mvc: fix[support old version] fileType instead parsing
2022-01-10 18:41:54 +03:00
0b2e09cf1d
Ruby JWT FIX for diff.zip
2022-01-10 17:40:05 +03:00
f81ae23a64
Merge branch 'feature/jwtHistoryFiles' of github.com:ONLYOFFICE/document-server-integration into feature/jwtHistoryFiles
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/ruby/licenses/3rd-Party.license
2022-01-10 17:08:45 +03:00
6f90ff3391
Check JWT in JavaSpringExample
2022-01-10 16:37:54 +03:00
4f3882f892
Merge pull request #248 from ONLYOFFICE/feature/ruby-add-mimemagic
...
Add licenses of mimemagic on ruby
2022-01-10 16:08:31 +03:00
727418277f
ruby: correct license
2022-01-10 16:08:14 +03:00
2f795de6ad
Merge pull request #247 from ONLYOFFICE/feature/fileType
...
Feature/file type
2022-01-10 16:03:35 +03:00
bb28257a2d
Merge remote-tracking branch 'remotes/origin/develop' into feature/fileType
...
# Conflicts:
# web/documentserver-example/php/doceditor.php
2022-01-10 16:03:18 +03:00
379dba8b7c
Merge branch 'feature/jwtForDiffZip' of https://github.com/ONLYOFFICE/document-server-integration into feature/jwtForDiffZip
2022-01-10 16:00:49 +03:00
05ea165f77
format
2022-01-10 16:00:41 +03:00
7a61fac6b7
Add licenses of mimemagic on ruby
2022-01-10 15:57:57 +03:00
31c3e050af
I do check diff.zip for javaExample
2022-01-10 15:45:40 +03:00
0c677f3d65
Delete mimemagic on Ruby to do it on a new branch
2022-01-10 15:41:09 +03:00
6efa357c19
Delete mimemagic on Ruby in order to add in a new branch
2022-01-10 15:36:13 +03:00
3b33846f9d
fix fileRemove and links on wopi (node.js)
2022-01-10 15:27:16 +03:00
3de8463359
Add ConverExtList and EditedExtList for wopi upload files
2022-01-10 14:18:55 +03:00
e05ead7ce6
Review and change jwt signature on python (via handler)
2022-01-10 13:01:12 +03:00
cdc8647f21
LICENSE for mimemagic on Ruby
2022-01-10 13:01:11 +03:00
c2b333fac7
fix commit
2022-01-10 13:01:11 +03:00
cae75d9888
jwt signature for prev.* files C# mvc (via handler) on Net4.8
2022-01-10 12:59:18 +03:00
ee674e6a57
jwt signature for prev.* files C# (via handler)
2022-01-10 12:57:22 +03:00
7207a9d860
jwt signature for prev.* files java-spring (via handler)
2022-01-10 12:53:41 +03:00
8cc5f685af
Add link(handler) to onRequestHistoryData jwt Java
2022-01-10 12:53:41 +03:00
a61a8ccb4f
jwt signature for prev.* files. Java (via handler) + README.md (Build point)
2022-01-10 12:53:41 +03:00
e857a2bed7
jwt signature for prev.* files. PHP (via handler)
2022-01-10 12:53:40 +03:00
514303d053
jwt signature for prev.* files. Ruby (by redirection)
2022-01-10 12:53:40 +03:00
7d4f511a5d
jwt signature for prev.* files. Python
2022-01-10 12:53:40 +03:00
9b11e8b098
jwt signature for prev.* files node.js
2022-01-10 12:53:39 +03:00
8351905cee
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtForDiffZip
2022-01-10 12:32:09 +03:00
15b7a07963
Merge pull request #242 from ONLYOFFICE/feature/bugRubyEditor
...
Feature/bug ruby editor
2022-01-10 12:30:47 +03:00
ef1c53d330
ruby: fix bug of displaying the editor
2022-01-10 12:30:28 +03:00
9bcb871132
nodejs: format
2022-01-10 11:22:56 +03:00
25a4b9c97b
revert assets after merge d115e4092f
2022-01-10 11:07:46 +03:00
a21fbd6802
java-spring: revert format
2022-01-10 10:58:25 +03:00
c7249ab27f
Add upload files for wopi on the node.js
2021-12-30 18:28:55 +03:00
450d37161b
Preparing a wopi task for PR
2021-12-30 16:53:30 +03:00
ee46a77684
Removing link to "editnew" in the file line
2021-12-29 19:20:33 +03:00
3b7e3c9258
Аdd action processing ("editnew" and "edit") and Create files only through "editnew"
2021-12-29 19:20:08 +03:00
783ad9f2de
fix Customization in Java and JavaSpringExample
2021-12-29 13:30:11 +03:00
78571f6c23
FixCommit
2021-12-28 18:35:52 +03:00
a5c0b9bfb1
FixCommit
2021-12-28 18:31:48 +03:00
5047e64f3b
php: revert format
2021-12-28 14:32:35 +03:00
d115e4092f
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtForDiffZip
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/php/common.php
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/ruby/Gemfile
# web/documentserver-example/ruby/app/models/document_helper.rb
2021-12-28 14:29:37 +03:00
e7a1c2c6eb
c# example check JWT for diff.zip
2021-12-28 11:34:45 +03:00
85f95ba4b9
C# MVC I Added header fileName = diff.zip
2021-12-28 11:34:16 +03:00
133013dfde
Check JWT for diff.zip C# test-example
2021-12-28 11:11:58 +03:00
6acdc34e10
Start C# Example for diff.zip
2021-12-27 10:29:45 +03:00
19304920d1
fileType instead parsing url to save doc in C# MVC (take fileType out of body)
2021-12-24 18:13:12 +03:00
13b3eed5ed
fileType instead parsing url to save doc in C# (take fileType out of body)
2021-12-24 18:12:40 +03:00
d9c1c7e051
fileType instead parsing url to save doc in Java-Spring (take fileType out of body)
2021-12-24 17:54:41 +03:00
2d0b17e334
fileType instead parsing url to save doc in Java (take fileType out of body)
2021-12-24 17:13:28 +03:00
384381cebc
fileType instead parsing url to save doc in PHP (take fileType out of body)
2021-12-24 16:52:10 +03:00
16d830baf4
[fix] fileType instead parsing url to save doc in Python (take fileType out of body)
2021-12-24 16:51:48 +03:00
efcfaf95e8
[fix] fileType instead parsing url to save doc in node.js (take fileType out of body)
2021-12-24 16:50:23 +03:00
606f7d2d44
[fix] fileType instead parsing url to save doc in Ruby (take fileType out of body)
2021-12-24 16:47:57 +03:00
357c14b6d4
Check JWT for diff.zip in Ruby Example
2021-12-23 18:43:24 +03:00
c5a2b72b39
fileType instead parsing url to save doc in Ruby (take fileType out of body)
2021-12-23 18:29:31 +03:00
dab9e4bb16
fileType instead parsing url to save doc in Python (take fileType out of body)
2021-12-23 18:24:28 +03:00
27b6cb3293
Review and change jwt signature on python (via handler)
2021-12-23 17:49:26 +03:00
058b0c4f23
fileType in body Instead Parsing url on node.js
2021-12-22 20:21:08 +03:00
05c62bbdf3
LICENSE for mimemagic on Ruby
2021-12-22 19:01:25 +03:00
425bd81f08
fix commit
2021-12-22 18:20:29 +03:00
096102fa59
Merge branch 'develop' into feature/jwtHistoryFiles
2021-12-22 17:13:10 +03:00
c612320a65
JWT for diff.zip php example - good working example
2021-12-22 14:05:19 +03:00
e0b60a6956
JWT for diff.zip php example
2021-12-22 11:06:10 +03:00
16a0846248
jwt signature for prev.* files C# mvc (via handler) on Net4.8
2021-12-21 18:24:02 +03:00
71e1b28f47
jwt signature for prev.* files C# (via handler)
2021-12-21 17:45:42 +03:00
182f5f378e
I added jwt for diff.zip
2021-12-21 13:28:05 +03:00
9d3f4b2300
jwt signature for prev.* files java-spring (via handler)
2021-12-20 18:41:38 +03:00
ab3d385c61
I added JWT validation for diff.zip in JavaSpring Example
2021-12-20 14:20:15 +03:00
8d194b78a1
Update samples
2021-12-20 11:29:02 +03:00
b8e726a7be
Update pptx sample
2021-12-20 11:02:24 +03:00
dfd2d49e6c
Add link(handler) to onRequestHistoryData jwt Java
2021-12-17 15:39:38 +03:00
fbe0c18315
Merge pull request #238 from ONLYOFFICE/feature/update-readme
...
Readme
2021-12-16 18:10:38 +03:00
ec6ea72069
small fixes for readme files
2021-12-16 17:51:01 +03:00
2accdeac3b
jwt signature for prev.* files. Java (via handler) + README.md (Build point)
2021-12-16 17:43:01 +03:00
63f4b6fbb6
I added jwt check before giving diff in Python Example
2021-12-15 17:37:15 +03:00
642caddae8
jwt signature for prev.* files. PHP (via handler)
2021-12-15 16:23:23 +03:00
dac09bd1e1
jwt signature for prev.* files. Ruby (by redirection)
2021-12-14 19:26:56 +03:00
c6e3af5d3b
Merge pull request #236 from ONLYOFFICE/feature/csharp-server-configuration
...
csharp and csharp-mvc readme
2021-12-13 16:59:39 +03:00
183fb80077
jwt signature for prev.* files. Python
2021-12-13 16:53:05 +03:00
63c3337938
Merge pull request #226 from ONLYOFFICE/bugfix/java-fixes
...
Bugfix/java fixes
2021-12-13 16:34:08 +03:00
0268298f2b
Merge remote-tracking branch 'remotes/origin/develop' into bugfix/java-fixes
...
# Conflicts:
# web/documentserver-example/java-spring/README.md
2021-12-13 16:32:54 +03:00
32ea01784c
Merge pull request #234 from ONLYOFFICE/bugfix/group-fix
...
replace group value null with empty string
2021-12-13 16:27:14 +03:00
8e4a2c6359
I added jwt check before giving diff
2021-12-13 16:21:15 +03:00
71041fea9f
Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath
...
Feature/pptx xpath
2021-12-13 16:16:54 +03:00
8b25a7a869
ruby: v 3.0
2021-12-13 16:02:48 +03:00
dd20d79236
Merge pull request #230 from ONLYOFFICE/feature/ruby-3.0
...
ruby 3.0 version
2021-12-13 15:47:25 +03:00
299a68e0bd
Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes
...
fix layout
2021-12-13 15:42:15 +03:00
9ad27d2cf0
Merge pull request #216 from ONLYOFFICE/feature/change-files-folder
...
Feature/change files folder
2021-12-13 15:39:26 +03:00
828115e5b0
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
...
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java
2021-12-13 15:38:37 +03:00
461a005cfa
Merge pull request #237 from ONLYOFFICE/develop
...
Release/1.1.0
2021-12-13 11:45:38 +03:00
24cfd661ef
1.1.0
2021-12-13 11:34:05 +03:00
6481ac7e13
update presentation sample
2021-12-13 11:21:56 +03:00
a194af0d19
jwt signature for prev.* files node.js
2021-12-10 20:29:15 +03:00
c0d240728d
edit (fileType in setHistoryData for php)
2021-12-10 17:49:09 +03:00
89c0f03318
csharp: added information about the IIS components
2021-12-09 17:22:39 +03:00
bc1c9f455c
fileType in setHistoryData for ruby (+ Gemfile)
2021-12-08 17:25:43 +03:00
df1a5f38c1
fileType in setHistoryData for python
2021-12-08 17:25:01 +03:00
6559c76fbd
fileType in setHistoryData for php
2021-12-08 17:24:30 +03:00
a7db14811f
fileType in setHistoryData for node.js
2021-12-08 17:23:37 +03:00
abffa3e75f
fileType in setHistoryData for java
2021-12-08 17:23:00 +03:00
631f70148f
fileType in setHistoryData for java-spring
2021-12-08 17:22:36 +03:00
c7e7c9c19d
fileType in setHistoryData for C#
2021-12-08 17:21:54 +03:00
f2d4eb2a42
fileType in setHistoryData for C# mvc
2021-12-08 17:20:19 +03:00
778cb91317
Merge pull request #235 from ONLYOFFICE/feature/docserv_old_version
...
docxf and oform since v7.0
2021-12-08 14:03:12 +03:00
beb9885b03
docxf and oform since v7.0
2021-12-08 14:00:04 +03:00
65e34e52f9
nodejs: docxf and oform since v7.0
2021-12-07 18:41:42 +03:00
b453aa19f0
replace group value null with empty string
2021-12-02 17:39:48 +03:00
600570f7c7
Merge pull request #232 from ONLYOFFICE/feature/rename-master-form
...
Feature/rename master form
2021-12-02 11:54:00 +03:00
20f28afec1
rename master form to form template
2021-12-02 11:32:07 +03:00
2768ca5f6c
nodejs: rename master form to form template
2021-12-02 11:21:53 +03:00
7841822c54
delete unused block
2021-12-02 10:37:05 +03:00
f3e24a8b5e
nodejs: delete unused block
2021-12-01 22:31:08 +03:00
2425898cc8
nodejs: doc is not fillable format
2021-11-30 09:07:43 +03:00
8d85281be8
nodejs: frame allow attributes
2021-11-29 11:16:05 +03:00
081d704a8b
nodejs: frame sanbox attributes
2021-11-29 11:00:53 +03:00
d3b962dcb8
fix layout
2021-11-26 15:45:53 +03:00
2949d24b49
Merge pull request #228 from ONLYOFFICE/bugfix/wopi-hover-fix
...
nodejs: wopi fix layout on hover
2021-11-26 10:20:10 +03:00
2f0d783ba6
nodejs: wopi fix layout on hover
2021-11-25 17:51:17 +03:00
644d9b8ba6
nodejs: create docxf(wopi)
2021-11-25 16:12:40 +03:00
7184928a6c
update assets
2021-11-25 11:02:20 +03:00
2d7df99daf
python: fix readme
2021-11-22 11:21:53 +03:00
5339b60226
Merge pull request #227 from ONLYOFFICE/bugfix/fix-styles
...
ruby and java: fix media styles
2021-11-22 10:03:35 +03:00
5e0f54be68
ruby and java: fix media styles
2021-11-21 14:13:46 +03:00
3cee92d3a3
nodejs: change position of icons for mobile editor and filling forms
2021-11-19 16:15:58 +03:00
77c6715481
Merge pull request #223 from ONLYOFFICE/feature/java-spring-comments
...
Comments for Java Spring
2021-11-18 13:03:07 +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
d3639d1697
java-sprong: added comments
2021-11-18 12:47:26 +03:00
40016395a8
java-spring: update README.md, set empty server.address
2021-11-18 12:35:29 +03:00
b6c0bf4db0
Merge pull request #225 from ONLYOFFICE/feature/docxf
...
Feature/docxf
2021-11-17 18:31:47 +03:00
3be5035ab3
php: docxf
2021-11-17 16:52:10 +03:00
ad9d627c82
csharp: docxf
2021-11-17 16:46:09 +03:00
a26a559921
csharp-mvc: docxf
2021-11-17 16:34:20 +03:00
cf2f60f8cd
ruby: docxf
2021-11-17 16:24:46 +03:00
80e1be2261
python: docxf
2021-11-17 15:38:14 +03:00
a3e84f50fa
java: docxf
2021-11-17 15:28:19 +03:00
796433cf8a
java-spring: docxf
2021-11-17 15:15:31 +03:00
7309d942d6
java-spring: fix permissions
2021-11-17 15:12:04 +03:00
b5c90ee7d5
Merge remote-tracking branch 'remotes/origin/develop' into feature/docxf
2021-11-17 13:04:36 +03:00
8688ef1db5
Merge pull request #224 from ONLYOFFICE/feature/oform
...
Feature/oform
2021-11-17 13:01:49 +03:00
56a4f6073d
php: opening uploaded form
2021-11-17 12:14:32 +03:00
6d67b740b6
php: filling on mobile
2021-11-17 12:10:18 +03:00
e97fe56914
php: revert filling in docx
2021-11-17 12:06:34 +03:00
946819926f
php: hide submit button
2021-11-17 11:55:18 +03:00
e89b6040fb
php: oform
2021-11-17 11:53:52 +03:00
d673fd86e0
csharp: opening uploaded form
2021-11-17 11:10:14 +03:00
901b2a83fa
csharp: filling on mobile
2021-11-17 11:08:22 +03:00
08119d7458
csharp: revert filling in docx
2021-11-17 11:00:49 +03:00
d1fee87d8d
python, csharp-mvc: fix layout
2021-11-17 11:00:26 +03:00
83cefae85b
csharp: hide submit button
2021-11-17 10:48:36 +03:00
f1a64c92d2
csharp: oform
2021-11-17 10:47:50 +03:00
8f2c2f96d2
java: fix docker
2021-11-17 00:10:28 +03:00
f9dbe89fd9
java-spring: fix docker, clean up application.properties
2021-11-16 18:48:52 +03:00
c3a4c0a66b
java: add fields owner and uploaded for document info
2021-11-16 17:52:07 +03:00
cb583e48e3
csharp-mvc: opening uploaded form
2021-11-16 17:43:47 +03:00
c3878a9431
csharp-mvc: filling on mobile
2021-11-16 17:37:05 +03:00
50821067d7
csharp-mvc: revert filling in docx
2021-11-16 17:32:09 +03:00
18bd45e4ab
csharp-mvc: hide submit button
2021-11-16 17:28:06 +03:00
79aac3ccd6
csharp-mvc: oform
2021-11-16 16:55:49 +03:00
fac436f5e6
python: opening uploaded form
2021-11-16 16:20:08 +03:00
a4600b31a6
python: filling on mobile
2021-11-16 16:16:15 +03:00
b52196ec91
python: revert filling in docx
2021-11-16 16:13:39 +03:00
2314e74ade
python: hide submit button
2021-11-16 16:08:40 +03:00
59801951e6
python: oform
2021-11-16 16:07:30 +03:00
3233e257cb
ruby: opening uploaded form
2021-11-16 15:20:09 +03:00
6b4f56373e
ruby: filling on mobile
2021-11-16 15:17:20 +03:00
cd1a312aba
ruby: revert filling in docx
2021-11-16 15:13:32 +03:00
8cd0297917
ruby: hide submit button
2021-11-16 15:06:03 +03:00
4568dcfdce
ruby: oform
2021-11-16 15:05:06 +03:00
ace2677062
java: revert filling in docx
2021-11-16 13:56:06 +03:00
d3cd62f5ae
java: opening uploaded form
2021-11-16 13:35:55 +03:00
c7cd0ba828
java: filling on mobile
2021-11-16 13:32:15 +03:00
5cb3267660
java: hide submit button
2021-11-16 13:25:33 +03:00
1a2c68abe8
java: oform
2021-11-16 13:24:37 +03:00
cbaebe50c0
Merge pull request #222 from ONLYOFFICE/feature/save-as
...
Feature/save as
2021-11-16 13:02:36 +03:00
c8aac65af6
java-spring: opening uploaded form
2021-11-16 12:56:28 +03:00
5f8e9370a7
java-spring: mobile-fill-forms.svg
2021-11-16 12:52:39 +03:00
7fd0882c06
java-spring: filling on mobile
2021-11-16 12:51:52 +03:00
c6a8cd0ff1
java-spring: revert filling in docx
2021-11-16 12:32:21 +03:00
73797dcf31
java-spring: hide submit button
2021-11-16 12:22:06 +03:00
19ebecd4d0
java-spring: oform
2021-11-16 12:20:00 +03:00
bee95b4e6a
php: add Copy File as...
2021-11-15 18:15:30 +03:00
4418d8e5d5
csharp and csharp-mvc: fix error messages
2021-11-15 17:38:46 +03:00
873267a784
csharp-mvc: add Copy File as...
2021-11-15 17:08:24 +03:00
605028151f
csharp: add Copy File as...
2021-11-15 17:00:04 +03:00
2429668b57
ruby: add Copy File as...
2021-11-15 16:02:11 +03:00
5ecb4226e8
python: add Save Copy as...
2021-11-15 14:24:03 +03:00
7f4165f958
java: add Save Copy as...
2021-11-15 13:49:30 +03:00
7cd7f1bf66
java-spring: add Save Copy as...
2021-11-15 13:12:42 +03:00
608c21c60b
Merge remote-tracking branch 'remotes/origin/develop' into feature/save-as
2021-11-15 12:17:25 +03:00
f44af24267
nodejs: docxf
2021-11-15 12:15:34 +03:00
be7a1e8ab2
nodejs: opening uploaded form
2021-11-15 12:15:09 +03:00
9bab8edc3c
using innerAlert in onRequestSendNotify
2021-11-15 11:48:17 +03:00
4d852a23cd
nodejs: filling on mobile
2021-11-15 11:20:08 +03:00
a497401b30
nodejs: revert filling in docx
2021-11-15 11:20:07 +03:00
94cb70c0db
nodejs: hide submit button
2021-11-15 11:20:07 +03:00
8e60c60e46
nodejs: oform
2021-11-15 11:20:06 +03:00
1cd275188b
nodejs: onRequestSaveAs event
2021-11-15 11:20:05 +03:00
edd423cd87
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-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java
2021-11-09 19:04:30 +03:00
e026a7027b
java-spring: check if storage directory does not exist
2021-11-09 18:31:09 +03:00
70836bb67d
nodejs: using innerAlert
2021-11-09 14:42:35 +03:00
0de0b172c0
Merge pull request #221 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.12.5
...
build(deps): bump nokogiri from 1.11.5 to 1.12.5 in /web/documentserver-example/ruby
2021-11-08 11:48:48 +03:00
adc549bf7e
Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.12.5
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2021-11-08 11:46:30 +03:00
8de69d18cb
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.5 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.5...v1.12.5 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-11-04 19:39:12 +00:00
11e8f40f8c
ruby: fix embedded mode; fix media.css connect
2021-11-02 18:13:45 +03:00
bf18854ec0
csharp-mvc: fix embedded mode
2021-11-02 17:46:41 +03:00
08d1080527
csharp: fix embedded mode
2021-11-02 17:40:00 +03:00
9ca242fe82
python: fix storage path and embedded mode
2021-11-02 16:59:20 +03:00
b3c02a5afd
php: fix embedded
2021-11-02 16:13:00 +03:00
ec65ebbfb8
php: layout fix
2021-11-02 16:01:39 +03:00
8544974202
java: layout fix
2021-11-02 16:01:16 +03:00
90eeae5334
php: fix file upload
2021-11-02 15:35:25 +03:00
970cfa6dd0
nodejs: fix embedded
2021-11-02 15:24:44 +03:00
f04a26a0f4
nodejs: fix file upload
2021-11-02 15:11:34 +03:00
02eceb6565
Merge pull request #220 from ONLYOFFICE/bugfix/fix-discovery
...
nodejs: check discovery["wopi-discovery"] is exist
2021-11-02 14:50:45 +03:00
53a58e2666
java: fix embedded mode
2021-11-02 14:33:29 +03:00
f5371db950
nodejs: check discovery["wopi-discovery"] is exist
2021-11-02 13:53:36 +03:00
0ab0762aa5
java: remove urlUser param from config
2021-11-02 11:26:11 +03:00
64f82872b3
Merge pull request #215 from ONLYOFFICE/bugfix/java-spring-fix
...
Bugfix/java spring fix
2021-11-02 10:03:39 +03:00
7ff4c65a91
Merge pull request #219 from ONLYOFFICE/bugfix/csharp-mvc-fix
...
csharp-mvc: fix select user
2021-11-02 09:52:21 +03:00
f272654532
Merge pull request #207 from ONLYOFFICE/bugfix/wopi-host
...
nodejs: wopi userhost from header
2021-11-02 09:46:02 +03:00
39e7cea624
java-spring: fix save file
2021-11-01 17:41:25 +03:00
b36f96f9c8
java-spring: fix create sample file
2021-11-01 16:44:42 +03:00
8b3b3268bf
java-spring: fix ability to create new file from editor for Anonymous
2021-11-01 16:05:15 +03:00
5d2abdb634
java-spring: remove random favorite flag
2021-11-01 15:23:39 +03:00
3556073f5c
java-spring: fix switch to edit mode from editor
2021-11-01 15:08:04 +03:00
b724366c33
java-spring: fix casting date
2021-11-01 13:16:27 +03:00
aeff6a4e9e
java-spring: replace from DefaultCallbackManager.java to LocalFileStorage.java
2021-11-01 13:06:21 +03:00
97dad58428
java-spring: fix filename
2021-11-01 12:44:51 +03:00
2ce861d39b
java-spring: replace if by switch
2021-11-01 12:42:55 +03:00
9d21924160
csharp-mvc: fix select user
2021-10-29 17:35:52 +03:00
48239b29aa
Merge pull request #218 from ONLYOFFICE/bugfix/csharp-mvc
...
csharp-mvc: fix view mode on upload
2021-10-29 16:03:53 +03:00
b2545c6289
csharp-mvc: fix view mode on upload
2021-10-28 16:42:56 +03:00
c7907e13be
Merge pull request #213 from ONLYOFFICE/feature/replace-syncrequest
...
Feature/replace syncrequest
2021-10-27 17:50:26 +03:00
7bea2f6e49
nodejs: delete sync-request.license ( e25f27c304)
2021-10-27 15:46:17 +03:00
4b79d778de
nodejs: wait actions data from discovery
2021-10-27 15:21:48 +03:00
1fe0769a2c
nodejs: check callback data
2021-10-27 14:27:16 +03:00
e25f27c304
nodejs: delete sync-request.license
2021-10-27 13:43:39 +03:00
ed22141a63
Merge pull request #217 from ONLYOFFICE/bugfix/view-mode
...
csharp: fix view mode on upload
2021-10-26 18:13:25 +03:00
589e59c13c
Merge pull request #214 from ONLYOFFICE/feature/file-maxsize
...
csharp and csharp-mvc: update max file size
2021-10-26 18:10:22 +03:00
1e6585e324
Merge pull request #212 from ONLYOFFICE/bugfix/password ( b1a00854de)
...
Bugfix/password
2021-10-26 18:05:39 +03:00
3b283d6e80
Merge pull request #211 from ONLYOFFICE/bugfix/included-files
...
csharp and csharp-mvc: clean up included files
2021-10-26 17:56:59 +03:00
15576a53a5
csharp: fix view mode on upload
2021-10-25 12:24:14 +03:00
2e812c4584
java-spring: fix forcesave
2021-10-25 11:07:30 +03:00
c578099c03
java-spring: document info
2021-10-25 10:19:33 +03:00
35ab4b678d
java-spring: fix deleting history folder
2021-10-22 17:17:38 +03:00
4446196919
java-spring: fix creating file
2021-10-21 18:55:13 +03:00
90a6514b6e
http protocol
...
Revert "https://documentserver/ "
This reverts commit ceb4db9de6 .
# Conflicts:
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/java/src/main/resources/settings.properties
# web/documentserver-example/nodejs/config/default.json
# web/documentserver-example/php/config.php
# web/documentserver-example/ruby/config/application.rb
2021-10-21 12:19:48 +03:00
693941a949
java-spring: fix coediting
2021-10-21 11:08:08 +03:00
e5cbac6d89
java-spring: fix deleting files
2021-10-20 18:40:39 +03:00
43d60f2adc
csharp and csharp-mvc: update max file size
2021-10-20 16:05:00 +03:00
4aeef2b873
php: fix highlighting of changes in history
2021-10-19 12:40:21 +03:00
60c03c1403
csharp-mvc: fix history
2021-10-19 11:41:28 +03:00
a82258269a
nodejs: replace syncRequest by urllib
2021-10-18 16:10:13 +03:00
b9654f722e
filePass fix
2021-10-18 15:33:44 +03:00
0f82f8bc30
nodejs: replace syncRequest by urlLib
2021-10-18 15:28:10 +03:00
c20bf3a527
nodejs: fix filePass
2021-10-18 14:55:44 +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
5206171a70
php: add ability to use custom path for files storage
2021-10-17 15:38:02 +03:00
4ebe9b5832
csharp and csharp-mvc: clean up included files
2021-10-16 13:41:57 +03:00
3a11a42f9e
Merge pull request #210 from ONLYOFFICE/bugfix/sharp-mvc-fix
...
csharp-mvc: fix
2021-10-15 16:37:01 +03:00
841fd9f27f
Merge remote-tracking branch 'remotes/origin/bugfix/sharp-mvc-fix' into develop
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
2021-10-15 16:36:22 +03:00
79326160a6
csharp-mvc: fix
2021-10-15 16:28:52 +03:00
6112ff4d02
nodejs: stop retrying get discovery ( eee6246d0c)
2021-10-15 16:20:41 +03:00
f84a031581
Merge pull request #209 from ONLYOFFICE/feature/conversion-region
...
Feature/conversion region
2021-10-15 16:04:57 +03:00
375d916fe2
csharp-mvc: add ability to use custom path for files storage
2021-10-15 14:34:35 +03:00
a9e2df73ca
add region(lang) param to convert
2021-10-15 13:50:15 +03:00
fd456f59e8
nodejs: wopi workaround ( 1e72167e7d) (waiting ONLYOFFICE/document-server-package#218 )
2021-10-15 13:20:04 +03:00
d4f4b2bd95
nodejs: change address builder
2021-10-15 13:19:56 +03:00
35afb7a8fe
csharp: add ability to custom path for files storage
2021-10-15 13:12:58 +03:00
8d1c4d8042
java-spring: add ability to use custom path for files storage
2021-10-14 12:28:36 +03:00
b969944ede
python: update readme.md
2021-10-14 12:21:42 +03:00
da7450c732
ruby: add ability to use custom path for files storage
2021-10-14 12:19:45 +03:00
1db5e865a6
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
2021-10-14 12:11:38 +03:00
34b066f846
nodejs: add region parameter to conversation
2021-10-13 18:51:41 +03:00
9e9f177508
nodejs: adding events before initialization ( 07d11f0bae)
2021-10-12 15:04:47 +03:00
1392a567d7
nodejs: display error message
2021-10-12 10:43:43 +03:00
8ed261dabc
Merge pull request #206 from ONLYOFFICE/bugfix/info-block-max-width
...
add max-width to portal info block
2021-10-12 10:23:19 +03:00
27982b0aa6
remove unused
2021-10-12 10:10:34 +03:00
08edfca9b0
Merge pull request #208 from ONLYOFFICE/bugfix/layout-misprint
...
fix layout misprints
2021-10-12 10:06:32 +03:00
a4122c1393
csharp and csharp-mvc: layout misprint
2021-10-11 17:22:08 +03:00
a412f3f591
ruby and php: delete misprint quotes
2021-10-11 14:19:02 +03:00
01132d78c2
add max-width to portal info block
2021-10-08 16:15:16 +03:00
b61e7574bb
Merge pull request #204 from ONLYOFFICE/bugfix/hide-tooltip
...
replace hiding portal-info block from js to templates
2021-10-07 09:49:28 +03:00
f148233e64
Merge pull request #198 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.12.5
...
build(deps): bump nokogiri from 1.11.1 to 1.12.5 in /web/documentserver-example/ruby
2021-10-07 08:22:18 +03:00
92a322f2a7
build: fix sharp name
2021-10-06 17:41:38 +03:00
689ac66bba
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.1 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.1...v1.12.5 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-06 13:58:35 +00:00
6dbbcd7c99
Merge pull request #205 from ONLYOFFICE/release/1.0.0
...
Release/1.0.0
2021-10-06 16:57:25 +03:00
0b0919568c
1.0.0
2021-10-06 16:48:03 +03:00
c3774d8cb6
replace hiding portal-info block from js to templates
2021-10-06 15:14:45 +03:00
8b965a657d
nodejs: wopi: filename open new tab
2021-10-05 17:09:03 +03:00
1e72167e7d
nodejs: absolute host for ds on request the discovery
2021-10-05 16:55:06 +03:00
67c1922698
Merge pull request #203 from ONLYOFFICE/bugfix/spring-readme
...
java-spring: README.md misprint
2021-10-05 08:49:15 +03:00
f978efd88f
java-spring: README.md misprint
2021-10-04 19:30:41 +03:00
e3304792c4
0.0.0
2021-10-04 14:05:11 +03:00
ffa883644a
format config
2021-10-04 14:02:34 +03:00
c2dd09ccdb
spring: default address
2021-10-04 13:56:49 +03:00
17f54c133a
nodejs: unavailable wopi
2021-10-04 13:16:42 +03:00
971cf5745e
fix rebase ( e2a04ffb89)
2021-10-04 13:15:46 +03:00
e3c6bfdd1c
Merge pull request #201 from ONLYOFFICE/bugfix/emails
...
rename email.com to example.com
2021-10-01 12:56:37 +03:00
1b6d08e9bb
rename email.com to example.com
2021-10-01 12:41:12 +03:00
6168691469
spring to zip
2021-10-01 11:20:51 +03:00
c464064837
Merge pull request #176 from ONLYOFFICE/feature/java-spring
...
Feature/java spring
2021-10-01 11:10:03 +03:00
35f6b2bdfa
Merge pull request #200 from ONLYOFFICE/bugfix/mail-rename
...
rename mails
2021-10-01 11:08:39 +03:00
a1f26cb828
rename emails
2021-09-30 18:57:10 +03:00
bb9411a82c
rename mails
2021-09-30 18:55:22 +03:00
e2a04ffb89
Merge pull request #193 from ONLYOFFICE/bugfix/users-tooltip-layout
...
fix users tooltip size
2021-09-29 11:19:54 +03:00
1463e88024
csharp-mvc: user tooltip layout
2021-09-29 10:57:14 +03:00
b965ec08aa
csharp: user tooltip layout
2021-09-29 10:56:56 +03:00
347dc710ea
java: user tooltip layout
2021-09-29 10:56:33 +03:00
418a7a2712
ruby: user tooltip layout
2021-09-29 10:56:13 +03:00
f40d8a4a64
php: user tooltip layout
2021-09-29 10:55:52 +03:00
bee5e4724b
python: user tooltip layout
2021-09-29 10:55:27 +03:00
e1753a154d
nodejs: users tooltip layout
2021-09-29 10:54:55 +03:00
7327c4bfc2
java-spring: user tooltip layout
2021-09-28 23:12:40 +03:00
45afbe3f56
Merge pull request #196 from ONLYOFFICE/feature/server-url-to-links
...
add serverUrl to links
2021-09-28 12:35:20 +03:00
83efab84ad
Merge remote-tracking branch 'remotes/origin/master' into develop
2021-09-28 12:30:33 +03:00
8da151ff7c
Merge branch hotfix/v6.4.1 into master
2021-09-28 08:03:23 +00:00
7fbcdb1d7f
Merge pull request #197 from ONLYOFFICE/bugfix/cors-regexp
...
cors, fix regexp, fix manifest
2021-09-27 12:33:45 +03:00
69ac7771d5
nodejs: add ability to use custom path for storage-folder
2021-09-24 17:53:59 +03:00
04f5cac85d
java: fix; update README.md, add media.css to index.jsp
2021-09-24 17:51:43 +03:00
ce18f76698
cors, fix regexp, fix manifest
2021-09-23 21:56:08 +03:00
f542048aeb
add serverUrl to links
2021-09-23 21:45:13 +03:00
222749da15
fix path to templates, set username as "", if anonymous
2021-09-23 11:46:18 +03:00
d64a2b3a47
users tooltip layout
2021-09-21 23:33:29 +03:00
110dc6808b
java-spring: docserver url
2021-09-21 18:05:06 +05:00
75329fa198
java-spring: cleanup
2021-09-21 18:01:19 +05:00
7083e8f973
Merge pull request #194 from ONLYOFFICE/bugfix/python-example-fix
...
python: remade detecting document type
2021-09-20 17:13:06 +03:00
c196360933
Merge pull request #195 from ONLYOFFICE/feature/readme-ruby
...
Ruby version
2021-09-20 16:40:47 +03:00
8abd7e69a9
misprint
2021-09-20 12:33:46 +03:00
ccdd2a4cdc
ruby 3.0 version
2021-09-20 12:29:55 +03:00
7e06add085
ruby: changed the command
2021-09-17 18:01:51 +03:00
9193cf1d4b
ruby: specified the Ruby version
2021-09-17 17:08:03 +03:00
d6bddd86f3
python: remade detecting document type
2021-09-16 16:33:44 +03:00
5a95fb26d4
java-spring: fix user tooltip size
2021-09-14 12:28:11 +03:00
3ab0f5fc7a
java-spring: add .oxps
2021-09-14 10:17:17 +03:00
42859d7a28
Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop
2021-09-14 09:29:48 +03:00
d3581658b7
update templates
2021-09-14 09:29:20 +03:00
7027970b65
support oxps
2021-09-14 09:29:19 +03:00
8774286d8e
Merge pull request #191 from ONLYOFFICE/feature/update-readme-link
...
Update Readme.md
2021-09-14 08:41:46 +03:00
33140a2ca6
java: added ability to use absolute path for storage-folder in settings.properties, updated README.md
2021-09-13 18:49:38 +03:00
f0087361b6
Update Readme.md
2021-09-10 17:14:35 +03:00
4f07072824
Merge pull request #190 from ONLYOFFICE/feature/wopi-fix
...
fix wopi url context, fix layout
2021-09-08 11:41:18 +03:00
ce0231f5f2
fix wopi url context, fix layout
2021-09-07 17:59:35 +03:00
774a9fd209
fix path to diff.zip
2021-09-06 18:50:42 +03:00
24d138fdb5
fix misprint
2021-09-03 17:00:09 +03:00
53357938d2
fix creating history folder
2021-09-03 15:42:53 +03:00
09628fc5e9
fix deleting file folder when deleting file
2021-09-03 15:31:20 +03:00
62bc35de61
Merge pull request #189 from ONLYOFFICE/feature/layout-fix
...
layout fix
2021-09-03 09:51:38 +03:00
9fce208ce3
layout fix
2021-09-02 13:44:57 +03:00
2942324696
layout fix
2021-09-02 13:41:14 +03:00
07fda35106
Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop
2021-08-30 18:57:43 +03:00
d8e229df2c
replace set filepass null
2021-08-30 18:56:18 +03:00
5b3f62a011
fix for IE 11
2021-08-30 18:56:00 +03:00
3639e9706f
Merge pull request #184 from ONLYOFFICE/feature/wopi-url-fix
...
href fix
2021-08-30 18:54:59 +03:00
a7ccb0b8ca
Merge pull request #188 from ONLYOFFICE/feature/filepass-fix
...
replace set filepass null
2021-08-30 17:14:58 +03:00
b1a00854de
replace set filepass null
2021-08-30 16:53:05 +03:00
a546f1a1f4
Merge pull request #187 from ONLYOFFICE/feature/ie11-layout-fix
...
update layout for ie11
2021-08-29 15:43:25 +03:00
7a6afed510
Merge pull request #185 from ONLYOFFICE/feature/new-comments
...
New comments
2021-08-29 15:39:13 +03:00
07e2d7f3f1
Merge remote-tracking branch 'remotes/origin/feature/wopi-url-fix' into develop
2021-08-29 15:36:06 +03:00
344f5e1652
Merge pull request #183 from ONLYOFFICE/feature/corrupt-url
...
Feature/corrupt url
2021-08-29 15:32:45 +03:00
2ef34bc769
Merge pull request #182 from ONLYOFFICE/feature/header-height
...
set header height 48px
2021-08-29 15:27:10 +03:00
43783ba4a6
deploy: ignore .git
2021-08-29 15:24:01 +03:00
fbada5f99a
update layout for ie11
2021-08-26 20:24:19 +03:00
093fadaf74
update layout for ie11
2021-08-26 20:09:59 +03:00
463d85d222
Merge pull request #163 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.11.5
...
build(deps): bump nokogiri from 1.10.10 to 1.11.5 in /web/documentserver-example/ruby
2021-08-26 16:38:50 +03:00
fbc2941dae
Merge remote-tracking branch 'remotes/origin/master' into develop
2021-08-26 16:35:51 +03:00
28e2f61dc4
Merge branch release/v6.4.0 into master
2021-08-26 11:34:50 +00:00
e165c695fb
ruby: new comments
2021-08-26 14:00:52 +03:00
b979f667f2
python: new comments
2021-08-26 13:52:21 +03:00
29f2d63b32
php: new comments
2021-08-26 13:45:11 +03:00
75f4e80b54
nodejs: new comments
2021-08-26 13:32:59 +03:00
9ba69f6aef
href fix
2021-08-25 17:55:48 +03:00
1749ae6a52
Merge remote-tracking branch 'remotes/origin/develop' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.11.5
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2021-08-24 14:18:48 +03:00
873a9a386b
java: new comments
2021-08-24 14:14:25 +03:00
ece446d191
csharp-mvc: new comments
2021-08-24 13:13:35 +03:00
f0a86d924f
saving without url
2021-08-24 13:08:08 +03:00
90c4d54460
csharp: new comments
2021-08-24 12:40:41 +03:00
f897d9194f
nodejs: saving without url
2021-08-24 11:14:10 +03:00
cfa859a65f
java-spring: version fix
2021-08-23 23:31:22 +03:00
ade7d05270
java-spring: set header height 48px
2021-08-23 16:59:12 +03:00
6a75f23020
set header height 48px
2021-08-23 16:56:42 +03:00
9baa4c59b3
java-spring: refactoring
2021-08-20 16:25:49 +03:00
1ef88d1f6d
Merge branch hotfix/v6.3.2 into release/v6.4.0
2021-08-10 12:24:33 +00:00
92b1972f2b
Merge branch hotfix/v6.3.2 into develop
2021-08-10 12:24:30 +00:00
e0c69705bb
Merge pull request #181 from ONLYOFFICE/feature/editor-initialization-fix-ie11
...
fix for IE 11
2021-08-10 10:59:54 +03:00
d4e841468a
fix for IE 11
2021-08-09 20:01:50 +03:00
fdcc6e24db
Merge pull request #180 from ONLYOFFICE/feature/readme
...
Readme
2021-08-06 12:31:03 +03:00
37712e31e6
new screenshot
2021-08-05 17:53:08 +03:00
3142b86d9e
some changed for readme
2021-08-05 17:44:29 +03:00
f12ead863f
Merge pull request #178 from ONLYOFFICE/feature/blank-templates-image-url
...
change image url to "" for Blank template
2021-08-02 17:27:46 +03:00
3df2773867
change image url to "" for Blank template
2021-07-29 13:48:55 +03:00
2d51ddde3d
java-spring: add createUrl to editorConfig and creating from templates
2021-07-29 13:32:23 +03:00
d5f5079c22
java-spring: remove templates field from Permissions, fix version history
2021-07-29 12:34:12 +03:00
df7598956e
java-spring: add LICENSE file
2021-07-27 20:24:19 +03:00
efbde68bf8
csharp-mvc: fix getting extension
2021-07-20 14:35:32 +03:00
17f254db48
Merge pull request #177 from ONLYOFFICE/feature/adaptive-fix
...
Feature/adaptive fix
2021-07-20 14:34:06 +03:00
6a16c85acb
node-js: fix left submenu height when with wopi button
2021-07-20 13:50:27 +03:00
f5f0ce4e06
adaptive layout: add media for main-panel
2021-07-20 12:34:06 +03:00
beb66bf818
Merge branch 'feature/java-spring' of https://github.com/ONLYOFFICE/document-server-integration into feature/java-spring
2021-07-20 12:10:13 +03:00
f709b20590
java-spring: add position relative to "center" class
2021-07-20 12:09:18 +03:00
c99f189af3
java-spring: update readme
2021-07-16 17:39:48 +03:00
fd110429d3
java-spring: change TrackManagerRequestBody cast from token, add new fields
2021-07-16 15:54:11 +03:00
4b7a04834b
java-spring: add cast from jwt-token body to entity, replace switch with setFavorite
2021-07-15 14:13:33 +03:00
c1a76cf652
java-spring: ActionObject class change type String to Action, add if sample flag check, remove setFavorite from constructor of Document, fix main-panel width(media.css)
2021-07-14 18:46:09 +03:00
ed8296bd34
csharp-mvc: using method from class
2021-07-14 14:42:19 +03:00
d0df3c5420
delete screenshot
2021-07-14 11:21:01 +03:00
ca47ac870d
java-spring: fix misprints
2021-07-14 11:19:36 +03:00
78f24a06f1
java-spring: add README.md, docker-compose and Dockerfile
2021-07-14 11:14:41 +03:00
9cd4591987
java-spring: set default select option and cookie language(English)
2021-07-13 17:55:55 +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
41daabbe0c
php: replace get download url
2021-07-13 15:00:00 +03:00
6b8708ca50
java-spring: fix documentUrl for convert
2021-07-13 14:39:15 +03:00
b2980b5749
fix downloadUrl for convert
2021-07-13 14:32:39 +03:00
8e2f6b8003
java-spring: set John Smith as default user, fix file url encode/decode
2021-07-13 13:03:02 +03:00
239f0e2528
java-spring: fix edit, comment, review, fillForms mode permissions
2021-07-12 11:31:16 +03:00
38cf6c333d
java-spring: added Anonymous(uid-4), set default person John, fix favorite
2021-07-12 11:28:38 +03:00
c28ded60a0
java-spring: fix delete file
2021-07-12 11:25:23 +03:00
8858128f34
java-spring: added templates submodule
2021-07-09 17:59:45 +03:00
fdca204790
java-spring: file version on index page when hovering filename, tableHeader position fix
2021-07-09 17:32:58 +03:00
606eee6903
Merge remote-tracking branch 'remotes/origin/develop' into feature/java-spring
2021-07-09 17:05:37 +03:00
b2df1f5a96
Merge pull request #174 from ONLYOFFICE/feature/files-version
...
file versions on index page fix
2021-07-09 16:58:14 +03:00
61abb4d809
comment fix and square brackets
2021-07-09 16:56:00 +03:00
b58f33dddf
file versions on index page fix
2021-07-09 16:32:12 +03:00
e3353fd778
java-spring: change media from 970px to 986px
2021-07-09 15:36:27 +03:00
c6ba3709aa
Merge pull request #173 from ONLYOFFICE/feature/mobile-design
...
Feature/mobile design
2021-07-08 16:26:12 +03:00
2205e6252e
footer content margin 596-610px fix
2021-07-08 15:25:38 +03:00
68f950aac5
adaptive layout: change media from 970px to 986px
2021-07-08 14:58:56 +03:00
05215ffd4b
adaptive layout: long file names width fix on smallscreen
2021-07-08 11:10:51 +03:00
e0463ccd17
node.js: wopi not ooxml fix margin-left
2021-07-08 10:37:50 +03:00
038c74664a
java-spring: fix favorite, add templates permission,
2021-07-06 18:07:27 +03:00
582a0d0612
adaptive layout: border line fix
2021-07-06 15:41:01 +03:00
d1903e4354
java-spring: favorite flag, file creation and file samples, separated class for "/track" (TrackManager and FileController)
2021-07-06 15:23:13 +03:00
f9bb10c3df
java-spring: users for mentions, gson to jackson, rename documentManager to segregated documentManagerExts
2021-07-05 15:46:07 +03:00
e5fb3f4c6f
java-spring: change File entity name to FileModel, add GetHistory
2021-07-02 17:28:40 +03:00
0ce61cc07b
java-spring: documentManager interface separation
2021-07-02 11:09:57 +03:00
183e737847
java-spring: adaptive layout
2021-07-02 10:19:35 +03:00
12a72795ff
java: class names fix
2021-06-30 10:44:55 +03:00
2dc7b761b2
nodejs: wopi line height fix
2021-06-29 20:06:17 +03:00
2a898a8e8d
nodejs: wopi layout fix
2021-06-29 17:56:03 +03:00
44fc7a8215
line space fix
2021-06-29 15:56:55 +03:00
af16f147ba
ruby: adaptive layout
2021-06-29 15:31:12 +03:00
c52dbdde4e
python: adaptive layout
2021-06-29 15:28:41 +03:00
ab82be9b3d
php: adaptive layout and tag a fix
2021-06-29 15:27:06 +03:00
0ae02d8af9
nodejs: adaptive layout
2021-06-29 15:25:37 +03:00
293fbb4802
csharp: adaptive layout
2021-06-29 15:22:44 +03:00
65f5f6c25e
c#-mvc: adaptive layout
2021-06-29 15:20:31 +03:00
ca92b12bd3
java: adaptive layout
2021-06-29 15:15:55 +03:00
1178ee7e85
java-spring: 3rd-party license
2021-06-23 12:07:53 +03:00
aeaf3dee06
java-spring: copyright
2021-06-22 09:51:29 +03:00
76100c7c02
java-spring: default settings
2021-06-22 09:51:12 +03:00
92f601f702
java-spring: bugfix
2021-06-22 07:58:38 +02:00
af1d06f47c
java-spring: null pointer fix
2021-06-21 19:05:49 +02:00
2c03521148
java-spring: Integration example
2021-06-21 17:33:24 +02:00
9e34ed7f67
Merge pull request #172 from ONLYOFFICE/feature/wopi
...
Feature/wopi
2021-06-21 16:07:53 +03:00
eee6246d0c
nodejs: get discovery on wopi page only ( 9295d83609)
2021-06-21 16:03:56 +03:00
36513d3544
nodejs: stop retrying
2021-06-21 15:42:38 +03:00
fafc3d3d4f
nodejs: license
2021-06-21 15:23:29 +03:00
c1e4abf362
Merge remote-tracking branch 'remotes/origin/develop' into feature/wopi
2021-06-21 15:14:49 +03:00
06c1c1bf21
nodejs: copyright
2021-06-21 15:14:32 +03:00
24a2e0bd14
nodejs: move wopi config
2021-06-21 15:12:21 +03:00
05cd67a2f1
Merge pull request #158 from ONLYOFFICE/hellonadya-patch-1-1
...
Update README.md
2021-06-21 11:25:13 +03:00
6f691b6b9f
Update Users ( #171 )
...
Small issues with English fixed
2021-06-21 10:41:48 +03:00
85e3f83d84
Merge remote-tracking branch 'remotes/origin/release/v6.4.0' into develop
2021-06-18 11:07:30 +03:00
b00a4dba31
update document templates
2021-06-18 11:07:11 +03:00
3d12d3c38c
Merge pull request #170 from ONLYOFFICE/feature/comment-group
...
Comment groups examples
2021-06-17 12:07:20 +03:00
5d0f190dc8
change full permission value for commentGroups
2021-06-17 12:05:45 +03:00
2782f8f9bd
Merge remote-tracking branch 'remotes/origin/develop' into feature/comment-group
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/java/src/main/java/entities/User.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/nodejs/helpers/users.js
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
2021-06-17 10:11:07 +03:00
54ed6d8913
Merge pull request #169 from ONLYOFFICE/feature/create-blank-and-with-sample-document
...
Сreated blank and with sample content document, and removed ability to Create New for anonymous users
2021-06-16 17:02:12 +03:00
75e14c9452
added a description for users about creating a file from the editor
2021-06-16 16:56:25 +03:00
e1b800aa69
php: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:56:16 +03:00
4e69a7dfa5
ruby: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:54:38 +03:00
61cbba05f3
python: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:53:33 +03:00
ab03bb5490
nodejs: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:51:56 +03:00
1deeade91e
java: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:50:37 +03:00
417bd3b9f2
csharp-mvc: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:48:48 +03:00
c3fa000cea
csharp: added the ability to Create New from templates for user "John Smith"
2021-06-16 16:46:28 +03:00
f8484cfe0e
csharp-mvc: changed users description
2021-06-16 15:53:54 +03:00
b396419d05
csharp: changed users description
2021-06-16 15:53:09 +03:00
2d4490e21a
csharp-mvc: added commentGroups and sets comment permissions
2021-06-16 15:41:23 +03:00
61295628de
csharp: added commentGroups and sets comment permissions
2021-06-16 15:39:33 +03:00
90c7a8440e
php: permissions information
2021-06-16 08:09:00 +02:00
40eada3a17
java: new sets of comment permissions to demonstate comment groups
2021-06-15 16:26:03 +02:00
66d977abaf
ruby: new sets of comment permissions to demonstate comment groups
2021-06-15 16:14:28 +02:00
e259b303be
python: new sets of comment permissions to demonstate comment groups
2021-06-15 16:08:37 +02:00
4d091e892e
nodejs: new sets of comment permissions to demonstate comment groups
2021-06-15 16:03:52 +02:00
34bc5d53ee
php: new sets of comment permissions to demonstate comment groups
2021-06-15 15:58:15 +02:00
3b514b7f5f
nodejs: users description changes
2021-06-15 14:53:35 +02:00
ee0c1571f6
java: commentGroups
2021-06-15 14:49:52 +02:00
ba5a4e64f5
python: commentGroups
2021-06-15 12:18:34 +02:00
500f93deb8
php: commentGroups
2021-06-15 12:06:18 +02:00
b732f6e8cc
ruby: commentGroups
2021-06-15 11:49:56 +02:00
a815d30725
nodejs: commentGroups
2021-06-15 11:16:12 +02:00
c38c3ab0d6
Merge branch hotfix/v6.3.1 into master
2021-06-08 11:53:18 +00:00
b9e70b913a
Merge pull request #167 from ONLYOFFICE/release/v6.4.0
...
Release/v6.4.0
2021-06-04 14:08:57 +03:00
31cd3c2dad
Merge pull request #166 from ONLYOFFICE/hotfix/v6.3.1
...
Hotfix/v6.3.1
2021-06-04 14:08:28 +03:00
2082d24132
nodejs: wopi: edit icons
2021-06-01 13:36:03 +03:00
cdf629e863
nodejs: wopi: return correct version
2021-06-01 13:24:17 +03:00
6b8623795d
nodejs: wopi: fixed an issue with version key
2021-06-01 13:24:04 +03:00
38e32a69f8
nodejs: wopi: fixed response headers
2021-06-01 12:39:33 +03:00
3180d00b2d
nodejs: wopi: return user friendly name
2021-06-01 12:26:30 +03:00
9d3f4731d6
nodejs: wopi: return version header after putFile
2021-06-01 12:26:09 +03:00
f44659ac7c
nodejs: wopi: retry discovery
2021-06-01 12:25:34 +03:00
badc6644c2
Merge pull request #164 from ONLYOFFICE/feature/document-password
...
Fixed password bug for blank document
2021-05-31 13:51:53 +03:00
3bf8d72454
ruby: fixed bug for setting and removing password for blank document
2021-05-31 13:44:05 +03:00
aebcbe058e
python: fixed bug for setting and removing password for blank document
2021-05-31 13:42:27 +03:00
15de3e414f
php: fixed bug for setting and removing password for blank document
2021-05-31 13:42:27 +03:00
f3718a0f44
java: fixed bug for setting and removing password for blank document
2021-05-31 13:42:27 +03:00
6227d9c965
nodejs: fixed bug for setting and removing password for blank document
2021-05-31 13:39:02 +03:00
90e7922d7c
csharp: fixed bug for setting and removing password for blank document
2021-05-31 13:38:05 +03:00
e3f42fffba
csharp-mvc: fixed bug for setting and removing password for blank document
2021-05-31 13:30:24 +03:00
6ea3293a96
Merge pull request #159 from ONLYOFFICE/feature/mentions
...
Add mentions
2021-05-31 12:44:47 +03:00
b36668468e
added description by mentions for anonymous user
2021-05-31 10:22:56 +03:00
5c3c0b4361
Merge remote-tracking branch 'remotes/origin/develop' into feature/mentions
2021-05-31 10:02:04 +03:00
a9b82a299a
[run] Port ( #165 )
...
Change develop port 8001 -> 8000
2021-05-31 09:25:59 +03:00
07d11f0bae
fixed the no ability to add mentions for anonymous users
2021-05-28 15:10:06 +03:00
60992ecb38
variable users renamed to usersForMentions
2021-05-26 17:01:47 +03:00
af4cfa8074
nodejs: wopi: correct user
2021-05-25 17:37:01 +03:00
922143bf37
nodejs: wopi: default click action
2021-05-25 17:35:27 +03:00
6d0312feee
nodejs: wopi: fixed access_token_ttl
2021-05-25 17:31:33 +03:00
d876e04b9e
nodejs: wopi: fixed file versioning
2021-05-25 17:30:39 +03:00
9295d83609
nodejs: wopi: load discovery on start
2021-05-25 17:30:11 +03:00
6c022134d0
ruby: removed the ability to add mentions for anonymous users
2021-05-21 17:36:47 +03:00
97fc45a15c
python: removed the ability to add mentions for anonymous users
2021-05-21 17:33:27 +03:00
487adb11a7
php: removed the ability to add mentions for anonymous users
2021-05-21 17:32:43 +03:00
c052bbae31
nodejs: removed the ability to add mentions for anonymous users
2021-05-21 17:31:15 +03:00
667ff98142
java: removed the ability to add mentions for anonymous users
2021-05-21 17:29:29 +03:00
304d628dbe
csharp-mvc: removed the ability to add mentions for anonymous users
2021-05-21 17:28:20 +03:00
50b9aa4296
csharp: removed the ability to add mentions for anonymous users
2021-05-21 17:26:47 +03:00
76dd0b6d7b
java: add mentions
2021-05-21 10:17:55 +03:00
25ccda7e89
python: add mentions
2021-05-21 10:15:20 +03:00
b3dd5bc15d
ruby: add mentions
2021-05-21 10:15:19 +03:00
57144dfd61
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.5 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-05-20 12:00:01 +00:00
62b880e02d
Merge branch release/v6.3.0 into develop
2021-05-20 11:58:48 +00:00
46961db654
Merge branch release/v6.3.0 into master
2021-05-20 11:58:44 +00:00
4790aa074e
php: add mentions
2021-05-20 10:57:17 +03:00
0392ffbc9a
csharp: add mentions
2021-05-20 10:53:43 +03:00
b6b980de92
mvc: mentions
2021-05-20 10:53:31 +03:00
a56bb0ddac
Merge pull request #160 from ONLYOFFICE/feature/icons
...
Changed icons from png to svg
2021-05-20 10:27:45 +03:00
06e93c5b0f
Update README.md
2021-05-17 17:51:06 +03:00
d75bcb85c9
Update readme.md
2021-05-17 17:49:47 +03:00
c1bd8458fb
Update README.md
2021-05-17 17:49:08 +03:00
bd2a94176e
Update README.md
2021-05-17 17:47:17 +03:00
c16359b1c0
Update README.md
2021-05-17 17:46:27 +03:00
73f7b31bfa
Update README.md
2021-05-17 17:45:03 +03:00
2ea4dbf289
Update README.md
2021-05-17 17:43:26 +03:00
cb54ca9821
Update README.md
2021-05-17 17:37:31 +03:00
0278fd05e2
Update README.md
2021-05-17 17:31:43 +03:00
511301260b
Update readme.md
2021-05-17 16:55:44 +03:00
0e454c8def
Update README.md
2021-05-17 16:54:38 +03:00
334f60cdac
Update README.md
2021-05-17 16:34:21 +03:00
6b54e18aad
ruby: changed icons from png to svg
2021-05-17 16:31:41 +03:00
d0977de4ca
python: changed icons from png to svg
2021-05-17 16:30:25 +03:00
d38b1afe34
php: changed icons from png to svg
2021-05-17 16:28:54 +03:00
bdb2cfd2a7
nodejs: changed icons from png to svg
2021-05-17 16:27:44 +03:00
8f95634af5
java: changed icons from png to svg
2021-05-17 16:26:09 +03:00
faac6d58e6
csharp-mvc: changed icons from png to svg
2021-05-17 16:24:33 +03:00
771cc25c18
csharp: changed icons from png to svg
2021-05-17 16:22:11 +03:00
fecc69a00e
Update README.md
2021-05-17 16:20:41 +03:00
22cf4c7c24
Update README.md
2021-05-17 16:19:59 +03:00
c780ed127c
Update README.md
2021-05-17 16:18:52 +03:00
9cea54a949
Update README.md
2021-05-17 15:25:56 +03:00
4d3059ffa0
Update README.md
2021-05-17 15:20:59 +03:00
22179d6c4f
Update README.md
2021-05-17 11:25:49 +03:00
9dd43e892b
Update README.md
2021-05-17 11:18:52 +03:00
675511fb0e
Update README.md
2021-05-17 11:13:58 +03:00
bfc7ee2ad6
Update README.md
2021-05-17 11:13:36 +03:00
c03e4f3896
Update README.md
2021-05-17 11:13:04 +03:00
f23f0bd3d3
Update README.md
2021-05-14 18:27:30 +03:00
f451a7032d
Update README.md
...
- MD in accordance with ONLYOFFICE README style
- Minor improvements
2021-05-14 17:54:15 +03:00
85255d878e
Merge branch hotfix/v6.2.2 into release/v6.3.0
2021-05-07 11:59:45 +00:00
312209cd5a
nodejs: wopi locks
2021-05-06 16:13:51 +03:00
fa346a0c27
nodejs: fixed an issue with sending response twice
2021-05-06 16:13:24 +03:00
74d01268e7
Merge pull request #156 from ONLYOFFICE/feature/examples-descriptions
...
Examples descriptions
2021-05-05 10:12:05 +03:00
e57d6d0495
csharp-mvc: added screenshots
2021-05-05 10:05:02 +03:00
2809fc5408
csharp-mvc: added readme
2021-05-04 18:09:02 +03:00
c391683cb3
integration examples: added readme
2021-05-04 15:39:56 +03:00
0d276a5141
csharp-mvc: changed readme
2021-05-04 15:30:01 +03:00
138673fc80
ruby: added readme
2021-05-04 14:32:01 +03:00
18ad1fa8c6
python: added readme
2021-05-04 14:21:40 +03:00
7606f5f9bd
php: added readme
2021-05-04 13:45:58 +03:00
16a3578c15
nodejs: added readme
2021-05-04 11:55:04 +03:00
3bb3f6e878
java: added readme
2021-05-04 11:21:17 +03:00
942c455af8
csharp: added readme
2021-04-30 15:00:48 +03:00
12f88044b7
Merge remote-tracking branch 'origin/develop' into feature/wopi
...
# Conflicts:
# web/documentserver-example/nodejs/app.js
2021-04-28 13:19:37 +03:00
0e0eea3ebd
nodejs: wopi ui
2021-04-28 13:10:41 +03:00
b5ef247245
nodejs: wopi create file
2021-04-28 11:58:59 +03:00
5645a0fc2c
nodejs: wopi edit
2021-04-28 11:58:39 +03:00
f183f8fc30
Merge pull request #155 from ONLYOFFICE/feature/description-user-rights
...
Feature/description user rights
2021-04-27 11:31:40 +03:00
6898f65fd7
nodejs, csharp: fix tabulation
2021-04-27 09:59:27 +03:00
99a7c667b3
ruby: add description for user rights
2021-04-27 01:05:59 +03:00
69c16e0441
python: add description for user rights
2021-04-27 00:56:45 +03:00
f691ac8069
php: add description for user rights
2021-04-27 00:46:08 +03:00
48ce83c494
csharp-mvc: add description for user rights
2021-04-27 00:34:23 +03:00
0309203b72
csharp: add description for user rights
2021-04-27 00:24:22 +03:00
a2b10800fc
java: add description for user rights
2021-04-27 00:05:27 +03:00
06a48dcd4a
nodejs: add description for user rights
2021-04-27 00:03:05 +03:00
a9a48d5816
nodejs: add mentions
2021-04-26 13:27:03 +03:00
7204c49b85
Merge pull request #154 from ONLYOFFICE/feature/users
...
Feature/users
2021-04-26 13:08:55 +03:00
c39aacbc6c
ruby: add favorite and permissions at user list
2021-04-26 13:01:40 +03:00
0dec9d930d
python: add favorite and permissions at user list
2021-04-26 12:51:36 +03:00
da92bf531d
php: add favorite and permissions at user list
2021-04-26 12:40:18 +03:00
22ca55b4c3
csharp-mvc: add favorite and permissions at user list
2021-04-26 12:32:39 +03:00
f42480dfd2
csharp: add favorite and permissions at user list
2021-04-26 12:32:13 +03:00
a655bf002a
java: add favorite and permissions at user list
2021-04-26 11:59:38 +03:00
d55e9beabe
nodejs: add favorite and permissions at user list
2021-04-26 11:47:03 +03:00
a852056e87
php: fix function createMeta()
2021-04-23 18:00:16 +03:00
f908bba727
csharp: add list users
2021-04-23 17:39:41 +03:00
c679f7ddd3
csharp-mvc: add list users
2021-04-23 17:17:35 +03:00
ebdd865f73
php: add list users
2021-04-23 17:12:15 +03:00
2132798ee3
ruby: add list users
2021-04-23 17:11:52 +03:00
9ff5523631
python: add list users
2021-04-23 11:53:27 +03:00
6d44c1d2de
java: add list users
2021-04-23 10:40:48 +03:00
49a9f10972
nodejs: add list users
2021-04-23 10:37:43 +03:00
b6cb5150dd
nodejs: fix development version
2021-04-22 18:50:40 +03:00
0b0cdd395c
nodejs, java, php, csharp, csharp-mvc, python, ruby: forbidden download, print and copy for uid-3
2021-04-22 16:27:52 +03:00
667b9abc0d
view files
2021-04-22 11:59:20 +03:00
e34cdf0098
dev config
2021-04-22 11:58:49 +03:00
d8590783d8
Merge pull request #153 from ONLYOFFICE/bugfix/edit-button
...
nodejs, java, php, csharp, csharp-mvc, python, ruby
2021-04-22 11:34:47 +03:00
ba9d927fc0
nodejs, java, php, csharp, csharp-mvc, python, ruby: remove edit button for not OOXML
2021-04-22 11:29:59 +03:00
8f5797cd72
Merge pull request #152 from ONLYOFFICE/feature/jwt-download-files
...
Feature/jwt download files
2021-04-22 09:47:08 +03:00
3706659949
csharp: fix merge feature/comments-for-examples
2021-04-21 18:20:39 +03:00
e321503dca
wopi config
2021-04-21 17:59:12 +03:00
4d64347fb9
added fast-xml-parser to dep
2021-04-21 17:58:53 +03:00
bfb202dd4f
wopi readonly
2021-04-21 17:58:37 +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
5928ed1756
Merge pull request #151 from ONLYOFFICE/feature/user-permissions
...
Feature/user permissions
2021-04-21 17:32:25 +03:00
9125aca0ae
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# Readme.md
2021-04-21 17:16:52 +03:00
15bba720d4
Merge pull request #150 from ONLYOFFICE/feature/comments-for-examples
...
Comments for examples
2021-04-21 17:13:15 +03:00
1364654e2b
php: rever fileName
2021-04-21 17:12:30 +03:00
fac010d4bd
php: revert symbol $
2021-04-21 16:33:59 +03:00
82adaf6ad0
java: revert variable fileName
2021-04-21 16:10:16 +03:00
8d34ff2ed2
ruby: add jwt for download files
2021-04-21 15:54:21 +03:00
fb38127ebc
python: add jwt for download files
2021-04-21 14:55:45 +03:00
27093c5c7a
csharp: add jwt for download files
2021-04-21 13:13:52 +03:00
a2116bf3f7
csharp-mvc: add jwt for download files
2021-04-21 12:42:22 +03:00
1a825b9f17
php: add jwt for download files
2021-04-21 11:31:45 +03:00
0ba090e5ba
java: add jwt for download files
2021-04-21 11:31:26 +03:00
fe803efd35
nodejs: added comments
2021-04-20 17:33:49 +03:00
f2714cb554
csharp-mvs: added comments
2021-04-20 17:33:49 +03:00
0997d2fef5
csharp: added comments
2021-04-20 17:33:48 +03:00
56a65a9f3e
ruby: added comments
2021-04-20 17:33:48 +03:00
026237d286
php: added comments
2021-04-20 17:33:48 +03:00
beaffd40de
java: added comments
2021-04-20 17:33:39 +03:00
592d8addc2
nodejs: add jwt for download files
2021-04-20 16:45:33 +03:00
6a1ecf8d0b
python: added comments for python example
2021-04-20 15:46:41 +03:00
aff257ac8d
Merge pull request #148 from ONLYOFFICE/feature/create-url
...
Feature/create url
2021-04-20 08:52:45 +03:00
47478fc3c5
ruby: forbidden to download, print and copy for uid-2
2021-04-19 18:31:59 +03:00
4ec3b7fb58
python: forbidden to download, print and copy for uid-2
2021-04-19 18:28:55 +03:00
03635575ab
php: forbidden to download, print and copy for uid-2
2021-04-19 18:24:34 +03:00
389023cefb
csharp: forbidden to download, print and copy for uid-2
2021-04-19 18:21:47 +03:00
1c5b0df480
csharp-mvc: forbidden to download, print and copy for uid-2
2021-04-19 18:17:14 +03:00
5f14f206bb
java: forbidden to download, print and copy for uid-2
2021-04-19 18:01:33 +03:00
3bcfc0e714
nodejs: forbidden to download, print and copy for uid-2
2021-04-19 18:01:08 +03:00
2e2a45266d
welcome moved to https://github.com/ONLYOFFICE/document-server-package/tree/master/common/documentserver-example/welcome
2021-04-19 12:25:37 +03:00
c48039970a
Merge pull request #147 from ONLYOFFICE/feature/edit-buttons
...
Feature/edit buttons
2021-04-19 10:50:45 +03:00
1c8b4442d3
Merge pull request #146 from ONLYOFFICE/feature/reload-page
...
Feature/reload page
2021-04-19 10:47:40 +03:00
ea47d65231
python: add editorConfig.createUrl
2021-04-18 18:23:59 +03:00
487c54e471
ruby: add editorConfig.createUrl
2021-04-18 18:23:59 +03:00
b417633c3f
csharp-mvc: add editorConfig.createUrl
2021-04-18 18:23:59 +03:00
9332035b33
csharp: add editorConfig.createUrl
2021-04-18 18:23:58 +03:00
f2bc452196
php: add editorConfig.createUrl
2021-04-18 18:23:58 +03:00
d3c89ba6cf
java: add editorConfig.createUrl
2021-04-18 18:23:57 +03:00
2f7a2bd545
nodejs: add editorConfig.createUrl
2021-04-18 18:23:57 +03:00
55f7adcdc7
ruby: reload files list after closing upload dialog by Close button
2021-04-16 18:34:12 +03:00
b5cb5d864b
python: reload files list after closing upload dialog by Close button
2021-04-16 18:33:38 +03:00
d9d0147990
csharp-mvc: reload files list after closing upload dialog by Close button
2021-04-16 18:33:03 +03:00
f0fef85852
csharp: reload files list after closing upload dialog by Close button
2021-04-16 18:32:14 +03:00
d8d068d260
php: reload files list after closing upload dialog by Close button
2021-04-16 18:31:20 +03:00
9db75e7f4e
java: reload files list after closing upload dialog by Close button
2021-04-16 18:30:44 +03:00
72ec12d297
ruby: edit link only for editable format
2021-04-16 16:08:18 +03:00
6ea6e35d54
python: edit link only for editable format
2021-04-16 16:07:50 +03:00
ac4ef8fca5
csharp-mvc: edit link only for editable format
2021-04-16 16:04:42 +03:00
b94225e3e1
csharp: edit link only for editable format
2021-04-16 16:03:54 +03:00
cfec08c9d1
php: edit link only for editable format
2021-04-16 16:02:35 +03:00
dbf0d8bd67
java: edit link only for editable format
2021-04-16 16:01:24 +03:00
5dedcedb60
nodejs, java, php, csharp, csharp-mvc, python, ruby: bugfix window conversion
2021-04-16 10:38:26 +03:00
0dcdad7dad
python: update readme version python 3.9+
2021-04-15 11:23:37 +03:00
4fa5b7d864
Merge pull request #145 from ONLYOFFICE/feature/pass-for-convert
...
Feature/pass for convert
2021-04-15 09:35:47 +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
a899483e5c
python: add password for convert
2021-04-14 15:40:23 +03:00
7d766da6f0
python: change api/convert method to post
2021-04-14 15:30:13 +03:00
1f7b085455
csharp-mvc: add password for convert
2021-04-14 15:07:55 +03:00
d6db3cae2b
csharp-mvc: change api/convert method to post
2021-04-14 14:47:22 +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
e51b331736
php: add password for convert
2021-04-14 12:37:06 +03:00
7ed7263bc3
php: change api/convert method to post
2021-04-14 11:52:40 +03:00
376de19dae
nodejs: add password for convert
2021-04-14 11:11:12 +03:00
71a70f335e
nodejs: change api/convert method to post
2021-04-14 11:00:23 +03:00
388e473e3f
java: add password for convert
2021-04-14 10:40:26 +03:00
e3c5f2008b
java: change api/convert method to post
2021-04-14 10:40:25 +03:00
8751461695
Merge pull request #144 from ONLYOFFICE/feature/edit-button
...
Feature/edit button
2021-04-12 10:16:02 +03:00
2277c060bb
nodejs: fix punctuation
2021-04-12 09:58:06 +03:00
ef064992f2
ruby: fix onRequestEditRights
2021-04-11 19:47:22 +03:00
e71acd9947
ruby: permissions.edit add condition view
2021-04-11 19:46:33 +03:00
f22c698cb6
csharp-mvc: fix onRequestEditRights
2021-04-11 19:45:26 +03:00
f788379eb5
csharp-mvc: permissions.edit add condition view
2021-04-11 19:44:37 +03:00
6eaa948d3a
csharp: permissions.edit add condition view
2021-04-11 19:43:44 +03:00
b8af9b7d95
python: permissions.edit add condition view
2021-04-11 19:42:58 +03:00
56ec61ff43
php: permissions.edit add condition view
2021-04-11 19:42:21 +03:00
c46028c026
java: permissions.edit add condition view
2021-04-11 19:41:08 +03:00
77c9817dba
nodejs: permissions.edit add condition view
2021-04-11 19:40:24 +03:00
ebc6a8a344
Merge pull request #143 from ONLYOFFICE/bugfix/history-user
...
Bugfix/history user
2021-04-09 13:29:13 +03:00
22d71b8923
ruby: fix null user
2021-04-09 13:16:09 +03:00
3bd85fd747
ruby: fix filling file createdInfo.json
2021-04-09 13:15:28 +03:00
9f5c4b479b
python: fix null user
2021-04-09 13:01:43 +03:00
8a0a1d3a42
csharp: fix null user
2021-04-09 12:51:32 +03:00
9d46cb6b4e
csharp-mvc: fix null user
2021-04-09 12:42:54 +03:00
243b9daafc
java: fix null user
2021-04-09 12:33:23 +03:00
54565a4848
nodejs: fix null user
2021-04-09 12:14:32 +03:00
18d2a7f511
Merge pull request #142 from ONLYOFFICE/bugfix/php-vulnerability
...
Bugfix/php vulnerability
2021-04-06 13:49:39 +03:00
ab5163f237
php: xss with user name
2021-04-06 13:46:42 +03:00
8ab2ba4edc
php: not used parameters
2021-04-06 13:45:04 +03:00
4996de1aea
php: revert local configuration
2021-04-06 10:23:30 +03:00
5e6d45cfd0
nodejs, java, php, csharp, csharp-mvc, python, ruby: changed min-height page
2021-04-05 18:02:21 +03:00
b67bc6164a
Merge pull request #138 from ONLYOFFICE/feature/start-button
...
welcome: add check available for start button
2021-03-31 10:22:12 +03:00
0a909ed4f7
welcome: add check available for start button
2021-03-30 18:27:20 +03:00
f55bbab827
Merge pull request #137 from ONLYOFFICE/feature/update-dependencies
...
ruby: update dependencies
2021-03-30 12:22:22 +03:00
193b0aeb80
ruby: update dependencies
2021-03-30 12:15:33 +03:00
abe807f288
Merge pull request #135 from ONLYOFFICE/feature/fix-filename
...
Feature/fix filename
2021-03-30 12:06:34 +03:00
db8d816660
Merge pull request #134 from ONLYOFFICE/feature/redesign
...
Feature/redesign
2021-03-30 12:05:20 +03:00
1aa00012bf
Merge pull request #136 from ONLYOFFICE/feature/welcome-redesign
...
Feature/welcome redesign
2021-03-30 11:44:23 +03:00
4f44082456
Merge pull request #129 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.11.1
...
build(deps): bump nokogiri from 1.10.10 to 1.11.1 in /web/documentserver-example/ruby
2021-03-30 10:54:14 +03:00
578ecec9af
csharp-mvc: ext to lowercase
2021-03-29 18:28:52 +03:00
25804d0c0a
csharp: ext to lowercase
2021-03-29 18:16:53 +03:00
6b27f4c221
php: ext to lowercase
2021-03-29 17:59:45 +03:00
bfa0984daf
ruby: extname to downcase
2021-03-29 17:31:39 +03:00
b4d19b2f1e
nodejs: fix function getFileName
2021-03-29 17:00:18 +03:00
ce4a6ec67e
add button start
2021-03-26 14:39:19 +03:00
ba172dd5d4
java: fix view embedded
2021-03-25 22:11:13 +03:00
1fb48547ed
csharp: fix documentType
2021-03-25 22:10:44 +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
4f2d7f0a3f
nodejs: fix punctuation
2021-03-25 21:27:43 +03:00
d4e984e6b3
nodejs, java, php, python, csharp, csharp-mvc, ruby: fix remove upload name
2021-03-25 21:24:04 +03:00
93df5adba2
nodejs, java: fix css
2021-03-25 16:47:18 +03:00
87089d3fd1
nodejs, java, php: fix quotes
2021-03-25 16:42:35 +03:00
8ca58370e9
ruby: redesign window upload
2021-03-25 16:31:48 +03:00
599da25503
ruby: added tooltips
2021-03-25 15:27:32 +03:00
1bfe1b383b
ruby: redesign
2021-03-25 15:15:35 +03:00
0645fba83d
python: redesign window upload
2021-03-25 10:58:56 +03:00
7dade2ff46
python: added tooltips
2021-03-24 21:17:27 +03:00
d2b5335de9
python: redesign
2021-03-24 21:09:35 +03:00
4a617b516b
php: redesign window upload
2021-03-24 14:00:33 +03:00
f4331cbd0a
php: added tooltips
2021-03-24 10:40:38 +03:00
3665ead0b7
php: redesign
2021-03-23 22:25:49 +03:00
1baf3617b0
csharp-mvc: redesign window upload
2021-03-23 15:46:38 +03:00
367629d01f
csharp-mvc: added tooltips
2021-03-23 14:39:38 +03:00
76b4693a54
csharp-mvc: redesign
2021-03-23 14:28:09 +03:00
f54e505aad
fix readme
2021-03-23 11:38:20 +03:00
c8b17785e7
apache to license
2021-03-23 11:37:21 +03:00
d8452548f0
apache to license
2021-03-23 11:36:18 +03:00
1dda4bbe5e
csharp: redesign window upload
2021-03-22 23:11:50 +03:00
899df4f39f
csharp: added tooltips
2021-03-22 21:17:33 +03:00
c416712ac3
csharp: redesign
2021-03-22 16:42:25 +03:00
b5b7cd91c4
Merge pull request #132 from ONLYOFFICE/feature/fill-forms
...
Feature/fill forms
2021-03-22 12:47:47 +03:00
e8c17005bb
java: redesign window upload
2021-03-21 21:31:15 +03:00
53ec97b0c8
nodejs: redesign window upload
2021-03-21 15:59:49 +03:00
0646e25240
java: added tooltips
2021-03-19 16:05:33 +03:00
e7445dbc46
ruby: added postfix -form isSubmitForm
2021-03-19 15:02:05 +03:00
42b24e4307
python: added postfix -form isSubmitForm
2021-03-19 14:53:34 +03:00
1ba0577521
csharp-mvc: added postfix -form isSubmitForm
2021-03-19 14:43:58 +03:00
3335a135a0
csharp: added postfix -form isSubmitForm
2021-03-19 14:34:25 +03:00
c2a75b3e28
php: added postfix -form isSubmitForm
2021-03-19 14:15:23 +03:00
4e2fe9e607
java: added postfix -form isSubmitForm
2021-03-19 14:13:43 +03:00
3eb2061b9f
nodejs: added postfix -form isSubmitForm
2021-03-19 13:50:26 +03:00
fcdcefe662
nodejs: revert local configuration
2021-03-18 15:32:55 +03:00
8aa32308c0
java: redesign
2021-03-18 11:55:42 +03:00
94beb67552
nodejs: added tooltips
2021-03-16 23:22:49 +03:00
3c1eab070d
nodejs: redesign
2021-03-16 00:06:26 +03:00
714b514f66
Copyright 2021
2021-03-15 11:54:47 +03:00
89e6ac8571
Merge remote-tracking branch 'remotes/origin/release/v6.3.0' into develop
2021-03-05 11:20:57 +03:00
988e336f43
forcesave is disabled by default ( b541936473)
2021-03-05 11:20:12 +03:00
9f9ac0c30d
Merge remote-tracking branch 'origin/release/v6.3.0' into develop
2021-03-04 16:10:51 +03:00
9ab94ee9c3
Merge remote-tracking branch 'origin/master' into release/v6.3.0
2021-03-04 11:12:08 +03:00
fe02c4914c
converting xml
2021-03-01 14:26:43 +03:00
82981d3ce2
Merge remote-tracking branch 'remotes/origin/release/v6.2.0' into develop
2021-03-01 14:14:38 +03:00
879d8f64fb
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.10.10 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-03-01 09:21:06 +00:00
6870923b94
Merge branch release/v6.2.0 into master
2021-03-01 08:43:26 +00:00
7d5c90e9cf
python: set version pyjwt 1.7.1
2021-02-19 16:08:43 +03:00
b541936473
Merge pull request #126 from ONLYOFFICE/feature/submit-form
...
Feature/submit form
2021-02-19 15:45:20 +03:00
a2e59cf705
ruby: submit filled form
2021-02-19 15:01:32 +03:00
dc074d4baf
python: submit filled form
2021-02-19 15:00:42 +03:00
1cf5b1eea5
php: submit filled form
2021-02-19 15:00:17 +03:00
2635306e2e
csharp-mvc: submit filled form
2021-02-19 14:59:59 +03:00
f0cc80fd53
csharp: submit filled form
2021-02-19 14:59:36 +03:00
c9f58e3ca6
java: submit filled form
2021-02-19 14:59:14 +03:00
821e481734
nodejs: improved forcesave submit filled form
2021-02-19 14:58:21 +03:00
f0309615d6
Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
...
# Conflicts:
# web/documentserver-example/nodejs/app.js
2021-02-18 15:39:20 +03:00
47588d135e
Merge pull request #115 from ONLYOFFICE/feature/reviewPermissions
...
Feature/review permissions
2021-02-18 15:33:56 +03:00
8e6ae3b915
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/models/file_model.rb
2021-02-18 15:13:34 +03:00
8fc9d6125c
Merge pull request #122 from ONLYOFFICE/feature/request-name
...
Feature/request name
2021-02-18 14:14:00 +03:00
b427594248
Merge pull request #125 from ONLYOFFICE/feature/favicon
...
Feature/favicon
2021-02-18 09:09:36 +03:00
5c43308e14
ruby: added dynamic favicon
2021-02-17 20:19:51 +03:00
c5b67b4b00
php: added dynamic favicon
2021-02-17 20:19:30 +03:00
8442def83c
csharp-mvc: added dynamic favicon
2021-02-17 20:18:43 +03:00
2cb91eb8d5
csharp: added dynamic favicon
2021-02-17 20:18:15 +03:00
cf82b0ffc9
java: added dynamic favicon
2021-02-17 20:17:15 +03:00
ffcf787f94
python: renamed favicon
2021-02-17 20:16:32 +03:00
ce2714c684
nodejs: renamed favicon
2021-02-17 20:15:47 +03:00
4ccd78053f
renamed parameter reviewGroup on reviewGroups
2021-02-17 10:11:36 +03:00
7602183cf9
Merge pull request #124 from ONLYOFFICE/feature/forcesave
...
Feature/forcesave
2021-02-17 09:48:34 +03:00
1a6744a814
Merge branch 'develop' into feature/forcesave
...
# Conflicts:
# web/documentserver-example/java/src/main/resources/settings.properties
2021-02-16 15:07:23 +03:00
6a89a073fa
ruby: download forcesaved file
2021-02-16 15:02:19 +03:00
353119145c
python: download forcesaved file
2021-02-16 14:59:04 +03:00
0aaaedc4d6
php: download forcesaved file
2021-02-16 14:14:08 +03:00
246ddc9f9c
csharp-mvc: download forcesaved file
2021-02-16 13:28:30 +03:00
3e8b6aaffa
csharp: download forcesaved file
2021-02-16 13:28:14 +03:00
c95439c0db
java: download forcesaved file
2021-02-16 13:27:53 +03:00
62873e4ce4
nodejs: fix forcesave conversion
2021-02-16 11:00:45 +03:00
e04155e7ad
csharp: added forcesave
2021-02-15 17:27:29 +03:00
733f798968
csharp-mvc: added forcesave
2021-02-15 17:26:16 +03:00
f7f0a07239
ruby: added forcesave
2021-02-15 17:24:56 +03:00
ee79e02c54
python: added forcesave
2021-02-15 16:52:44 +03:00
d8afda9b56
php: added forcesave
2021-02-15 15:29:25 +03:00
0569dc7271
java: added forcesave
2021-02-15 13:37:40 +03:00
fef62baa2b
Merge pull request #123 from ONLYOFFICE/feature/remove-resource
...
Feature/remove resource
2021-02-11 11:19:56 +03:00
be82ae7078
java: ResourceService.ashx is not used anymore
2021-02-11 11:15:57 +03:00
0a4fcc0cdc
nodejs: ResourceService.ashx is not used anymore
2021-02-11 08:58:38 +03:00
823374e2fe
csharp-mvc: request user name
2021-02-08 22:28:56 +03:00
3b89aae808
csharp: request user name
2021-02-08 22:28:19 +03:00
cc488187b4
php: request user name
2021-02-08 22:27:14 +03:00
0e191eed91
python: request user name
2021-02-08 22:26:24 +03:00
6d27c1866b
ruby: request user name
2021-02-08 22:25:08 +03:00
845b111a85
java: request user name
2021-02-08 22:21:25 +03:00
79d12ecd02
Merge pull request #121 from ONLYOFFICE/feature/document-type
...
Feature/document type
2021-02-08 10:27:36 +03:00
61c388a7af
csharp-mvc: reviewGroup instead reviewPermissions
2021-02-07 19:35:29 +03:00
c6deb13712
csharp: reviewGroup instead reviewPermissions
2021-02-07 19:30:32 +03:00
13250e18b3
php: reviewGroup instead reviewPermissions
2021-02-07 19:21:41 +03:00
7d373fa1a9
ruby: reviewGroup instead reviewPermissions
2021-02-07 19:11:09 +03:00
8af2607e62
python: reviewGroup instead reviewPermissions
2021-02-07 19:00:34 +03:00
c2db28fbcf
java: reviewGroup instead reviewPermissions
2021-02-07 18:38:47 +03:00
212fd26807
csharp: word, cell, slide instead text, spreadsheet, presentation
2021-02-06 20:36:55 +03:00
c9ef51a361
csharp-mvc: word, cell, slide instead text, spreadsheet, presentation
2021-02-06 20:20:38 +03:00
f25e4ea614
php: word, cell, slide instead text, spreadsheet, presentation
2021-02-06 20:09:03 +03:00
e4eb8366bd
ruby: word, cell, slide instead text, spreadsheet, presentation
2021-02-05 18:46:21 +03:00
bcfa08b43c
python: word, cell, slide instead text, spreadsheet, presentation
2021-02-05 18:36:58 +03:00
193238fbdb
java: word, cell, slide instead text, spreadsheet, presentation
2021-02-05 17:55:05 +03:00
37e36f7fef
Merge pull request #120 from ONLYOFFICE/feature/fix-filename
...
Feature/fix filename
2021-02-05 14:00:19 +03:00
ec90b2ff98
ruby: check filename from url
2021-02-05 13:40:13 +03:00
758f0c08e5
java: add check filename for download
2021-02-05 13:33:57 +03:00
b76c532569
csharp-mvc: check filename from url
2021-02-05 13:29:08 +03:00
856613d644
csharp: check filename from url
2021-02-05 13:25:12 +03:00
75c11f4ee8
Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-filename
...
# Conflicts:
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/python/src/views/actions.py
2021-02-05 12:56:04 +03:00
1e023e58b2
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
...
Feature/template submodule
2021-02-04 18:39:50 +03:00
f9f757bd0d
ruby: added templates submodule
2021-02-04 17:42:56 +03:00
a213b635f2
csharp-mvc: changed path to sample
2021-02-04 17:05:40 +03:00
96d6c521ef
csharp: changed path to sample
2021-02-04 16:56:28 +03:00
7d2469cfe9
php: changed path to sample
2021-02-04 16:36:17 +03:00
2f7352c296
java: changed path to sample
2021-02-04 16:26:05 +03:00
6ec262e221
nodejs: word, cell, slide instead text, spreadsheet, presentation
2021-02-04 16:10:00 +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
2a856c6919
python: changed path to sample
2021-02-04 15:25:28 +03:00
d075855065
nodejs: request user name
2021-02-04 15:24:09 +03:00
f026d0ef60
nodejs: changed path to sample
2021-02-04 15:15:26 +03:00
2ec0a3798d
nodejs: reviewGroup instead reviewPermissions
2021-02-04 14:31:49 +03:00
506b55a201
update submodule (csharp-mvc, csharp, php, java, nodejs, python)
2021-02-04 14:26:15 +03:00
90dd2c837f
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
2021-02-04 11:00:08 +03:00
75d828a6ae
Merge pull request #118 from ONLYOFFICE/feature/update-dependencies
...
python: update (django, requests, pyjwt)
2021-02-04 10:45:50 +03:00
fe3b5558df
python: update (django, requests, pyjwt)
2021-02-04 10:41:41 +03:00
3d49eabaf0
Merge pull request #117 from ONLYOFFICE/feature/get-files
...
Feature/get files
2021-02-04 10:07:13 +03:00
51f712b900
ruby: improved get_files_info
2021-02-03 13:01:44 +03:00
a565da4035
php: improved GetFilesInfo
2021-02-03 12:52:11 +03:00
7db6983167
python: improved GetFilesInfo
2021-02-03 12:47:13 +03:00
b7262ff874
java: improved GetFilesInfo
2021-02-03 12:43:08 +03:00
50921b278b
csharp: improved GetFilesInfo
2021-02-03 12:42:39 +03:00
9d16bee672
csharp-mvc: improved GetFilesInfo
2021-02-03 12:42:00 +03:00
1a63a7f65f
nodejs: add Content-Type
2021-02-03 12:13:17 +03:00
4ba7b3f02e
Add Dockerfile for nodejs ( #110 )
...
* Add Dockerfile for nodejs DS Example
* Removed unnecessary lines
* Add expose 3000 port to Dockerfile
Co-authored-by: Cyger <cyger@centos7.server >
2021-02-03 11:32:10 +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
620a097faa
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
...
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
2021-02-02 13:59:17 +03:00
9759839cd0
Merge pull request #114 from ONLYOFFICE/feature/fix-history
...
Feature/fix history
2021-02-02 13:09:41 +03:00
e6ee57e09b
php: fix tabulation
2021-02-02 12:53:56 +03:00
50daec31b4
java: fix tabulation
2021-02-02 12:51:08 +03:00
bcd114d089
ruby: fix-history
2021-02-02 12:29:04 +03:00
49592f66bf
Merge pull request #113 from ONLYOFFICE/feature/fix-history-cors
...
Feature/fix history cors
2021-02-02 11:13:40 +03:00
e854b78884
Merge pull request #112 from ONLYOFFICE/feature/add-jwt
...
Feature/add jwt
2021-02-02 11:06:12 +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
abee34981b
ruby: jwt for historyData
2021-02-02 10:57:52 +03:00
768f45f4fb
Merge remote-tracking branch 'remotes/origin/release/v6.2.0' into develop
2021-02-02 09:54:22 +03:00
c3bb70aa9a
nodejs: submit filled form
2021-02-02 09:52:24 +03:00
e53dac1e2b
Merge pull request #111 from ONLYOFFICE/feature/mail-merge
...
Feature/mail merge
2021-02-02 09:51:22 +03:00
71ab72299a
php: added function download
2021-02-01 23:16:47 +03:00
eb4e6b4bc0
csharp-mvc: added function download
2021-02-01 23:09:49 +03:00
4f02a4957f
csharp: added function download
2021-02-01 23:05:25 +03:00
469c2b6ced
java: added function download
2021-02-01 23:02:55 +03:00
8b9a2d2481
csharp: fix merge
2021-02-01 23:02:15 +03:00
e921c936b8
java: fix merge
2021-02-01 23:00:10 +03:00
a5929897ad
php: fix merge
2021-02-01 22:59:17 +03:00
00a1c64353
python: fix merge
2021-02-01 22:58:42 +03:00
6c18acdf97
ruby: fix merge
2021-02-01 22:57:13 +03:00
c0f459132e
csharp-mvc: fix merge
2021-02-01 21:07:49 +03:00
d780a61e52
ruby: jwt for mailmerge
2021-02-01 20:30:07 +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
9ed7b0e96e
ruby: fix cors
2021-01-31 16:02:57 +03:00
a2a094a22c
Merge pull request #109 from ONLYOFFICE/feature/config-refactor
...
Feature/config refactor
2021-01-29 16:20:26 +03:00
9d9afce3ce
GetServerUrl
2021-01-29 15:54:27 +03:00
bb19ea1a6f
рhp: fix serverPath
2021-01-29 14:41:02 +03:00
d667a62a24
csharp: fix GetServerUrl
2021-01-29 14:28:56 +03:00
a92907135d
csharp-mvc: fix GetServerUrl
2021-01-29 14:14:25 +03:00
71fde6f7b9
python: fix getServerUrl
2021-01-29 13:58:29 +03:00
9ac78b77dc
ruby: fix get_server_url
2021-01-29 13:45:38 +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
7f95d59394
java: fix jwtHeader
2021-01-29 12:38: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
1c0a742f54
ruby: config-refactor
2021-01-28 22:05:09 +03:00
4eb4753c01
Merge pull request #107 from ONLYOFFICE/feature/insert-image
...
Feature/insert image
2021-01-28 19:07:10 +03:00
979f001fd0
csharp: fixed tabulation
2021-01-28 17:47:48 +03:00
d0edb368ac
csharp-mvc: fixed tabulation
2021-01-28 17:46:41 +03:00
ac36df16d1
csharp-mvc: moved functions
2021-01-28 17:35:34 +03:00
e845cc498b
csharp: moved functions
2021-01-28 17:34:45 +03:00
606ce23228
nodejs: fix merge
2021-01-28 15:29:14 +03:00
dcd4adf5ad
ruby: fix merge
2021-01-28 15:16:19 +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
e74811a755
Merge pull request #108 from ONLYOFFICE/feature/compare-file
...
Feature/compare file
2021-01-28 14:11:57 +03:00
4c987fbfce
nodejs: fix merge
2021-01-28 13:49:30 +03:00
e90ba356fe
ruby: fix merge
2021-01-28 13:49:14 +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
b867d75bac
ruby: compare-file
2021-01-28 13:28:28 +03:00
2748dbf5b3
csharp: fix tabulation
2021-01-28 11:28:24 +03:00
8b5aab3c63
Merge branch hotfix/v6.1.1 into develop
2021-01-28 08:15:33 +00: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
53e1fbe9ef
nodejs fix merge
2021-01-28 10:49:44 +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
255ec7afe9
python: reviewPermissions
2021-01-27 12:48:46 +03:00
7996ea4825
ruby: reviewPermissions
2021-01-27 12:31:26 +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
b8f5485201
Merge pull request #104 from ONLYOFFICE/feature/new-banner
...
Feature/new banner
2021-01-27 11:16:26 +03:00
d19eaf0ef4
js: new banner
2021-01-27 10:14:29 +03:00
9ee379e8df
ruby: setFavorite
2021-01-26 17:04:38 +03:00
a4b75554bd
csharp: fix banner
2021-01-26 16:18:00 +03:00
854f5e7045
csharp-mvc: fix banner
2021-01-26 16:14:31 +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
b439a5f729
ruby: add fb2 to ConverExtList
2021-01-26 13:35:07 +03:00
848229f79c
ruby: new banner
2021-01-26 13:22:17 +03:00
491f600dc0
csharp: added templates submodule
2021-01-25 12:22:42 +03:00
38055f0b85
csharp: reviewPermissions
2021-01-25 11:53:34 +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
930338f5fc
csharp: fix cors
2021-01-24 23:17:30 +03:00
0875ca8d89
csharp: add files.docservice.header
2021-01-24 23:11:43 +03:00
193bbe2cb7
csharp-mvc: fix files.docservice.header b2ee170ecb
2021-01-24 22:39:12 +03:00
533ee1af91
csharp-mvc: fix GetServerUrl a104aa6c61
2021-01-24 22:11:15 +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
c01afdec17
csharp-mvc: set favorite
2021-01-24 02:49:09 +03:00
b2ee170ecb
csharp: add files.docservice.header
2021-01-22 14:43:51 +03:00
a104aa6c61
csharp: add files.docservice.url.example
2021-01-22 11:47:53 +03:00
3f13590f55
csharp-mvc: config-refactor
2021-01-21 14:48:25 +03:00
aa7132e467
csharp-mvc: fix-history
2021-01-20 22:31:01 +03:00
60ddcb433c
Merge branch 'develop' into feature/fix-history
2021-01-20 21:58:27 +03:00
14840847bf
csharp-mvc: get-file
2021-01-20 21:10:39 +03:00
06cf08822b
csharp-mvc: get-files
2021-01-20 17:50:46 +03:00
c4e2921040
Merge branch 'develop' into feature/get-files
2021-01-20 14:52:30 +03:00
ea455421f7
csharp-mvc: fix cors
2021-01-20 12:10:22 +03:00
90abe267bf
Merge branch 'develop' into feature/fix-history-cors
2021-01-20 12:04:38 +03:00
4e2a5fb175
csharp-mvc: reviewPermissions
2021-01-19 18:36:32 +03:00
c54b760526
Merge branch 'develop' into feature/reviewPermissions
2021-01-19 15:54:13 +03:00
a92963aed1
csharp-mvc: added templates submodule
2021-01-19 15:11:45 +03:00
feee808453
Merge remote-tracking branch 'origin/hotfix/v6.1.1' into release/v6.2.0
2021-01-19 10:27:25 +03:00
d19ee9d4c1
python: added templates submodule
2021-01-16 21:19:36 +03:00
1a7fbe656b
php: added templates submodule
2021-01-16 20:36:14 +03:00
500be4f8e4
java: added templates submodule
2021-01-16 20:02:54 +03:00
c96659ed9c
nodejs: mime v2 lookup renamed to getType ( 0a2056b1b1)
2020-12-30 12:08:26 +03:00
1b2cec44ac
nodejs: mime v2 lookup renamed to getType ( 0a2056b1b1)
2020-12-25 10:03:42 +03:00
ecfe99f7ed
Merge branch 'develop' into feature/mail-merge
2020-12-25 10:02:44 +03:00
81450a883f
nodejs: mime v2 lookup renamed to getType ( 0a2056b1b1)
2020-12-25 10:02:29 +03:00
fec328ad9d
python: setFavorite
2020-12-24 22:51:35 +03:00
b197f4c258
php: setFavorite
2020-12-24 22:50:28 +03:00
0b03093c53
java: setFavorite
2020-12-24 22:49:22 +03:00
3bf8952b1a
nodejs: nodejs: templates submodule
2020-12-21 15:10:12 +03:00
23b42ed070
nodejs: restructured assets folder
2020-12-21 15:05:07 +03:00
25906383e2
nodejs: setFavorite
2020-12-16 09:57:29 +03:00
1de2571c1b
[bug] Fix invalid request to relative url after changing urllib version to 2.36.1
2020-12-15 17:52:20 +03:00
c597e914a9
nodejs: favorite
2020-12-15 17:33:00 +03:00
a2c0527882
Merge pull request #101 from ONLYOFFICE/fix/jwt-issuer
...
[bug] Fix "Error: "issuer" must be a string" on conversion
2020-12-09 15:43:44 +03:00
a7f7b3ebf7
[bug] Fix "Error: "issuer" must be a string" on conversion
2020-12-09 15:19:43 +03:00
95dfc9796d
Merge remote-tracking branch 'origin/release/v6.1.0' into release/v6.2.0
2020-12-07 12:45:32 +03:00
125d9a2ab4
Merge remote-tracking branch 'origin/release/v6.1.0' into develop
2020-12-07 12:45:21 +03:00
4dd4453599
csharp: jwt for HistoryData
2020-12-06 13:30:30 +03:00
7e2d83f04e
csharp-mvc: jwt for HistoryData
2020-12-06 13:28:13 +03:00
b7d2775733
Merge branch 'feature/compare-file' of https://github.com/ONLYOFFICE/document-server-integration into feature/compare-file
2020-12-05 12:29:30 +03:00
aa5f1e3df4
csharp: compare-file
2020-12-05 12:22:35 +03:00
4193089de4
csharp-mvc: compare-file
2020-12-05 12:07:56 +03:00
18a4dc20eb
csharp: insert-image
2020-12-04 19:03:02 +03:00
7ced0591bd
csharp-mvc: insert-image
2020-12-04 18:19:54 +03:00
a010088395
csharp-mvc: fix mail-merge
2020-12-04 12:35:06 +03:00
d5a6c1e605
csharp: fix mail-merge
2020-12-04 12:33:22 +03:00
ab68d95f5d
csharp-mvc: mail-merge
2020-12-02 19:22:20 +03:00
301775aafd
csharp: mail-merge
2020-12-02 19:01:55 +03:00
b7bda80f48
Merge branch release/v6.1.0 into master
2020-12-01 07:46:23 +00:00
51c180726c
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
2020-11-29 13:29:01 +03:00
aee637b980
python: check filename from url
2020-11-27 22:56:24 +03:00
63af540fe8
php: check filename from url
2020-11-27 22:55:01 +03:00
2819cbc5e3
java: check filename from url
2020-11-27 22:52:22 +03:00
02db6fa76a
csharp: added .fb2 to ConverExtList
2020-11-27 17:16:06 +03:00
1feb56e397
csharp-mvc: added .fb2 to ConverExtList
2020-11-27 17:14:34 +03:00
502f001cfa
Merge branch 'feature/csharp' into feature/add-format
2020-11-27 17:02:04 +03:00
7c10a0fe82
csharp-mvc: banner
2020-11-27 16:27:12 +03:00
aa16df8de7
java: fix filename ( 38cc631e2e)
2020-11-27 15:25:47 +03:00
bbff0206c1
php: fix filename ( 7b017c15f8)
2020-11-27 13:09:10 +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
6250902a55
php: jwt for compare-file
2020-11-27 11:00:16 +03:00
7b017c15f8
php: compare-file
2020-11-27 10:57:50 +03:00
b21d179f4b
python: jwt for compare-file
2020-11-26 18:32:06 +03:00
c75f9166c5
python: compare-file
2020-11-26 18:30:27 +03:00
0f2695fba0
nodejs: jwt for compare-file
2020-11-26 18:16:44 +03:00
aca8e94f2a
nodejs: compare-file
2020-11-26 18:13:01 +03:00
9876e745e5
python: jwt for insert-image
2020-11-26 17:27:01 +03:00
eb8cf75bc0
java: jwt for insert-image
2020-11-26 17:23:21 +03:00
62060d2538
php: jwt for insert-image
2020-11-26 17:20:57 +03:00
0ad9907eb6
nodejs: jwt for insert-image
2020-11-26 17:18:04 +03:00
2090bad807
nodejs: insert-image
2020-11-26 17:12:53 +03:00
2368354c6d
php: insert-image
2020-11-26 16:10:09 +03:00
31337cc9c9
python: insert-image
2020-11-26 15:33:16 +03:00
17cad4a0dc
java: insert-image
2020-11-26 14:54:09 +03:00
539023bd25
Rename images
2020-11-26 11:45:06 +03:00
0ada5484bb
Rename icons on welcome page
2020-11-26 11:41:37 +03:00
b4e4a7ba53
redesign welcome page
2020-11-26 11:29:00 +03:00
48fa83b850
php: jwt for mailmerge
2020-11-26 01:16:33 +03:00
2017c45c19
java: jwt for mailmerge
2020-11-26 01:07:23 +03:00
74505f5c44
nodejs: jwt for mailmerge
2020-11-26 00:31:42 +03:00
6f6e80cf68
python: jwt for mailmerge
2020-11-26 00:14:12 +03:00
d5a8cdc760
python: jwt for historyData
2020-11-25 18:54:46 +03:00
ca5ba06506
php: jwt for historyData
2020-11-25 18:47:12 +03:00
720c61c7b7
java: jwt for historyData
2020-11-25 18:40:30 +03:00
6e03e71b59
php: add DOC_SERV_JWT_HEADER
2020-11-25 10:20:29 +03:00
ea22efdac8
java: fix 773aa62478
2020-11-24 22:24:19 +03:00
5521cd44dd
python: add DOC_SERV_JWT_HEADER
2020-11-24 13:27:54 +03:00
773aa62478
java: add files.docservice.url.example
2020-11-23 17:22:02 +03:00
280d9e3dba
nodejs: fix config
2020-11-23 15:47:37 +03:00
ee5fe30010
python: fix 791f2b53a9
2020-11-23 15:19:38 +03:00
c0b520e440
php: config-refactor
2020-11-23 11:00:57 +03:00
fd95aca32b
java: config-refactor
2020-11-23 10:42:32 +03:00
791f2b53a9
python: config-refactor
2020-11-20 18:16:26 +03:00
02ee872d4c
Merge pull request #99 from ONLYOFFICE/feature/add-languages
...
Add languages
2020-11-20 13:01:28 +03:00
a76ec17e70
Add languages
2020-11-20 12:59:46 +03:00
9591995b9c
Add languages
2020-11-20 12:13:15 +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
e91beb5518
php: add fb2 to ConverExtList
2020-11-19 16:45:10 +03:00
39fbf43019
python: add fb2 to ConverExtList
2020-11-19 13:59:09 +03:00
74af4cf734
Merge pull request #98 from ONLYOFFICE/feature/node-start
...
nodejs: remove shebang line
2020-11-19 12:49:54 +03:00
e8eb607325
python: fix-history
2020-11-19 12:17:04 +03:00
cefcba3b04
nodejs: remove shebang line
2020-11-19 11:31:17 +03:00
fb4bc9c38e
Merge pull request #97 from ONLYOFFICE/feture/update-dependencies
...
[nodejs] Dependencies
2020-11-19 11:26:21 +03:00
cb245efbb2
nodejs: fix ejs compilation
2020-11-19 11:11:43 +03:00
0a2056b1b1
[nodejs] Dependencies
...
Update nodejs dependencies
2020-11-19 10:13:45 +03:00
974840bbac
python: new banner
2020-11-18 18:26:53 +03:00
be5f6e3a6e
python: fix 4903c017f4
2020-11-18 18:14:59 +03:00
19debed4d1
php: fix 9b7d54fdfb
2020-11-18 17:50:41 +03:00
4903c017f4
python: mailmerge
2020-11-18 17:48:19 +03:00
6c3f31c32a
python: get-file
2020-11-18 14:57:17 +03:00
73d79c1f61
python: get-files
2020-11-18 14:55:23 +03:00
65b4e453a4
Merge pull request #96 from ONLYOFFICE/feature/Gurovcsharp
...
Feature/csharp_and_csharp-mvc
2020-11-17 13:58:07 +03:00
157e6d3121
/csharp-MVC
...
Added work with packages and etc
2020-11-17 13:56:56 +03:00
d62a760439
csharp:
...
Changed path to the WebApplication.targets
Added new libs for Web.Helpers
2020-11-17 13:23:47 +03:00
4ef5f7d290
nodejs, java: add Content-Type, fix 2e3fd4725a, 1d24a4a309
2020-11-16 16:02:12 +03:00
9b7d54fdfb
php: mailmerge
2020-11-16 15:45:28 +03:00
4e17421c7e
php: get-file
2020-11-16 11:16:51 +03:00
2b4513d68b
php: get-files
2020-11-15 20:53:04 +03:00
47c0b04de1
php: new banner
2020-11-13 14:38:45 +03:00
ee077978b9
php: fix-history
2020-11-13 14:32:14 +03:00
1dc5e67da6
php: fix cors
2020-11-13 11:48:40 +03:00
cf4dd454f6
php: reviewPermission
2020-11-13 11:43:10 +03:00
858b437e80
java: reviewPermissions
2020-11-12 16:46:25 +03:00
0512243be0
java: fix-history
2020-11-12 10:28:38 +03:00
ba3b3b4ce6
java: fix cors
2020-11-11 14:15:54 +03:00
e79cb3c3f3
Merge pull request #95 from ONLYOFFICE/feature/fixLicense
...
fixed license comment 8050ec572a
2020-11-10 17:21:04 +03:00
ddb31bd4e8
fixed license comment 8050ec572a
2020-11-10 17:10:43 +03:00
57e813d0ce
fixed tabulation 1d24a4a309
2020-11-10 15:35:34 +03:00
1d24a4a309
The GetFilesInfo () method has been improved. If the method is called without a parameter, then the entire list of files is returned, if the idFile parameter is specified, then information about the file with id: idFile is returned.
2020-11-09 18:15:45 +03:00
fe7e7640b5
method getFilesInFolderInfo() moved from nodejs example to java example
2020-11-09 15:23:48 +03:00
7a7503be6a
[macos] Fixed run example ( #94 )
2020-11-09 13:05:06 +03:00
651e161680
Feature/get file method ( #93 )
...
* added method for getting information about files
* added version attribute to response object and new method logic
* old code has been removed
* fixed a code structure
* improvement of the getFilesInfo method
* edited readme file. format code
* format
Co-authored-by: Sergey Linnik <sergey.linnik@onlyoffice.com >
2020-11-09 12:21:34 +03:00
67b93909ac
java: mailmerge
2020-11-09 11:10:34 +03:00
2e3fd4725a
Feature/get files method ( #92 )
...
* added method for getting information about files
* added version attribute to response object and new method logic
* old code has been removed
* fixed a code structure
* format
* edited readme file
* code formatting
Co-authored-by: Sergey Linnik <sergey.linnik@onlyoffice.com >
2020-11-09 09:45:03 +03:00
17f651c47a
java: new banner
2020-11-06 11:29:47 +03:00
928cc7480a
nodejs: new banner
2020-11-06 11:10:39 +03:00
bf8e59ddee
csharp: new banner
2020-11-06 10:46:25 +03:00
986c51483d
Add linux config ( #91 )
2020-10-26 11:51:25 +03:00
1ea1a3f904
[run] Fix
...
Fix config port for mac
2020-10-26 11:49:08 +03:00
715ab7d690
nodejs: reviewPermissions
2020-10-06 12:47:31 +03:00
4c62e12822
updated dependencies to support ruby 2.7
2020-10-02 14:24:05 +03:00
951f5f9887
corrected comments syntax
2020-10-02 14:23:32 +03:00
1184402f94
fix table
2020-10-01 11:37:15 +03:00
5c0d8b8dd9
Merge branch 'release/v6.0.0' into develop
...
# Conflicts:
# Readme.md
# web/documentserver-example/nodejs/licenses/urllib.license
2020-09-30 19:12:05 +03:00
cadeb19ece
Merge branch 'master' into release/v6.0.0
...
# Conflicts:
# LICENSE.txt
2020-09-30 18:58:24 +03:00
001b9a2cf6
Merge branch hotfix/v5.6.4 into develop
2020-09-15 13:40:43 +00: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
875dfaaec4
Merge pull request #82 from ONLYOFFICE/hotfix/apache
...
Apache License
2020-09-03 20:50:34 +03:00
c9def721d2
3rd-party license
2020-09-03 13:08:44 +03:00
8050ec572a
apache
2020-09-02 12:06:52 +03:00
6918016dda
Apache License
2020-08-31 15:22:12 +03:00
fb039100e1
Update Readme.md
2020-07-23 18:51:17 +03:00
4a6b549eaa
Update Readme.md ( #80 )
...
* Update Readme.md
- add API methods for text examples
2020-07-23 18:37:46 +03:00
3d09910cf3
[format] Add fb2 to convertedDocs
2020-07-22 11:58:18 +03:00
fa0aad779d
nodejs: mailmerge
2020-07-07 16:27:26 +03:00
5cefe5c3b2
Merge pull request #79 from ONLYOFFICE/feature/action-link
...
Feature/action link
2020-06-30 15:43:33 +03:00
0cf0171721
fixed an issue when creating a second action link
2020-06-18 11:44:21 +03:00
f8a1587109
Merge pull request #74 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/ffi-1.12.2
...
build(deps): bump ffi from 1.9.18 to 1.12.2 in /web/documentserver-example/ruby
2020-06-09 12:13:09 +03:00
44142da370
Merge branch 'develop' into dependabot/bundler/web/documentserver-example/ruby/ffi-1.12.2
2020-06-09 12:12:19 +03:00
ecbae22fcc
ruby: get link to bookmark
2020-05-21 14:39:10 +03:00
b3a79deef8
python: get link to bookmark
2020-05-21 12:51:07 +03:00
c4f278d58a
java: get link to bookmark
2020-05-21 12:51:07 +03:00
b0ea8ed388
csharp-mvc: get link to bookmark
2020-05-21 12:50:48 +03:00
220516c930
csharp: get link to bookmark
2020-05-18 16:31:16 +03:00
3be28877ab
fixed header name
2020-05-18 16:30:56 +03:00
b3a96f15ab
php: get link to bookmark
2020-05-18 14:19:25 +03:00
14a68befd2
v5.5.2
2020-04-27 17:01:53 +03:00
b1af12a78d
v5.5.1r2
2020-04-15 14:18:33 +03:00
75f137470b
nodejs: get link to bookmark
2020-03-19 13:39:29 +03:00
45ea1a8c1d
v5.5.0
2020-03-04 18:33:54 +03:00
1b90f16eb5
build(deps): bump ffi in /web/documentserver-example/ruby
...
Bumps [ffi](https://github.com/ffi/ffi ) from 1.9.18 to 1.12.2.
- [Release notes](https://github.com/ffi/ffi/releases )
- [Changelog](https://github.com/ffi/ffi/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ffi/ffi/compare/1.9.18...1.12.2 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-03-04 15:33:27 +00:00
29072e3d5c
bump 2020
2020-03-04 10:13:12 +03:00
b82c2c68d5
Merge pull request #71 from ONLYOFFICE/feature/python
...
Feature/python
2020-03-04 10:09:03 +03:00
67d6eaa18b
python: env vars
2020-03-03 19:03:05 +03:00
cb91ba1620
bump 2020
2020-03-03 14:39:29 +03:00
0e91256847
python: 2020
2020-03-03 14:32:11 +03:00
ce16625091
python: converted filename was not sent to client
2020-03-03 13:27:15 +03:00
4d538fc35d
python: footer copyright
2020-03-03 13:26:36 +03:00
36c9583a2c
nodejs: remove trade
2020-03-03 11:55:24 +03:00
1bde1f66d3
change name
2020-03-03 11:55:24 +03:00
fddc08c24b
csharp: removed c#7 features
2020-03-03 11:40:00 +03:00
06305ee262
python: zip build script
2020-03-03 11:08:30 +03:00
e55e27cee8
python: reload on dialog close
2020-03-03 11:03:57 +03:00
8fa77cb9ba
python: copyrights & cleanup
2020-03-03 11:00:23 +03:00
f038327928
python: sorting by date
2020-03-03 10:45:08 +03:00
0adaf8a84b
python: lower file extension
2020-03-03 10:35:52 +03:00
85cb88b0fc
python: fixed editors language
2020-03-03 10:26:49 +03:00
4c8ac0457f
Merge pull request #69 from ONLYOFFICE/feature/ruby-v2.6.5
...
Feature/ruby v2.6.5
2020-03-02 17:36:46 +03:00
3ba6072b3e
Merge pull request #68 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.10.8
...
build(deps): bump nokogiri from 1.8.1 to 1.10.8 in /web/documentserver-example/ruby
2020-02-27 15:52:34 +03:00
ad966cfc28
Merge branch 'feature/ruby-v2.6.5' into dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.10.8
...
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
2020-02-27 15:50:48 +03:00
1f9b2b8230
build(deps): bump nokogiri in /web/documentserver-example/ruby
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.8.1 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.1...v1.10.8 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-02-25 08:22:59 +00:00
8b9f07e46e
[run] Platform
...
Add platform for run
2020-01-14 15:14:10 +03:00
af7101844a
nodejs: fix upload files
2020-01-09 14:07:00 +03:00
b58bf412fa
nodejs: add run-develop
2019-12-25 18:33:49 +03:00
a1c524df00
python: changed docserv default link
2019-12-25 11:28:12 +03:00
be25001479
Fixed displaying mobile version cb5324381e
2019-12-13 13:09:28 +03:00
7466aba10f
ruby: 'raise_in_transactional_callbacks' deprecated since rails 5.0.0
2019-11-21 14:43:53 +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
a4bf9d76f6
ruby: updated dependencies to support ruby v2.6.5
2019-11-21 14:36:56 +03:00
7c5faa7c8a
Merge pull request #66 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/loofah-2.3.1
...
build(deps): bump loofah from 2.1.1 to 2.3.1 in /web/documentserver-example/ruby
2019-11-21 14:33:02 +03:00
3497eeea9f
build(deps): bump loofah in /web/documentserver-example/ruby
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.1.1 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.1.1...v2.3.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2019-11-08 16:23:59 +00:00
7717cb35f8
python: 3rd party licenses
2019-11-07 18:25:35 +03:00
1c59409ce2
python: blockcontent mode
2019-11-07 17:50:30 +03:00
5545568e04
python: readme
2019-11-05 17:57:33 +03:00
6ba9b33606
python: version history
2019-11-05 17:51:22 +03:00
8d657a0101
python: jwt support
2019-11-01 15:47:59 +03:00
c1454eff13
python: document list
2019-11-01 10:58:20 +03:00
f7867e4bc3
python: document editing
2019-10-28 12:58:31 +03:00
f94e057492
python: upload, convert, create sample
2019-10-25 17:05:20 +03:00
a5371faa27
python: django template
2019-10-25 16:54:23 +03:00
34527f0b3e
python: static files
2019-10-25 16:46:45 +03:00