Commit Graph

4943 Commits

Author SHA1 Message Date
2e646f5f52 Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-18 18:13:24 +03:00
fb261353aa Fix DocSpace articles 2024-04-18 18:12:42 +03:00
4b9bc0585b Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-18 17:57:29 +03:00
2fbac048e7 Fix DocSpace articles 2024-04-18 17:56:26 +03:00
0fe045e2ab Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-18 11:23:38 +03:00
a5cd4822f7 Fix DocSpace articles 2024-04-18 11:23:01 +03:00
ebc15fc7ca Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-17 18:50:41 +03:00
c2bd858e6b Fix DocSpaceSettings.ascx 2024-04-17 18:49:57 +03:00
d11f74a66d Merge branch 'feature/structure-fix' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2024-04-17 17:55:02 +03:00
749909f69c Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-17 17:51:13 +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
3e3bc4f900 Merge branch 'feature/DocSpace2.5' into feature/test-fixes-december-23 2024-04-15 16:28:56 +03:00
259fd80266 Edit DocSpace articles 2024-04-15 16:20:00 +03:00
cbc3bd658e Edit Changelog.md 2024-04-11 13:06:47 +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
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