Commit Graph

3377 Commits

Author SHA1 Message Date
4eae6568e7 Fixes for Integration.ascx 2022-06-09 13:26:22 +03:00
08947360aa Edit main sections order - SiteMap.ascx 2022-06-09 12:26:54 +03:00
869bfe603e Continue editing sitemaps and structure fixes 2022-06-08 18:35:08 +03:00
ba8c1fe062 Merge branch 'develop' into feature/update-sitemap 2022-06-07 10:49:53 +03:00
aa60d92300 Merge branch 'master' into develop 2022-06-06 18:02:49 +03:00
d853f3946b Start updating sitemap.aspx, abc-index.aspx, sitemap.xml, edit links 2022-06-06 17:46:36 +03:00
6c7c5b33e5 Update Freeze-rows-and-columns.aspx 2022-06-06 17:41:56 +03:00
2037e03bf9 Fix search icon position in Firefox 2022-06-06 14:36:18 +03:00
a842236a1f Update Changelog.md 2022-06-03 10:14:01 +03:00
a186f05928 Merge remote-tracking branch 'remotes/origin/feature/projects_ios' into release/1.5.0 2022-06-03 10:12:01 +03:00
b601c240d8 Update Changelog.md 2022-06-02 18:57:20 +03:00
009fc4e95b Update changelog for Docs 7.1.1 2022-06-02 18:52:27 +03:00
985c660157 Merge branch 'feature/andr_project1.2' into release/1.5.0 2022-06-02 18:51:25 +03:00
7a69faaa00 Update changelog for Docs 7.1.1 2022-06-02 18:50:13 +03:00
90cd1cdc26 Add AppGallery link to changelog 2022-06-02 11:36:46 +03:00
23445bb131 Add missing comma 2022-06-02 11:32:12 +03:00
c11bbcaf83 Change release date 2022-06-02 11:09:46 +03:00
e758782329 Update all android projects pages, screenshots 2022-06-01 15:48:13 +03:00
fca9da9652 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
#	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
2022-05-31 19:17:11 +03:00
fa5dd67525 Remove unused controls for redirected faq/hybrid.aspx 2022-05-31 18:58:05 +03:00
b55c4968a1 Remove redirected faq/integration.aspx 2022-05-31 18:36:58 +03:00
b5880da8d0 Added WordPress to main page (for all languages) 2022-05-31 17:56:01 +03:00
c8a25b26f4 Edit other faq pages (fix highlight in left menu) 2022-05-31 16:53:55 +03:00
73ee26b610 Add trial faq 2022-05-31 15:50:25 +03:00
729c0a73d1 Update Changelog.md 2022-05-31 14:34:46 +03:00
4e0851bfb7 Merge remote-tracking branch 'remotes/origin/feature/ios7.1_german' into release/1.5.0 2022-05-31 14:25:55 +03:00
8cf7c5827d Merge remote-tracking branch 'remotes/origin/feature/german_integration_JWT' into release/1.5.0 2022-05-31 14:13:56 +03:00
6549c1a80d Merge branch 'feature/flatpak-title' into release/1.5.0 2022-05-31 14:12:44 +03:00
e72394a98c Merge branch 'feature/andr5.4+web' into release/1.5.0 2022-05-31 14:09:58 +03:00
3de8e8ddf4 Merge branch 'feature/liferay' into release/1.5.0 2022-05-31 13:57:54 +03:00
7f731cf750 Merge branch 'feature/strapi_connector' into release/1.5.0
# Conflicts:
#	Web/images/Help/GettingStarted/Integration/Alfresco/Big/create_from_template_big.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Big/create_template_big.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Small/create_from_template_small.png
#	Web/images/Help/GettingStarted/Integration/Alfresco/Small/create_template_small.png
2022-05-31 13:55:30 +03:00
50d3a3f899 Merge branch 'feature/new_alfresco_wordpress' into release/1.5.0
# Conflicts:
#	Web/Controls/Common/BaseHeader/BaseHeader.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.ascx
#	Web/Controls/Help/GettingStarted/Integration/Alfresco/AlfrescoGettingStarted.de.ascx
#	Web/Controls/Help/Integration/Integration.ascx
#	Web/Controls/Help/SideMenu/Integration/IntegrationMenu.ascx
#	Web/Controls/Help/Video/Video.ascx
#	Web/css/help.less
2022-05-31 13:48:44 +03:00
5c41b87d61 Fix paths in SeeAlsoBlockLinks for Drawio.aspx 2022-05-31 11:38:01 +03:00
3ebe905196 Initial commit for new Projects app version. 2022-05-30 18:22:11 +03:00
1db74d5562 Add missing image 2022-05-27 17:24:08 +03:00
e131a26cc3 Restore title for desktop-install-flatpak.aspx 2022-05-27 16:38:01 +03:00
66c73b05e0 Fix bug 57343 2022-05-27 16:22:27 +03:00
8a689a58d6 Update Contents.json 2022-05-27 15:51:16 +03:00
f00aed2dc6 Translation for Mattermost and Jitsi. 2022-05-27 15:43:16 +03:00
46bf7caecb Merge remote-tracking branch 'remotes/origin/feature/drawio' into develop
# Conflicts:
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/Contents.json
2022-05-27 15:37:12 +03:00
b0e56ce213 Fix KeyboardShortcuts.htm - DE, PE, SSE 2022-05-26 16:59:29 +03:00
1769b4b6b8 Update desktop flags article 2022-05-26 16:27:30 +03:00
210b1151bb Update compiling articles 2022-05-26 16:03:27 +03:00
54d38b2046 Update Talk, Control Panel, Workspace changelogs, versions, dates 2022-05-26 15:27:23 +03:00
1d283367d5 Updated screenshots for German version of Nextcloud migration article. 2022-05-25 17:18:57 +03:00
4fda1496f1 Update screenshot of Drawio 2022-05-25 16:13:09 +03:00
1f813e9355 Update pics for Projects v2.0 2022-05-25 15:54:57 +03:00
9ace288b07 Update Android Projects to v2.0 2022-05-25 15:23:46 +03:00
1a1aaa2830 Fixes for Alfresco are translated into German. 2022-05-25 15:23:25 +03:00
90edb98bc6 Translation for Mattermost and Jitsi. 2022-05-24 17:01:44 +03:00