|
8ff9bb1318
|
Merge branch 'feature/build7.5' into release/1.17.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-10-17 13:35:19 +03:00 |
|
|
8d891cdc63
|
Minor fixes
|
2023-10-17 13:24:23 +03:00 |
|
|
772c809e31
|
Merge branch 'feature/structure-fixes' into release/1.17.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
|
2023-10-17 11:14:21 +03:00 |
|
|
b107b60371
|
Edit several tags
|
2023-10-16 17:36:51 +03:00 |
|
trovier
|
b61beb2b5d
|
German translation
|
2023-10-16 01:12:22 +02:00 |
|
|
fc9d81c75e
|
Edit document-structure.ascx and line-breaks.ascx tags
|
2023-10-15 21:44:25 +03:00 |
|
|
4a6124b46f
|
Edit several pages
|
2023-10-13 17:12:18 +03:00 |
|
|
6d38294b2e
|
Structure fixes for /mobile-applications/documents/document-editor/page-formatting/set-page-parameters.aspx
Partial fix for /ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/InsertFunction.aspx
|
2023-10-13 11:22:52 +03:00 |
|
|
7e26d61a37
|
Edit translations, update screens for PDF Editor (ru)
|
2023-10-05 14:26:35 +03:00 |
|
trovier
|
b893517636
|
Initial commit. Interface articles, css, basic controls, resource file.
|
2023-09-21 16:16:27 +02:00 |
|
|
6c44bcb6f6
|
Merge branch 'feature/linode' into release/1.14.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/Controls/Help/Tags/document-server/document-server.ascx
|
2023-07-27 13:45:58 +03:00 |
|
|
2f84d0300b
|
Merge branch 'feature/build_7.4' into release/1.14.0
|
2023-07-20 14:08:28 +03:00 |
|
|
b94607fc5f
|
Merge branch 'feature/docspace-install' into release/1.14.0
# Conflicts:
# Web/App_GlobalResources/Resource.resx
|
2023-07-18 14:24:44 +03:00 |
|
|
e96af023d3
|
Merge branch 'feature/ios7.4' into release/1.14.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
|
2023-07-18 14:19:00 +03:00 |
|
|
ed2734d2f8
|
Fix menu (fr)
|
2023-07-13 11:34:17 +03:00 |
|
|
44ab37c0eb
|
Edit Resource.fr.resx
|
2023-07-12 16:48:19 +03:00 |
|
|
87c667a115
|
Edit Resource.fr.resx
|
2023-07-10 17:10:13 +03:00 |
|
trovier
|
f7cffd9cdb
|
SpeechInput plugin (German)
|
2023-06-21 12:09:31 +02:00 |
|
|
d6bd3e845f
|
Merge branch 'feature/build_7.4' into release/1.13.0
|
2023-06-13 11:36:13 +03:00 |
|
|
7c73673533
|
Merge branch 'feature/structure' into release/1.13.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
|
2023-06-09 18:35:46 +03:00 |
|
|
e6e458b922
|
Merge branch 'develop' into feature/build_7.4
# Conflicts:
# Web/App_GlobalResources/Resource.resx
# Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx
|
2023-06-01 15:59:33 +03:00 |
|
|
26ec6c0bc4
|
Start adding DocSpace installation articles
|
2023-06-01 15:48:11 +03:00 |
|
|
be1cb959d7
|
Add Speech Input plugin
|
2023-05-19 14:53:38 +03:00 |
|
|
a080447597
|
Edit math-trigonometry-functions.ascx tag
|
2023-05-02 18:51:02 +03:00 |
|
|
1649678fb3
|
Add translation, edit controls
|
2023-04-26 13:04:27 +03:00 |
|
trovier
|
11e9644337
|
Added the list of supported multimedia formats
|
2023-04-25 15:25:47 +02:00 |
|
|
e022f014d0
|
Merge branch 'feature/structure-fix' into release/1.12.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-04-21 16:19:33 +03:00 |
|
|
818ebd948d
|
Merge branch 'feature/translations-fr' into release/1.12.0
# Conflicts:
# Web/App_GlobalResources/Resource.fr.resx
|
2023-04-21 16:17:01 +03:00 |
|
|
d2db11f171
|
Edit financial-functions.ascx tag
|
2023-04-21 15:59:54 +03:00 |
|
|
22c4c39419
|
Edit engineering-functions.ascx tag
|
2023-04-11 18:40:37 +03:00 |
|
|
fe79e914c5
|
Add new video
|
2023-04-10 17:39:27 +03:00 |
|
|
0e53b85f9d
|
Remove outdated controls, edit 3 tags
|
2023-04-10 17:10:41 +03:00 |
|
|
024c7e344d
|
Add translations for the Personal section (fr)
|
2023-03-31 16:06:18 +03:00 |
|
|
043689366c
|
Merge branch 'feature/workspace-12.5' into release/1.11.0
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.es.resx
# Web/App_GlobalResources/Resource.fr.resx
# Web/App_GlobalResources/Resource.resx
# Web/App_GlobalResources/Resource.ru.resx
# Web/Controls/Help/ABCIndex/ABCCompleteArticleList.ascx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HTML.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/InsertReferences.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Jitsi.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Speech.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/Typograf.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Document-Editor/UsageInstructions/WordCounter.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Presentation-Editor/UsageInstructions/Translator.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/CommunicationPlugins.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/HighlightedCode.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/PhotoEditor.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Thesaurus.aspx
# Web/ONLYOFFICE-Editors/ONLYOFFICE-Spreadsheet-Editor/UsageInstructions/Translator.aspx
|
2023-03-24 16:21:30 +03:00 |
|
|
a95c47748c
|
Merge remote-tracking branch 'remotes/origin/feature/ios_7.3' into release/1.11.0
# Conflicts:
# Web/App_GlobalResources/Resource.resx
|
2023-03-24 15:48:22 +03:00 |
|
|
3cf2880f0c
|
Edit tag
|
2023-03-23 17:35:14 +03:00 |
|
|
37d55c3a87
|
Edit several tags
|
2023-03-22 16:12:03 +03:00 |
|
trovier
|
c16aef90b8
|
German translation added.
|
2023-03-20 15:04:22 +01:00 |
|
|
27882a05c8
|
Add translation (fr)
|
2023-03-17 16:34:21 +03:00 |
|
|
44a4b5b42e
|
Edit two tags
|
2023-03-17 16:21:21 +03:00 |
|
|
d153102a14
|
Edit controls in articles complete list, edit several tags
|
2023-03-15 17:30:01 +03:00 |
|
|
2e85a9408e
|
Continue fixes in ArticlesCompleteList
|
2023-03-10 14:13:11 +03:00 |
|
|
ca6ab5d94a
|
Partial structure fixes in ArticlesCompleteList
|
2023-03-09 14:40:17 +03:00 |
|
|
0da1eada3f
|
Merge branch 'feature/mattermost-new' into release/1.10.0
# Conflicts:
# Web/App_GlobalResources/Resource.resx
|
2023-03-06 18:04:40 +03:00 |
|
|
50338ad4a3
|
Merge branch 'feature/translations-fr' into release/1.10.0
|
2023-03-06 17:59:11 +03:00 |
|
|
f21c5195ea
|
Update translations (fr)
|
2023-03-06 13:58:50 +03:00 |
|
|
7702ab867d
|
Add translations (fr)
|
2023-02-27 11:24:00 +03:00 |
|
|
83210312ae
|
Merge branch 'develop' into feature/workspace-12.5
# Conflicts:
# Web/App_GlobalResources/Resource.de.resx
# Web/App_GlobalResources/Resource.resx
|
2023-02-22 15:11:53 +03:00 |
|
trovier
|
a21530189a
|
German translation.
|
2023-02-21 21:35:27 +01:00 |
|
|
5f92087db8
|
Move missing files and changes from old Mattermost branch
|
2023-02-21 16:14:20 +03:00 |
|