Commit Graph

3365 Commits

Author SHA1 Message Date
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
6f2a657fb3 Merge branch 'feature/trial-faq' into develop
# Conflicts:
#	Web/Controls/Help/SideMenu/Appendix/Appendix.de.ascx
2022-07-06 10:18:50 +03:00
422cca0913 Fix download link 2022-07-05 18:07:57 +03:00
9ca23bd0f7 German translation added + typo fix for English version. 2022-07-05 17:38:31 +03:00
1dc1992559 German translation added. 2022-07-05 15:53:48 +03:00
4c7829bb20 German added. 2022-07-05 14:48:54 +03:00
a5db635139 Add --machinekey and --jwtsecret script parameters 2022-07-05 14:32:15 +03:00
1ca4e1695c Update Changelog.md 2022-07-05 12:08:41 +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
f73abf3f56 Update Changelog.md 2022-07-05 11:37:20 +03:00
f0bffd4638 Fix /fr/integration.aspx 2022-07-05 11:08:12 +03:00
ae77cc3a48 Merge branch 'feature/integration-fr' into develop
# Conflicts:
#	Web/App_GlobalResources/Resource.fr.resx
2022-07-05 10:57:41 +03:00
7e278c0d53 Merge branch 'feature/update-sitemap' into develop 2022-07-05 10:49:20 +03:00
e880e8cd35 Merge branch 'feature/search-icon' into develop 2022-07-05 10:48:48 +03:00
70c5971157 Minor fixes (German). 2022-07-04 17:56:34 +03:00
841fc84f9d Fix tags in nextcloud-migration.ascx 2022-07-04 11:18:03 +03:00
71aa241c20 Remove unused parameters - Container name, Service count 2022-07-01 15:48:52 +03:00
91929ffcb8 Remove text about performance in Docker troubleshooting 2022-07-01 14:05:27 +03:00
b785b52d0e Update translations (fr, Installation, Docs) 2022-07-01 12:55:34 +03:00
e081b3d348 CardDAV Thunderbird fix (EN+DE). 2022-06-29 15:19:23 +03:00
a4d083a1f2 Update translations (fr, Integration) 2022-06-24 11:05:04 +03:00
a1d14d5279 Fix LinuxInstallation.ascx (curl) 2022-06-21 14:07:54 +03:00
f77b78ca78 Fix LinuxInstallation.ascx 2022-06-20 16:01:20 +03:00
a55b4694ab Update LinuxInstallation.ascx 2022-06-20 10:54:30 +03:00
94c2c41957 Update image 2022-06-20 10:09:14 +03:00
ad1c1b76f0 Fix ScriptRPMDEB.ascx 2022-06-17 14:00:49 +03:00
98464f18ba Fix tags 2022-06-17 11:00:37 +03:00
93e6a0a668 New article - Migrating Google Workspace data to ONLYOFFICE Workspace 2022-06-16 17:48:34 +03:00
83437f5dd8 Text fix for SwitchHttpsWindowsDeveloper.ascx; fix tag 2022-06-15 15:23:36 +03:00
1966576c66 Some fixes 2022-06-15 14:58:46 +03:00
c7e6308e88 Text fix 2022-06-14 16:55:31 +03:00
165a372a34 Edit sitemap, structure fixes 2022-06-14 16:51:19 +03:00
1053a100d4 Text fix - integration guides 2022-06-14 10:57:24 +03:00
654426af32 Continue updating sitemaps 2022-06-10 18:31:32 +03:00
402ba2d5b7 Merge branch 'develop' into feature/update-sitemap 2022-06-09 18:19:06 +03:00
254583fc8a Fixes for Installation.ascx 2022-06-09 18:18:05 +03:00
57984e8494 Continue updating sitemaps, structure fixes 2022-06-09 18:14:42 +03:00
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