Commit graph

382 commits

Author SHA1 Message Date
Roger Shieh
5c17c711b1
Update run-document-server.sh (#439) 2022-05-24 18:02:42 +03:00
papacarlo
95e27e2655 Merge branch release/v7.1.0 into master 2022-05-12 13:21:23 +00:00
Roman Demidov
452dfeb56d
Fix bug #56785 (#434)
* Fix bug #56785

* Changes for root
2022-04-29 14:57:14 +03:00
Roman Demidov
80acbe974d
Fix bug #53046 : sed error starting container on Arch (#433) 2022-04-29 14:55:25 +03:00
Alexey Golubev
4fb0a1e712
Improve SSL certificate detection (#431) 2022-04-25 17:25:19 +03:00
Alexey Golubev
39d2e303f1 Fix disabling JWT 2022-04-12 19:00:46 +03:00
papacarlo
decb1ed860 Merge branch hotfix/v7.0.2 into release/v7.1.0 2022-04-05 12:27:33 +00:00
papacarlo
bb160d345e Merge branch hotfix/v7.0.1 into release/v7.1.0 2022-03-23 10:29:52 +00:00
papacarlo
e17831904d Merge branch hotfix/v7.0.1 into master 2022-02-22 08:17:41 +00:00
Stavros Kois
21f5019e1c
Initialliaze services.CoAuthoring.redis before attempting to set a child to a value (#404)
Co-authored-by: papacarlo <builder@onlyoffice.com>
2022-02-09 10:37:52 +03:00
Pavel Lobashov
b2e720e66c
Fix broken links to Docker-CommunityServer (#402)
Continue of #400

Those links became incorrect in
e7c8e59a37

I'm not sure that we REALLY need those links in this project, maybe just
give links to README page and that's it
But leaving it as it is
2022-01-31 11:18:50 +03:00
papacarlo
4c959d62b7 Merge branch release/v7.0.0 into release/v7.1.0 2022-01-17 14:34:38 +00:00
papacarlo
973409cc8f Merge branch release/v7.0.0 into master 2022-01-17 14:34:33 +00:00
papacarlo
33faf622c8 Merge branch hotfix/v6.4.2 into release/v7.0.0 2021-10-28 07:33:57 +00:00
papacarlo
44a96b1fde Merge branch hotfix/v6.4.2 into develop 2021-10-28 07:33:55 +00:00
papacarlo
26ef312557 Merge branch hotfix/v6.4.1 into release/v6.5.0 2021-09-30 12:21:08 +00:00
papacarlo
2eb99ffb20 Merge branch hotfix/v6.4.1 into develop 2021-09-30 12:21:03 +00:00
papacarlo
ca39675055 Merge branch hotfix/v6.4.1 into master 2021-09-28 08:08:26 +00:00
Semyon Bezrukov
a31a579d24
Add WOPI_ENABLED variable (#379)
* Add WOPI_ENABLED variable

* Add var description
2021-09-14 17:53:37 +03:00
Svetlana Maleeva
32a8a24a0f
Update README.md (#377) 2021-09-14 17:42:55 +03:00
papacarlo
0613f8a0ca Merge branch release/v6.4.0 into develop 2021-08-26 13:55:56 +00:00
papacarlo
a23477301e Merge branch release/v6.4.0 into master 2021-08-26 11:40:24 +00:00
papacarlo
d654094671 Merge branch hotfix/v6.3.1 into release/v6.4.0 2021-07-15 13:14:47 +00:00
papacarlo
93a0526a7c Merge branch hotfix/v6.3.1 into develop 2021-07-15 13:14:43 +00:00
Roman Demidov
5bf1ff715f
Remove server version of spell checker (#365) 2021-06-22 09:59:50 +03:00
Semyon Bezrukov
c6e7d68016
Fix docker targets (#361)
* Fix docker targets

* Fix docker latest tag
2021-06-01 17:29:31 +03:00
papacarlo
13a01e7c56 Merge branch release/v6.3.0 into develop 2021-05-20 12:08:20 +00:00
papacarlo
3b830417a2 Merge branch release/v6.3.0 into master 2021-05-20 12:08:15 +00:00
papacarlo
245659807a Merge branch hotfix/v6.2.2 into release/v6.3.0 2021-05-07 13:27:20 +00:00
papacarlo
2f26419ac7 Merge branch hotfix/v6.2.2 into develop 2021-05-07 13:25:56 +00:00
Pavel Lobashov
67df644858
Precise info about table existance (#355) 2021-04-29 12:14:31 +03:00
papacarlo
ca6b3a67a3 Merge branch hotfix/v6.2.2 into master 2021-04-19 12:18:58 +00:00
Roman Demidov
f2c708cff2
Reset database tables on update (#351)
* Reset database tables on update

* Add changes

* Add changes

* Add changes

* Add changes

* Add changes

* Add changes
2021-04-14 17:10:38 +03:00
Alexey Golubev
2f26cea790
Fix #347 (#349) 2021-04-01 10:07:07 +03:00
papacarlo
30c5612cfb Merge branch hotfix/v6.2.1 into release/v6.3.0 2021-03-31 11:27:32 +00:00
papacarlo
cbb749d77c Merge branch hotfix/v6.2.1 into develop 2021-03-31 11:27:26 +00:00
jdoubleu
1cfe84b8b8
Fix automatic port detection for database (#341) 2021-03-19 16:20:52 +03:00
papacarlo
30ca844513 Merge branch release/v6.2.0 into release/v6.3.0 2021-03-19 07:54:45 +00:00
papacarlo
c611b2b080 Merge branch release/v6.2.0 into develop 2021-03-18 15:22:47 +00:00
papacarlo
9dc5f5d993 Merge branch release/v6.2.0 into master 2021-03-01 08:47:27 +00:00
Semyon Bezrukov
393006d306
Add pull ubuntu image (#334) 2021-02-24 18:34:03 +03:00
papacarlo
ea0fcf3951 Merge branch hotfix/v6.1.1 into develop 2021-01-28 08:28:05 +00:00
Alexey Golubev
cbff89bdea
Merge pull request #323 from ONLYOFFICE/hotfix/v6.1.1
Merge hotfix/v6.1.1 into release/v6.2.0
2020-12-25 11:31:19 +03:00
papacarlo
9676e7aac1 Merge branch release/v6.1.0 into develop 2020-12-24 07:52:11 +00:00
Semyon Bezrukov
e7d2cc2cd5
Edit s3 paths (#319)
* Edit s3 paths

* DocumentServer installed by url

* Fix install recommends
2020-12-16 11:39:05 +03:00
papacarlo
93740b7c37 Merge branch release/v6.1.0 into master 2020-12-08 07:07:57 +00:00
papacarlo
d26fd0d234 Merge branch hotfix/v6.0.2 into release/v6.1.0 2020-12-07 14:38:53 +00:00
papacarlo
fd7e1a926a Merge branch hotfix/v6.0.2 into develop 2020-12-07 14:38:43 +00:00
papacarlo
4cc63380f2 Merge branch release/v6.1.0 into master 2020-12-01 07:51:32 +00:00
Alexey Golubev
eddbbbf3eb
Fix unsupported rabbitmq ver. Use 20.04 as base. (#307)
* Fix unsupported rabbitmq ver. Use 20.04 as base.

* Extend timeout for test (#311)

* test01

* Timeout

* Small changes

* Change timeout to 90

Co-authored-by: Roman Demidov <roman.demidov@onlyoffice.com>
2020-11-20 10:53:36 +03:00