Commit Graph

4831 Commits

Author SHA1 Message Date
067959ed80 Merge branch 'feature/drupal_docspace' into release/1.21.0 2024-04-11 12:25:01 +03:00
0944f31fb9 Merge branch 'feature/databases' into release/1.21.0
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2024-04-11 12:24:28 +03:00
ade3ee4b56 Merge branch 'feature/structure' into release/1.21.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2024-04-11 12:19:42 +03:00
5206537146 Edit LinuxInstallationCentOS.ascx 2024-04-09 18:39:06 +03:00
ebd38de796 Merge branch 'Pixabay' into develop 2024-04-08 15:05:11 +03:00
1f311969ba Edit LinuxInstallationCentOS.ascx 2024-04-08 14:31:00 +03:00
e2f7e56b8c Replace Windows Server 2012 with 2016 2024-04-08 13:22:42 +03:00
trovier
8cfae56a9d Fixes as per testing 2024-04-02 15:41:51 +02:00
4efda89228 Edit statistical-functions.ascx 2024-04-01 16:04:12 +03:00
trovier
4cce87fa9c Fixes as per testing 2024-04-01 14:31:44 +02:00
trovier
214e0c4404 Initial commit 2024-03-29 13:24:55 +01:00
9e32e27539 Edit statistical-functions.ascx 2024-03-29 14:22:32 +03:00
AlyonaYar
3158406fe7 Changed image for Pixabay in SE 2024-03-29 09:46:10 +03:00
bc496b96ef Edit ConfiguringDeveloper.ascx 2024-03-27 15:44:58 +03:00
bbb13da5ce Edit DockerInstallationDocument.ascx 2024-03-27 15:42:15 +03:00
trovier
5e7bc8e78f Fixes as per testing 2024-03-26 14:27:05 +01:00
trovier
ee24567ef9 Fixes as per testing 2024-03-25 14:35:29 +01:00
2614bd36c8 Merge remote-tracking branch 'remotes/origin/feature/v12.6' into develop 2024-03-22 15:52:00 +03:00
9586cc46b3 Merge branch 'feature/docspace-wordpress' into develop
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.de.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.es.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.fr.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.it.ascx
#	Web/Controls/Common/BaseHeader/BaseHeader.ru.ascx
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/HelpCenter.de.ascx
#	Web/Controls/Help/HelpCenter.es.ascx
#	Web/Controls/Help/HelpCenter.fr.ascx
#	Web/Controls/Help/HelpCenter.it.ascx
#	Web/Controls/Help/HelpCenter.ru.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
#	Web/css/help.less
2024-03-22 15:47:08 +03:00
AlyonaYar
b6d5218396 Changed screenshot for Pixabay in SE 2024-03-22 15:27:55 +03:00
624ed60857 Merge remote-tracking branch 'remotes/origin/feature/moodle' into develop 2024-03-22 14:51:26 +03:00
trovier
0c26495a59 Fixes for edition display, removed two lines (MsSQL, Oracle) in Resource.resx 2024-03-19 15:59:39 +01:00
trovier
c1e8b9267d Fixes as per testing, partial display fixes 2024-03-19 15:20:32 +01:00
AlyonaYar
decdb2c831 Corrected text for Pixabay. 2024-03-18 12:56:21 +03:00
AlyonaYar
7ce83a4f5a Merge branch 'Pixabay' of https://github.com/ONLYOFFICE/helpcenter into Pixabay 2024-03-18 11:40:22 +03:00
AlyonaYar
b4097a9ca8 Corrected side menu for SE 2024-03-18 11:25:42 +03:00
cc7af65180 Edit css 2024-03-15 18:25:31 +03:00
320f2864e6 Merge branch 'develop' into Pixabay 2024-03-15 18:11:00 +03:00
AlyonaYar
d3af623d09 Corrected image location and added aspx 2024-03-15 17:25:33 +03:00
a67b267954 Fix GettingStartedWordpressDS.ascx 2024-03-15 16:43:51 +03:00
c613ed815f Merge remote-tracking branch 'remotes/origin/feature/ios_8.0' into develop
# Conflicts:
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/BasicOperations/GraphicMarkup/GraphicMarkup.fr.ascx
2024-03-15 15:22:56 +03:00
7fd89259c4 Merge remote-tracking branch 'remotes/origin/feature/build_8.0_french' into develop 2024-03-15 15:17:39 +03:00
13f8895cd6 Merge remote-tracking branch 'remotes/origin/feature/build_8.0' into develop 2024-03-15 15:17:19 +03:00
AlyonaYar
c0a574f6b7 Corrected errors 2024-03-15 12:12:24 +03:00
AlyonaYar
4ef729501a Added Pixabay htm and images for DE, SE and PE. 2024-03-15 09:40:07 +03:00
851caf9afa Add zoom article to menu 2024-03-14 17:53:16 +03:00
trovier
3b5e1bdec5 Uploaded mssql, oracle db; removed postgresql 2024-03-14 15:21:41 +01:00
cbb3b1fc3d Fix license 2024-03-14 17:16:13 +03:00
fa5f745a9e Update GettingStartedWordpressDS.ascx for v 2.0 2024-03-14 16:32:04 +03:00
b6a10ea18c Edit font list 2024-03-13 10:53:04 +03:00
trovier
dbd41154bb Uploaded Dameng, PostgresQL articles. 2024-03-12 17:53:33 +01:00
5f7eda4a0f Edit supported fonts 2024-03-12 18:08:21 +03:00
d4f18f25e6 Fix SysReqsDL.fr.ascx 2024-03-04 13:02:01 +03:00
a380a9a4bc Update CS version, update CP changelog 2024-03-04 12:32:09 +03:00
8d86a1d65b Fix CSChangelog.ascx 2024-02-28 15:16:47 +03:00
3901352388 For bug 66634 2024-02-28 12:44:03 +03:00
16b3d7765b Fix HTTPSDSDocker.ascx 2024-02-28 11:27:52 +03:00
f225bc25f3 Fix CSChangelog.ascx 2024-02-28 11:20:46 +03:00
543eff9091 Update changelog for v8.0.1 2024-02-26 18:03:54 +03:00
63a2232fcd Text fix 2024-02-26 17:59:18 +03:00