Commit Graph

630 Commits

Author SHA1 Message Date
25e91d7971 Merge branch 'feature/build7.2' into feature/web-apps-help
# Conflicts:
#	Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
#	Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/paradvsettings_font.png
#	Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/images/interface/rightpart.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/access_rights.png
#	Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/images/interface/rightpart.png
2022-08-12 16:20:37 +03:00
455e5ee94d Merge branch 'feature/geolocation' into release/1.6.0 2022-08-06 12:15:30 +03:00
0fb35dcc2d Fixes for MergeCells.htm: rename some images and add 1 image in OfficeWeb, remove unnecessary images in Guides/big/ 2022-08-03 11:25:58 +03:00
39000d005b Merge branch 'feature/new_german' into release/1.6.0
# Conflicts:
#	Web/App_GlobalResources/Resource.de.resx
2022-07-28 15:05:02 +03:00
dcb898692b Merge branch 'feature/nextcloud' into release/1.6.0
# Conflicts:
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.de.ascx
#	Web/Controls/Help/Server/Docker/DockerTroubleshooting/DockerTroubleshooting.de.ascx
2022-07-28 13:15:58 +03:00
e16db04f8c Updated images in EN for all editors. 2022-07-27 17:19:40 +03:00
4b98331e55 Update Nextcloud article 2022-07-25 17:43:37 +03:00
8ad5e4da07 Edit Nextcloud article - extra permissions 2022-07-22 19:02:45 +03:00
d38c0b6b17 Merge branch 'feature/fix-logo' into release/1.6.0 2022-07-19 17:44:34 +03:00
85f7dc2a4f New translations added. 2022-07-17 22:16:11 +03:00
50265a7026 Merge branch 'feature/supported-formats-icons' into release/1.6.0 2022-07-14 12:10:30 +03:00
c4c2ee21b4 Merge branch 'feature/personal_1.2' into release/1.6.0 2022-07-13 18:37:52 +03:00
e30b3f3204 Merge branch 'feature/nextcloud' into release/1.6.0 2022-07-13 18:37:29 +03:00
e579f30b14 Merge branch 'feature/connect-docs' into release/1.6.0 2022-07-13 18:36:59 +03:00
496ea6d9db Use svg instead of png 2022-07-13 17:35:24 +03:00
bacaa0d29c Merge branch 'feature/projects_ios' into develop 2022-07-12 18:03:32 +03:00
047234752b Fix Connecting Docs to Groups again 2022-07-12 11:04:43 +03:00
8a51da65dc Fix image and text - Connecting Docs to Groups 2022-07-11 18:14:31 +03:00
ab46b03485 Replace round markers with svg image 2022-07-11 10:31:28 +03:00
cab7850209 Update Personal to v1.2 2022-07-08 12:50:58 +03:00
a2e7811b10 German added + fixed links for other languages (side+main menu). 2022-07-07 16:58:43 +03:00
779f776f45 Merge branch 'feature/google-workspace' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.resx
2022-07-06 10:26:14 +03:00
cf204014bc Merge branch 'feature/freeze-rows' into develop 2022-07-06 10:19:18 +03:00
1dc1992559 German translation added. 2022-07-05 15:53:48 +03:00
0e6eea883f Merge branch 'feature/new_german' into develop
# Conflicts:
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.ascx
#	Web/Controls/Help/Server/ControlPanel/NextcloudMigration/nextcloud-migration.de.ascx
2022-07-05 11:40:36 +03:00
8f3c6fa9df Update GettingStartedNextcloud.ascx 2022-07-04 18:16:02 +03:00
94c2c41957 Update image 2022-06-20 10:09:14 +03:00
93e6a0a668 New article - Migrating Google Workspace data to ONLYOFFICE Workspace 2022-06-16 17:48:34 +03:00
6c7c5b33e5 Update Freeze-rows-and-columns.aspx 2022-06-06 17:41:56 +03:00
81a06e3b29 Add images and edit instructions - Connecting Docs to Groups 2022-06-03 16:36:07 +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
985c660157 Merge branch 'feature/andr_project1.2' into release/1.5.0 2022-06-02 18:51:25 +03:00
e758782329 Update all android projects pages, screenshots 2022-06-01 15:48:13 +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
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
3ebe905196 Initial commit for new Projects app version. 2022-05-30 18:22:11 +03:00
b8428d240b Update HeidiSQL2.png 2022-05-30 18:10:11 +03:00
da6bf28be9 Add images, text fixes 2022-05-30 11:47:34 +03:00
a9c3fd8d77 Projects - updated screenshots. 2022-05-27 15:00:17 +03:00
5914cf4e9a Start adding geolocation instructions 2022-05-27 14:38:44 +03:00
1d283367d5 Updated screenshots for German version of Nextcloud migration article. 2022-05-25 17:18:57 +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
6da0c3dadf Fixes as per testing. 2022-05-23 17:59:37 +03:00
94c9f9852d New features in articles on autoshapes and images for all editors are now in German + screenshots. 2022-05-23 17:31:32 +03:00
54ae399432 Fixes as per testing. 2022-05-19 18:15:59 +03:00