Commit Graph

4724 Commits

Author SHA1 Message Date
73137d0d60 Merge branch 'develop' into feature/test-fixes-december-23 2023-12-13 13:35:56 +03:00
3c57be2820 Fix paths for DocSpace plugins 2023-12-13 12:25:08 +03:00
cbc0ff0a87 Merge branch 'feature/system-requirements' into develop 2023-12-13 11:30:07 +03:00
ec6db94b9c Merge branch 'feature/DocSpace-2.0_french_translation' into feature/test-fixes-december-23 2023-12-12 17:40:16 +03:00
AlyonaYar
75d1079c5d Screenshots fixes 2023-12-12 17:33:43 +03:00
AlyonaYar
062305055f Screenshot added 2023-12-12 16:58:11 +03:00
AlyonaYar
c1a00e1a89 Screenshot fixes 2023-12-12 16:48:41 +03:00
53c865c89e Merge branch 'feature/DocSpace-2.0_french_translation' into feature/test-fixes-december-23 2023-12-12 12:59:39 +03:00
AlyonaYar
38b97fafcb Screenshot fixes 2023-12-12 12:55:23 +03:00
AlyonaYar
6aebd72d58 Screenshots fixes 2023-12-12 10:41:02 +03:00
b1fc7d54ca Merge branch 'feature/DocSpace-2.0_french_translation' into feature/test-fixes-december-23 2023-12-11 17:18:49 +03:00
AlyonaYar
3cd54d4b93 Image path fixes 2023-12-11 17:05:21 +03:00
bd3bc70e33 Merge branch 'feature/system-requirements' into feature/test-fixes-december-23 2023-12-11 12:34:40 +03:00
2b1e00bd42 Fix for installing EPEL on RHEL 2023-12-11 12:33:44 +03:00
00ff5a9591 Merge branch 'feature/DocSpace-2.0_french_translation' into feature/test-fixes-december-23 2023-12-08 16:32:51 +03:00
83b53d5894 Merge branch 'feature/german_keyboard_shortcuts' into feature/test-fixes-december-23 2023-12-08 16:31:24 +03:00
trovier
745150cbb6 Fixes as per testing 2023-12-08 14:26:57 +01:00
trovier
24ec557a3d Initial commit 2023-12-07 14:00:15 +01:00
a099621110 Merge remote-tracking branch 'remotes/origin/feature/docs-ansible' into feature/test-fixes-december-23
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2023-12-06 12:32:42 +03:00
75e09a7edb Merge branch 'feature/system-requirements' into feature/test-fixes-december-23 2023-12-06 12:30:29 +03:00
c1f8f04951 Display documentation about editors on test-helpcenter (for test only) 2023-12-06 12:30:06 +03:00
d66f3fb7b9 Merge branch 'develop' of https://github.com/ONLYOFFICE/helpcenter into develop 2023-12-06 11:32:26 +03:00
AlyonaYar
50f516c415 French translation update. 2023-12-05 16:59:56 +03:00
a6617e53c2 Merge remote-tracking branch 'remotes/origin/feature/rewrite_rules_for_integration' into release/1.18.0 2023-12-04 13:44:08 +03:00
1b18b338f8 Merge branch 'feature/DocSpace-2.0' into release/1.18.0 2023-12-04 12:51:29 +03:00
78f5f43e99 Fix Zoom description 2023-12-04 12:28:04 +03:00
4c2bfdd71e Update Changelog.md 2023-12-04 11:38:44 +03:00
76c262f405 Edit menu in languages 2023-12-04 11:37:45 +03:00
trovier
1e72802eb3 Images for the article 2023-12-04 11:24:16 +03:00
trovier
f186d5cb99 Initial commit (EN)
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
#	Web/Controls/Help/HelpCenter.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
2023-12-04 11:23:56 +03:00
5b647ffe33 Update Changelog.md 2023-12-04 10:34:42 +03:00
22e21e05a1 Merge branch 'feature/DocSpace-2.0' into release/1.18.0 2023-12-04 10:25:19 +03:00
c7573aca8f Merge remote-tracking branch 'remotes/origin/feature/workspace-general-configuration' into release/1.18.0 2023-12-04 10:24:33 +03:00
0f735191d2 Merge branch 'feature/structure-fix' into release/1.18.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
#	Web/App_GlobalResources/Resource.resx
2023-12-04 10:23:13 +03:00
78658988e9 Fix DocSpace Changelog 2023-12-04 10:18:59 +03:00
c3e7032cf0 Fix DocSpace articles 2023-12-01 15:40:23 +03:00
6fcc871a0c FIX rewrite rules order 2023-11-30 08:51:28 +03:00
debd6e01c0
Merge pull request #62 from ONLYOFFICE/feature/rewrite_rules_for_integration
Feature/rewrite rules for integration
2023-11-29 16:15:56 +03:00
890c3a5a15 ADD rewrite rules for integration 2023-11-29 16:11:44 +03:00
dbcecf5871 ADD rewrite rules for integration 2023-11-29 16:09:36 +03:00
43d3be81c7
Merge pull request #61 from ONLYOFFICE/feature/workspace-general-configuration
Remove WebhookService
2023-11-28 16:34:38 +03:00
56b9cac3bd removed one more service 2023-11-28 16:00:18 +03:00
8dcf7aadac
Merge pull request #60 from ONLYOFFICE/feature/workspace-general-configuration
Remove services
2023-11-27 13:07:43 +03:00
bf63cc6350 removed services 2023-11-27 12:57:23 +03:00
fcd4fdfb6c Update system requirements for RHEL, CentOS 2023-11-27 12:49:36 +03:00
2806c71de3 Merge branch 'feature/suitecrm' into release/1.18.0 2023-11-23 13:13:35 +03:00
c801c0b665 Update Changelog.md 2023-11-23 13:07:47 +03:00
cee207849d Merge branch 'feature/rework-function-pages' into release/1.18.0 2023-11-23 13:02:19 +03:00
3e402307ec Update DEChangelog.ascx, Changelog.md 2023-11-23 12:31:12 +03:00
de7cf43b0c Edit menu for new connectors in languages 2023-11-23 12:19:11 +03:00