jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
421 commits 15 branches 1744 tags 3.1 MiB
Commit graph

421 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roman Demidov
326a005ac7
Fix empty lets encrypt params error (#310) 2020-11-18 10:46:19 +03:00
Alexey Golubev
cd02cd6deb
Merge pull request #309 from zhaofengli/netcat-ipv6 
Use netcat-openbsd for IPv6 support
 2020-11-09 14:05:04 +03:00
Zhaofeng Li
94c64d3f6d Use netcat-openbsd for IPv6 support 2020-11-08 23:38:31 -08:00
papacarlo
f85ac8c510 Merge branch hotfix/v6.0.1 into release/v6.1.0 2020-10-28 14:31:41 +00:00
papacarlo
0ed3f8fbbf Merge branch hotfix/v6.0.1 into develop 2020-10-28 14:31:31 +00:00
evgeniy-antonyuk
9e63609c14
Fix custom db name bug (#304) 
Co-authored-by: papacarlo <builder@onlyoffice.com>
 2020-10-27 13:50:48 +03:00
Roman Demidov
bdef500858
Allow let's encrypte sertificates (#300) 
* Allow let's encrypte sertificates

Co-authored-by: papacarlo <builder@onlyoffice.com>
Co-authored-by: Roman <demidov.roman@onlyoffice.com>
 2020-10-22 13:47:51 +03:00
Roman Demidov
211ae50980
Fix #281: Add option to disable CPU-heavy tasks on startup (#293) 
* Fix #281: Add option to disable CPU-heavy tasks on startup

* Update README.md

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update README.md

Co-authored-by: Roman <demidov.roman@onlyoffice.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2020-10-20 16:14:55 +03:00
hellonadya
a231d7992a
Update README.md (#301) 
- add info on OO Docs & OO Workspace
 2020-10-16 16:48:43 +03:00
Roman Demidov
26854106a3
Add consent to the fonts license (#297) 
* Add concent to the fonts license

* Small changes

* Small changes

Co-authored-by: papacarlo <builder@onlyoffice.com>
Co-authored-by: Roman <demidov.roman@onlyoffice.com>
 2020-10-08 15:58:07 +03:00
papacarlo
85158c3624 Merge branch release/v6.0.0 into develop 2020-09-30 15:15:35 +00:00