Commit Graph

3423 Commits

Author SHA1 Message Date
febce17e86 Merge branch 'develop' into feature/restore-history 2023-11-13 16:16:10 +07:00
63b2202f82 python: storage folder in configuration manager 2023-11-13 16:15:05 +07:00
88b8af6004 Merge pull request #485 from ONLYOFFICE/feature/user-image
Feature/user image
v99.99.99.3631 v99.99.99.3630
2023-11-10 13:32:46 +03:00
9487a87b65 Merge remote-tracking branch 'remotes/origin/develop' into feature/user-image
# Conflicts:
#	CHANGELOG.md
2023-11-10 13:32:17 +03:00
15d2f6fa79 Merge pull request #486 from ONLYOFFICE/feature/auto-convert
Convert after uploading only tagged formats
v99.99.99.3628
2023-11-09 15:56:52 +03:00
7c57b0f575 python: code refactoring 2023-11-08 13:08:07 +07:00
2ee051e9fc java-spring: 'uid-' prefix was returned to User class id field 2023-11-08 11:38:04 +07:00
f7386df050 ruby: convert after uploading only tagged formats 2023-11-07 13:01:27 +07:00
d3185253a8 python: convert after uploading only tagged formats 2023-11-07 12:56:06 +07:00
e18d36f18d php: convert after uploading only tagged formats 2023-11-07 12:43:05 +07:00
794e578a37 merging fix 2023-11-07 12:00:51 +07:00
c86c6bf17e Merge branch 'develop' into feature/user-image 2023-11-07 11:25:40 +07:00
0494d24e29 Merge branch 'develop' into feature/restore-history 2023-11-07 10:21:57 +07:00
34e60cd33f Merge pull request #484 from ONLYOFFICE/feature/remove-logo-parameter
java-spring: remove logo parameter in config and Logo.java class
v99.99.99.3627 v99.99.99.3626 v99.99.99.3625
2023-11-06 14:48:49 +03:00
089819cdc4 setUsers for region protection in changelog 2023-11-06 14:43:33 +03:00
146f6224f2 Merge pull request #480 from ONLYOFFICE/feature/region-protect
Feature/region protect
2023-11-06 14:42:21 +03:00
65b9bfec01 java-spring: remove logo parameter in config and Logo.java class 2023-11-06 09:55:45 +03:00
f620da3b98 java: empty usersInfo for anonymous 2023-11-06 12:02:38 +07:00
62e2f7426c csharp: user avatar 2023-11-06 11:41:09 +07:00
672a351402 csharp-mvc: user image 2023-11-06 10:54:39 +07:00
dfe61c5013 java: user avatar 2023-11-03 20:47:43 +07:00
13c93ce2de java-spring: user avatar 2023-11-03 19:44:33 +07:00
b175ebc761 Merge pull request #482 from ONLYOFFICE/feature/php-convert
php: fix convert (50dca2e2c0)
v99.99.99.3624 v99.99.99.3623 v99.99.99.3622 v99.99.99.3621
2023-11-02 17:21:50 +03:00
20aea45ac7 php: user avatar 2023-11-02 17:17:41 +07:00
a220cdd627 ruby: user avatar 2023-11-01 13:23:51 +07:00
20ca2d0cbd python: lint fix 2023-11-01 11:17:34 +07:00
e1d8418055 Merge branch 'develop' into feature/region-protect 2023-11-01 11:12:26 +07:00
9d3d5243b2 python: lint fix 2023-11-01 10:59:41 +07:00
440b51c7ff Merge branch 'develop' into feature/restore-history 2023-11-01 10:51:44 +07:00
1d747b834d Merge branch 'feature/user-image' of https://github.com/ONLYOFFICE/document-server-integration into feature/user-image 2023-11-01 10:25:20 +07:00
a5a1df45b1 python: user avatar 2023-11-01 10:18:58 +07:00
43fc58f6c7 Merge pull request #475 from ONLYOFFICE/feature/referenceData-open
Feature/reference data open
v99.99.99.3620
2023-10-31 14:27:49 +03:00
84824d1ed4 onRequestOpen to changelog 2023-10-31 14:26:29 +03:00
1620e8277d Merge remote-tracking branch 'remotes/origin/develop' into feature/referenceData-open
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/python/src/views/actions.py
2023-10-31 14:25:00 +03:00
09c1b9e45c onRequestOpen to changelog 2023-10-31 13:28:06 +03:00
c7409e3f35 java-spring: added JsonIgnoreProperties annotation to ignore the "windowName" field 2023-10-31 13:02:14 +03:00
5c09e1cb53 Merge pull request #474 from ONLYOFFICE/feature/flake8-pylint
Feature/flake8 pylint
2023-10-31 12:54:52 +03:00
03ffae8115 php: fix convert (50dca2e2c0) 2023-10-31 13:54:06 +07:00
6a059bb498 Merge branch 'develop' into feature/flake8-pylint 2023-10-30 16:19:08 +07:00
c78814ced4 removed pylint 2023-10-30 16:15:57 +07:00
e444fd02e5 Merge branch 'develop' into feature/region-protect 2023-10-30 15:52:23 +07:00
0a76dba089 csharp: setUsers for region protection 2023-10-30 15:45:16 +07:00
7666394f1d csharp-mvc: setUsers for region protection 2023-10-30 15:28:45 +07:00
b8c6f72e74 java: setUsers for region protection 2023-10-30 14:38:45 +07:00
f501612067 java-spring: setUsers for region protection 2023-10-30 14:15:09 +07:00
3cf0c1a6a5 Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop v99.99.99.3616 v99.99.99.3617 v99.99.99.3614 v99.99.99.3615 2023-10-27 18:44:25 +03:00
52c11fa3a1 using documentserver v7.5 2023-10-27 18:39:40 +03:00
86d2fc1399 Merge pull request #478 from ONLYOFFICE/chore/php-readme
php: update readme
# Conflicts:
#	web/documentserver-example/php/README.md
2023-10-27 18:36:09 +03:00
d2f77d857d Merge pull request #477 from ONLYOFFICE/chore/python-readme
python: update readme
# Conflicts:
#	web/documentserver-example/python/readme.md
2023-10-27 18:34:31 +03:00
5b7fe48354 Merge pull request #478 from ONLYOFFICE/chore/php-readme
php: update readme
2023-10-27 18:31:40 +03:00