Commit Graph

5072 Commits

Author SHA1 Message Date
45233bf216 Merge branch 'feature/zapier' into feature/test-fixes-december-23 2024-04-10 17:35:01 +03:00
2c21f1488c Update Zapier screenshots 2024-04-10 17:33:34 +03:00
98b34f2e9c Merge branch 'develop' into feature/test-fixes-december-23 2024-04-09 18:39:53 +03:00
5206537146 Edit LinuxInstallationCentOS.ascx 2024-04-09 18:39:06 +03:00
d6a45f43ee Edit DocSpace articles 2024-04-09 18:31:52 +03:00
9d4e89c2e4 Edit DocSpace articles 2024-04-08 18:24:41 +03:00
ebd38de796 Merge branch 'Pixabay' into develop 2024-04-08 15:05:11 +03:00
79503696dd Merge branch 'develop' into feature/test-fixes-december-23 2024-04-08 14:32:36 +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
6233c9a41a Edit DocSpace articles 2024-04-05 18:31:38 +03:00
b78632c4b2 Merge branch 'feature/drupal_docspace' into feature/test-fixes-december-23 2024-04-02 17:10:18 +03:00
02925b3dc6 Update DocSpace screenshots 2024-04-02 17:07:47 +03:00
trovier
8cfae56a9d Fixes as per testing 2024-04-02 15:41:51 +02:00
202b011856 Merge branch 'feature/drupal_docspace' into feature/test-fixes-december-23 2024-04-01 16:06:08 +03:00
7ea141b404 Merge remote-tracking branch 'remotes/origin/feature/structure' into feature/test-fixes-december-23 2024-04-01 16:05:47 +03: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
5788c11579 Remove Selectel article for DocSpace 2024-04-01 12:58:37 +03:00
617c3bbcbf Add DocSpace 2.5 changelog 2024-03-29 18:23:28 +03:00
052bd0a515 Merge branch 'feature/drupal_docspace' into feature/test-fixes-december-23 2024-03-29 16:28:50 +03:00
trovier
214e0c4404 Initial commit 2024-03-29 13:24:55 +01:00
39e16fcc03 Merge branch 'Pixabay' into feature/test-fixes-december-23 2024-03-29 14:28:24 +03:00
8c0f129285 Merge branch 'feature/structure' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2024-03-29 14:27:59 +03: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
36d592e620 Merge branch 'feature/zapier' into feature/test-fixes-december-23 2024-03-27 16:46:47 +03:00
d548ca4e50 Text fix 2024-03-27 16:44:34 +03:00
13aadfd822 Text fix 2024-03-27 16:06:34 +03:00
0882200dad Merge branch 'feature/zapier' into feature/test-fixes-december-23 2024-03-27 15:46:13 +03:00
25d062d38d Merge branch 'develop' into feature/test-fixes-december-23 2024-03-27 15:45:56 +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
95eaebd5d3 Edit zapier article 2024-03-27 15:20:00 +03:00
781313b9f7 Merge branch 'feature/databases' into feature/test-fixes-december-23 2024-03-26 16:44:41 +03:00
c44177d23c Start adding Zapier article 2024-03-26 16:43:01 +03:00
trovier
5e7bc8e78f Fixes as per testing 2024-03-26 14:27:05 +01:00
d2b7ee910e Merge branch 'feature/databases' into feature/test-fixes-december-23 2024-03-25 16:40:48 +03:00
trovier
ee24567ef9 Fixes as per testing 2024-03-25 14:35:29 +01:00
5ced4b4db7 Merge branch 'develop' 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-22 16:08:16 +03:00
9eda201704 Merge branch 'Pixabay' into feature/test-fixes-december-23 2024-03-22 16:03:52 +03: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
3031f7ce43 Merge branch 'feature/databases' into feature/test-fixes-december-23 2024-03-19 18:08:34 +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
02e63d6b73 Merge branch 'Pixabay' into feature/test-fixes-december-23 2024-03-18 13:35:00 +03:00
AlyonaYar
decdb2c831 Corrected text for Pixabay. 2024-03-18 12:56:21 +03:00