Commit Graph

3296 Commits

Author SHA1 Message Date
c55869b921 Edit date-time-functions.ascx 2024-06-17 18:34:48 +03:00
0b78d6841e Edit Nextcloud articles 2024-05-06 11:59:30 +03:00
e1c0be4eab Fix DocSpaceSettings.ascx 2024-04-24 11:41:49 +03:00
9b9af8f00d Fix GettingStartedMoodle.ascx 2024-04-24 11:34:48 +03:00
f15d994d83 Merge branch 'feature/DocSpace2.5' into release/1.22.0 2024-04-22 10:34:06 +03:00
f3abc9a4dc Fix ManagingDocuments.ascx 2024-04-19 21:59:54 +03:00
1e9953a7fe Merge branch 'feature/DocSpace2.5' into release/1.22.0 2024-04-19 17:01:28 +03:00
99c0fa89b8 Fix DocSpace articles 2024-04-18 18:38:14 +03:00
fb261353aa Fix DocSpace articles 2024-04-18 18:12:42 +03:00
2fbac048e7 Fix DocSpace articles 2024-04-18 17:56:26 +03:00
a5cd4822f7 Fix DocSpace articles 2024-04-18 11:23:01 +03:00
c2bd858e6b Fix DocSpaceSettings.ascx 2024-04-17 18:49:57 +03:00
dfd1c77597 Edit statistical-functions.ascx 2024-04-17 17:50:17 +03:00
d312160003 Fix DocSpaceSettings.ascx 2024-04-16 17:18:02 +03:00
259fd80266 Edit DocSpace articles 2024-04-15 16:20:00 +03:00
6635d19e75 Edit menu 2024-04-11 12:57:39 +03:00
65052cf85d Merge branch 'feature/zapier' into release/1.21.0 2024-04-11 12:25:18 +03:00
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
319737637b Text fix 2024-04-11 12:00:49 +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
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
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
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
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
d548ca4e50 Text fix 2024-03-27 16:44:34 +03:00
13aadfd822 Text fix 2024-03-27 16:06:34 +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
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
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
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
7ce83a4f5a Merge branch 'Pixabay' of https://github.com/ONLYOFFICE/helpcenter into Pixabay 2024-03-18 11:40:22 +03:00