a102fff4fc
Merge remote-tracking branch 'remotes/origin/feature/security' into feature/test-merge-for-release
...
# Conflicts:
# Web/Controls/Help/Tags/custom-domain-name/custom-domain-name.ascx
# Web/Controls/Help/Tags/invite-people/invite-people.ascx
# Web/Controls/Help/Tags/password-strength/password-strength.ascx
# Web/Controls/Help/Tags/restore-backup/restore-backup.ascx
# Web/Controls/Help/Tags/security/security.ascx
# Web/Controls/Help/Tags/trusted-domains/trusted-domains.ascx
2022-03-18 13:30:18 +03:00
6bd68bb22b
Edit Flatpak translations
2022-03-18 12:34:54 +03:00
76ff835471
Merge remote-tracking branch 'remotes/origin/feature/desktop_installation_guides' into feature/test-merge-for-release
...
# Conflicts:
# Web/Controls/Help/Desktop/Documents/Linux/DeskLinInstFp/DesktopLinuxInstallFlatpak.de.ascx
2022-03-17 17:19:30 +03:00
d2aa901864
Fix watchvideo_block for new Personal page
2022-03-17 16:21:11 +03:00
dfb9965ae6
Merge remote-tracking branch 'remotes/origin/feature/personal' into feature/test-merge-for-release
...
# Conflicts:
# Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
2022-03-17 16:04:18 +03:00
0638b85e88
Merge remote-tracking branch 'remotes/origin/feature/adfs' into feature/test-merge-for-release
2022-03-17 15:53:08 +03:00
e75ba847d4
Merge remote-tracking branch 'remotes/origin/feature/one-click-install' into feature/test-merge-for-release
...
# Conflicts:
# Web/Controls/Help/Installation/Docs.ascx
# Web/Controls/Help/Installation/DocsCommunity.ascx
# Web/Controls/Help/Installation/DocsDeveloper.ascx
# Web/Controls/Help/Installation/DocsEnterprise.ascx
# Web/Controls/Help/Installation/Installation.ascx
2022-03-17 15:50:35 +03:00
3f588d2896
Merge remote-tracking branch 'remotes/origin/feature/roadmap_7.1' into feature/test-merge-for-release
2022-03-17 15:27:09 +03:00
52ffe548df
Merge remote-tracking branch 'remotes/origin/feature/desktop7.0.1' into feature/test-merge-for-release
2022-03-17 15:23:50 +03:00
f83f70f1a1
Merge remote-tracking branch 'remotes/origin/feature/alibaba-cloud' into feature/test-merge-for-release
2022-03-17 15:13:40 +03:00
c2cd1c154a
Merge remote-tracking branch 'remotes/origin/feature/desktop-flags' into feature/test-merge-for-release
...
# Conflicts:
# Web/Controls/Help/Tags/desktop-editors/desktop-editors.ascx
2022-03-17 15:05:25 +03:00
c98776746d
Merge remote-tracking branch 'remotes/origin/feature/contribute_reportissues' into feature/test-merge-for-release
2022-03-17 14:51:41 +03:00
7a0c67696b
Fix watchvideo_block for new Redmine video
2022-03-17 14:38:35 +03:00
85e9044c71
Fix paths for new Redmine video page
2022-03-17 14:19:26 +03:00
4ca6cbee11
Merge remote-tracking branch 'remotes/origin/feature/smtp' into feature/test-merge-for-release
2022-03-17 13:51:41 +03:00
3997a86511
Merge remote-tracking branch 'remotes/origin/feature/troubleshooting-mail' into feature/test-merge-for-release
2022-03-17 13:41:57 +03:00
2075836579
Merge remote-tracking branch 'remotes/origin/feature/add-note' into feature/test-merge-for-release
2022-03-17 13:35:34 +03:00
3df1d45437
Merge remote-tracking branch 'remotes/origin/feature/docs-desktop-fixes' into feature/test-merge-for-release
2022-03-17 13:25:25 +03:00
ac97b28cf3
Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release
2022-03-17 13:10:38 +03:00
292c8eb2e4
Fix -v /sys/fs/cgroup:/sys/fs/cgroup:rw
2022-03-17 11:10:08 +03:00
56549aa116
Fix 2 commands for DockerInstallation.ascx
2022-03-16 18:58:17 +03:00
fb344b575d
Fix supported devices for iOS
2022-03-16 18:20:56 +03:00
ea87e6cecd
Edit other controls for installation/mail-connect-groups-windows.aspx
2022-03-16 17:44:14 +03:00
daeb2f6bdc
Finish editing local-server.ascx
2022-03-15 14:25:37 +03:00
55933ce0c2
Beginning of optimization of local-server.ascx.
2022-03-09 17:42:50 +03:00
04ad07da3e
Restore missing CommonOpersForAndr in Resource.resx
...
Some changes for /installation/mail-connect-groups-windows.aspx
Remove redirected page server/docker/mail/connect-mail-server-to-community-server-on-windows.aspx
Update 2 commands in .ru controls
2022-03-09 13:10:10 +03:00
6fd6fc964b
Some changes on / mail-connect-groups-windows.aspx editing.
2022-03-05 16:36:23 +03:00
9209fac24c
Revert 15b380b10d
and fixes for /userguides/mobile-android.aspx.
2022-03-03 00:46:50 +03:00
cf268bf695
Remove HideContents.ascx because of using Resource.resx instead.
2022-03-02 17:42:41 +03:00
c7df67bf43
Remove ShowContents.ascx because of using Resource.resx instead.
2022-03-02 17:32:08 +03:00
c7e046ecbc
Remove Watchvideo.ascx because of using Resource.resx instead.
2022-03-02 17:06:43 +03:00
393bea7e2d
Remove ComOpersAndr.ascx because of using Resource.resx instead.
2022-03-02 16:55:24 +03:00
9ce6c28f78
Use Resource.resx on /administration/portal-management.aspx for testing (page was worked).
2022-03-02 16:29:13 +03:00
15b380b10d
Temporary comment huge localized block on /userguides/mobile-android.aspx for testing.
2022-03-02 16:11:11 +03:00
2c9bf74e9c
Try to fix /userguides/mobile-android.aspx by using Resource.resx + changes for another pages with adding controls.
2022-03-02 16:10:08 +03:00
90ca22aade
Escape from LocalizeContent for /userguides/mobile-android.aspx.
2022-02-28 15:42:06 +03:00
f2c09584fa
Cut paths for /userguides/mobile-android.aspx (p2) + escape from LocalizeContent for videos.
2022-02-28 15:07:40 +03:00
7983f05964
Cut paths for /userguides/mobile-android.aspx (p1).
2022-02-28 14:49:15 +03:00
46ce782f57
Try to fix Build errors.
2022-02-25 20:55:59 +03:00
38a9bca017
Add controls for d57fe219ea
.
2022-02-25 20:54:39 +03:00
9a0398cf43
Add videos: Integrate Redmine, Fillable forms
2022-02-25 19:25:59 +03:00
42dada0be0
Try to fix 500 error on test-helpcenter.onlyoffice.com/installation/desktop-install-flatpak.aspx. Remove redirected /desktop/documents/linux/installation-flatpak.aspx.
2022-02-25 18:26:51 +03:00
a138c11949
Control structure optimization of /installation/desktop-sys-reqs-macos.aspx.
2022-02-25 18:23:20 +03:00
703a59651e
Lost from f2111c52a4
.
2022-02-25 17:21:28 +03:00
d57fe219ea
Add controls without LocalizeContent on /installation/desktop-sys-reqs-*.aspx pages.
2022-02-25 17:14:24 +03:00
f2111c52a4
Edit inner control srtucture of /installation/desktop-sys-reqs-*.aspx pages.
2022-02-25 17:06:56 +03:00
93e0c4d32a
Add Workspace Enterprise Edition Security Guide
2022-02-18 15:49:26 +03:00
9806e697fa
Rename controls
2022-02-15 17:04:43 +03:00
f919c0311b
Merge branch 'feature/test-jitsi-docs-config' into feature/test-3-branches
2022-02-11 20:40:08 +03:00
e8aa8f7254
Fix conflict resolution for da6a928aa6
.
2022-02-11 18:11:34 +03:00