|
|
e880e8cd35
|
Merge branch 'feature/search-icon' into develop
|
2022-07-05 10:48:48 +03:00 |
|
|
|
2037e03bf9
|
Fix search icon position in Firefox
|
2022-06-06 14:36:18 +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 |
|
|
|
14cd1b356b
|
Fixes for WordPress as per testing + added video.
|
2022-05-18 16:33:38 +03:00 |
|
|
|
b2cfc6aaaf
|
New article for WordPress connector (EN only).
|
2022-05-12 15:06:49 +03:00 |
|
|
|
30be225226
|
Replace CSS code with images for buttons
|
2022-05-11 21:02:41 +03:00 |
|
|
|
4048a074a2
|
Fix style for buttons
|
2022-05-11 16:50:36 +03:00 |
|
|
|
8d71664100
|
Merge branch 'feature/helpcenter_12.0-for-release' into release/1.4.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
# Web/Controls/Help/HelpCenter.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ProgramInterface/DEProgramInterface.ru.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/DocumentEditor/ToolsAndSettings/ToolsAndSettingsDocument.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/OperationsOnObjects/PEOperationsOnObjects.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.de.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/PresentationEditor/ProgramInterface/PEProgramInterface.it.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.es.ascx
# Web/Controls/Help/SideMenu/features/ONLYOFFICEEditors/SpreadsheetEditor/OperationsOnObjects/SEOperationsOnObjects.it.ascx
# Web/Controls/Help/VariousControls/LocalizeControls/SpreadsheetProtection/LocalizeSpreadsheetProtection.ascx
# Web/OfficeWeb/apps/documenteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Review.htm
# Web/OfficeWeb/apps/documenteditor/main/resources/help/en/images/acceptreject_dropdown.png
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/de/HelpfulHints/CollaborativeEditing.htm
# Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/CollaborativeEditing.htm
|
2022-05-09 17:02:25 +03:00 |
|
|
|
ce20ce46e9
|
Try to fix markers for .documenteditorpages
|
2022-05-08 12:54:17 +03:00 |
|
|
|
1dc034de40
|
Merge branch 'feature/helpcenter_12.0' into feature/helpcenter_12.0-for-release
# Conflicts:
# Web/Controls/Help/Administration/Administration.ascx
# Web/Controls/Help/Administration/ControlPanel.ascx
# Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.ascx
# Web/Controls/Help/AdministratorGuides/ImportfromWeb/ImportfromWeb.de.ascx
# Web/Controls/Help/ArticlesCompleteList/Guides/151_share_text/151_share_text.ascx
# Web/Controls/Help/ArticlesCompleteList/ONLYOFFICEEditors/2021_using-chat.ascx
# Web/Controls/Help/ArticlesCompleteList/TipsTricks/130_folder_permissions/130_folder_permissions.ascx
# Web/Controls/Help/Desktop/Documents/Common/PrivateRoom/PrivateRoom.de.ascx
# Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.de.ascx
# Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx
# Web/Controls/Help/ONLYOFFICEEditors/EditorsUserGuides/EditorsUserGuides.ascx
# Web/Controls/Help/Tags/generate-report/generate-report.ascx
# Web/Controls/Help/Tags/generate-report/generate-report.de.ascx
# Web/Controls/Help/Tags/manage-access-rights/manage-access-rights.ascx
# Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.ascx
# Web/Controls/Help/Tags/onlyoffice-people/onlyoffice-people.de.ascx
# Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.ascx
# Web/Controls/Help/Tags/onlyoffice-projects/onlyoffice-projects.de.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.de.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.es.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.fr.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.it.ascx
# Web/Controls/Help/Tags/operations-with-cells/operations-with-cells.ru.ascx
# Web/Controls/Help/Tags/report-templates/report-templates.ascx
# Web/Controls/Help/Tags/report-templates/report-templates.de.ascx
# Web/Controls/Help/Tags/security/security.ascx
# Web/Controls/Help/Tags/security/security.de.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.de.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.es.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.fr.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.it.ascx
# Web/Controls/Help/Tags/track-birthdays/track-birthdays.ru.ascx
# Web/Controls/Help/UserGuides/DocsGuides.ascx
# Web/Controls/Help/UserGuides/DocsGuides.de.ascx
# Web/Controls/Help/UserGuides/DocsGuides.fr.ascx
# Web/Controls/Help/UserGuides/DocsUserGuides.ascx
# Web/Controls/Help/UserGuides/DocsUserGuides.de.ascx
# Web/Controls/Help/UserGuides/DocsUserGuides.fr.ascx
# Web/Controls/Help/UserGuides/DocsUserGuides.ru.ascx
# Web/Controls/Help/UserGuides/Groups.ascx
# Web/Controls/Help/UserGuides/Groups.de.ascx
# Web/Controls/Help/UserGuides/GroupsDocuments.ascx
# Web/Controls/Help/UserGuides/GroupsMail.de.ascx
# Web/Controls/Help/UserGuides/GroupsProjects.ascx
# Web/Controls/Help/UserGuides/GroupsProjects.de.ascx
# Web/Controls/Help/UserGuides/UserGuides.ascx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/DocumentEditor/Add-watermark.aspx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-and-unmerge-cells.aspx
# Web/ONLYOFFICE-Editors/Editors-User-Guides/SpreadsheetEditor/Merge-cells.aspx
|
2022-04-20 16:11:30 +03:00 |
|
|
|
1900fd44cf
|
Structure fix for new Strapi article
|
2022-04-13 10:02:54 +03:00 |
|
|
|
fc9e289ae6
|
German for a part of new fixes + intermediate (!) for GettingStartedDocuments.de.ascx
|
2022-04-11 14:34:36 +03:00 |
|
|
|
28b4ccdcf7
|
Merge branch 'feature/moodle' into feature/test-merge-for-release
# Conflicts:
# Web/Controls/Help/HelpCenter.ascx
# Web/Controls/Help/Integration/Integration.ascx
# Web/Controls/Help/Video/Video.ascx
# Web/css/help.less
|
2022-04-05 15:33:55 +03:00 |
|
|
|
53aab228eb
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/test-merge-for-release
# Conflicts:
# Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
# Web/Controls/Help/Tags/document-server/document-server.ascx
# Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
|
2022-04-05 14:09:39 +03:00 |
|
|
|
c59a07fb60
|
Add Integrate Moodle video
|
2022-03-28 17:18:49 +03:00 |
|
|
|
5d45e84491
|
Add Jira video, update video thumbnails
|
2022-03-24 18:27:51 +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 |
|
|
|
ac97b28cf3
|
Merge branch 'feature/test-3-branches-further-changes' into feature/test-merge-for-release
|
2022-03-17 13:10:38 +03:00 |
|
|
|
9a0398cf43
|
Add videos: Integrate Redmine, Fillable forms
|
2022-02-25 19:25:59 +03:00 |
|
|
|
b4c75d9d29
|
Merge remote-tracking branch 'remotes/origin/feature/install-groups' into feature/test-prerelease-1.4.0
|
2022-02-11 14:47:51 +03:00 |
|
|
|
492e767669
|
Add Nuxeo plugin video
|
2022-02-10 17:58:25 +03:00 |
|
|
|
ddd288d92d
|
Add 5 new videos, update tags; minor fixes
|
2022-02-08 14:42:14 +03:00 |
|
|
|
dc9a9bfd94
|
Add ONLYOFFICE Personal section
|
2022-02-01 13:52:38 +03:00 |
|
|
|
da579a9d19
|
Update Install Groups on Ubuntu (mysql, certbot)
|
2022-01-25 11:32:52 +03:00 |
|
|
|
d75d05302c
|
Add new languages for desktop editors and Docs
|
2022-01-13 15:35:19 +03:00 |
|
|
|
f6ede290ff
|
Merge branch 'develop' into feature/docs-7.0
|
2021-12-17 16:56:20 +03:00 |
|
|
|
7da6435475
|
Change color for shortcut_toggle.disabled
|
2021-12-17 16:34:12 +03:00 |
|
|
|
3f3b6f29dd
|
Add Confluence video, minor fix to video headers, add video scrollers
|
2021-12-17 13:28:40 +03:00 |
|
|
|
5f5507fead
|
Add LanguageTool plugin video; Update thumbnails for videos; Add video scroller to UserGuides Docs pages; Minor fixes for ascx pages
|
2021-12-07 16:33:05 +03:00 |
|
|
|
7c98469ca1
|
Merge branch 'feature/jira' into hotfix/1.2.1
# Conflicts:
# Web/Controls/Help/GettingStarted/Integration/Jira/GettingStartedJira.ascx
# Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
# Web/Controls/Help/Tags/docker-version/docker-version.ascx
# Web/Controls/Help/Tags/document-server/document-server.ascx
# Web/Controls/Help/Tags/install-onlyoffice/install-onlyoffice.ascx
# Web/Controls/Help/Tags/linux-version/linux-version.ascx
# Web/Controls/Help/Tags/local-server/local-server.ascx
# Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
# Web/css/help.less
|
2021-12-02 11:50:57 +03:00 |
|
|
|
3c569d0e5e
|
Merge branch 'feature/redmine' into release/1.2.0
|
2021-11-24 18:48:25 +03:00 |
|
|
|
03747acf32
|
Merge branch 'feature/add-video' into release/1.2.0
|
2021-11-24 18:24:17 +03:00 |
|
|
|
6f74342c78
|
Highlight moodle in left menu and header
|
2021-11-12 14:29:45 +03:00 |
|
|
|
aee0042fcd
|
Add conditional formatting pt2 video
|
2021-11-12 13:08:55 +03:00 |
|
|
|
c057d87326
|
Highlight redmine in left menu
|
2021-11-11 18:52:53 +03:00 |
|
|
|
dc1f953061
|
Add new videos - SSO, HTML, Telegram notifications
|
2021-11-11 12:29:02 +03:00 |
|
|
|
82cf861f02
|
Add conditional formatting video
|
2021-11-10 19:03:36 +03:00 |
|
|
|
08ec694bcb
|
Add Catalan flag to flags_all
|
2021-10-21 17:30:56 +03:00 |
|
|
|
2fefc00c9a
|
Add new videos, add new sections to Video.ascx
|
2021-10-15 15:01:45 +03:00 |
|
|
|
71b4cf54a8
|
Add DS versions: 6.2, 6.3, 6.4; CS version: 11.5
|
2021-09-29 15:08:23 +03:00 |
|
|
|
ee4b97ac92
|
Fixes for connectors pages
|
2021-09-21 19:00:05 +03:00 |
|
|
|
6fff7362b6
|
Update Confluence, Liferay, Nuxeo articles; Add Chamilo article; Add Nuxeo video
|
2021-09-20 14:58:20 +03:00 |
|
|
|
1a8945b51e
|
Add new article: onlyoffice-jira connector
|
2021-09-20 12:32:00 +03:00 |
|
|
|
faacd89980
|
Merge remote-tracking branch 'remotes/origin/feature/add_video'
|
2021-06-03 12:58:17 +03:00 |
|
SvetlanaLisina
|
cb847d9506
|
changed search style
|
2021-05-27 17:20:05 +03:00 |
|
|
|
3b6226bdba
|
Added new videos, updated video images, headers, tags
|
2021-05-21 18:40:03 +03:00 |
|
SvetlanaLisina
|
493566fbf5
|
Merge branch 'master' into fearure/bagfix-april
|
2021-05-11 17:48:48 +03:00 |
|
SvetlanaLisina
|
f9d8d1876c
|
changed mobile button on header and footer, fixed closed-button, fixed popup
|
2021-05-11 17:48:05 +03:00 |
|
SvetlanaLisina
|
ccb592add1
|
bugfix
|
2021-04-29 18:23:25 +03:00 |
|
SvetlanaLisina
|
ce0720a44f
|
fixed styles
|
2021-04-22 17:55:54 +03:00 |
|
