Commit Graph

5014 Commits

Author SHA1 Message Date
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
fb2e22ac3f Merge branch 'feature/docspace-wordpress' into feature/test-fixes-december-23
# 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-14 18:09:15 +03:00
f2d897bd43 Merge branch 'feature/databases' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2024-03-14 17:57:09 +03:00
9d52a9da4c Merge branch 'develop' into feature/test-fixes-december-23 2024-03-14 17:55:30 +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
aab3269880 Merge branch 'feature/build_8.0_french' into feature/test-fixes-december-23 2024-03-04 13:03:22 +03:00
89c6b805f0 Merge branch 'feature/v12.6' into feature/test-fixes-december-23 2024-03-04 13:02:58 +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
b8a0f1ec8c Merge branch 'feature/v12.6' into feature/test-fixes-december-23 2024-02-28 15:26:08 +03:00
8d86a1d65b Fix CSChangelog.ascx 2024-02-28 15:16:47 +03:00
5a0c0a2328 Merge branch 'feature/v12.6' into feature/test-fixes-december-23 2024-02-28 12:47:36 +03:00
6f6590b77e Merge branch 'feature/build_8.0' into feature/test-fixes-december-23 2024-02-28 12:47:14 +03:00
c765fef3dd Merge branch 'develop' into feature/test-fixes-december-23 2024-02-28 12:47:00 +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
0a8dfd2021 Merge branch 'feature/v12.6' into feature/test-fixes-december-23 2024-02-26 18:07:36 +03:00
5ffe2825e6 Merge branch 'feature/build_8.0' into feature/test-fixes-december-23 2024-02-26 18:04:31 +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
5b8056cf5d Merge branch 'feature/v12.6' into feature/test-fixes-december-23 2024-02-26 15:22:52 +03:00
1004f451f5 Merge branch 'feature/build_8.0_french' into feature/test-fixes-december-23
# Conflicts:
#	Web/Controls/Help/MobApps/MobDocs/DocumentEditor/BasicOperations/GraphicMarkup/GraphicMarkup.fr.ascx
2024-02-26 15:22:22 +03:00
626b541dc7 Update CSChangelog.ascx 2024-02-26 15:17:58 +03:00
AlyonaYar
23981a2ab5 Added French for Zoom integration. 2024-02-26 08:50:37 +03:00
f2b462ef3f Update 2 articles about the Documents module 2024-02-22 18:06:52 +03:00
bdf1a24fc4 Merge branch 'feature/restore-mail' into feature/test-fixes-december-23 2024-02-20 15:15:53 +03:00
5e2ea1d6a5 Merge branch 'feature/build_8.0' into feature/test-fixes-december-23 2024-02-20 15:15:35 +03:00
8c80565688 Update screenshot 2024-02-20 15:13:04 +03:00
f797de43de Update screenshot 2024-02-20 15:10:15 +03:00
bbdd445969 Update backup-restore.ascx 2024-02-20 15:03:38 +03:00
AlyonaYar
07f448bada Updated French 8.0 2024-02-19 10:46:19 +03:00
ae2dfc6ede Merge branch 'feature/structure' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2024-02-14 18:30:53 +03:00
f4046516c9 Merge branch 'develop' into feature/test-fixes-december-23 2024-02-14 18:28:06 +03:00
2e9ad64c42 Merge branch 'feature/build_8.0' into feature/test-fixes-december-23 2024-02-14 18:27:52 +03:00
65aa4434bb Merge branch 'feature/ios_8.0' into feature/test-fixes-december-23 2024-02-14 18:27:38 +03:00
0dfcc3ffb5 Update screenshots for v8.0.1 2024-02-14 18:26:29 +03:00
5dfab76492 Text fixes for v8.0.1 2024-02-14 17:25:47 +03:00
93276d95a7 Fixes for statistical-functions.ascx 2024-02-14 14:37:06 +03:00