Commit Graph

53 Commits

Author SHA1 Message Date
888fbe760b Merge branch 'release/v9.1.0' of git.onlyoffice.com:ONLYOFFICE/sdkjs into fix/bug-48987
# Conflicts:
#	common/apiBase.js
#	common/commonDefines.js
#	configs/slide.json
#	configs/word.json
#	word/api.js
2025-09-24 17:57:42 +03:00
35ca016d64 Rename common shortcut types 2025-09-16 11:30:54 +03:00
1f66ad42c3 for tests 2025-07-31 16:12:20 +03:00
6059d333a0 fix tests 2025-07-31 16:11:59 +03:00
f2b9b06e6f Merge remote-tracking branch 'remotes/origin/hotfix/v9.0.4' into develop 2025-07-23 13:33:09 +03:00
c9332ad2e4 [all] Rename copypaste tests (#1253)
[all] Rename copypaste tests

Co-authored-by: GoshaZotov <Igor.Zotov@onlyoffice.com>
Co-committed-by: GoshaZotov <Igor.Zotov@onlyoffice.com>
2025-07-16 13:36:43 +00:00
d75e443177 [de][pe] Fix paste callbacks 2025-07-16 00:37:05 +03:00
6322310e94 fix slide unit tests 2025-07-15 14:08:46 +03:00
0d5abaf30e Merge branch 'develop' of git.onlyoffice.com:ONLYOFFICE/sdkjs into feature/external_data_diagrams
# Conflicts:
#	cell/api.js
#	cell/apiDefines.js
#	cell/model/History.js
#	cell/model/UndoRedo.js
#	cell/model/Workbook.js
#	cell/model/clipboard.js
#	cell/view/WorkbookView.js
#	cell/view/WorksheetView.js
#	common/Charts/DrawingObjects.js
#	common/HistoryCommon.js
#	common/apiCommon.js
#	configs/slide.json
#	configs/word.json
#	slide/Editor/Format/Presentation.js
#	slide/api.js
#	tests/slide/common/editor.js
#	word/Editor/LogicDocumentController.js
2025-06-25 15:25:59 +03:00
6895798743 Fix tests 2025-03-19 14:40:22 +03:00
2986ef4f67 [pe][ve] add methods for setting flag rtl interface 2025-03-10 11:40:46 +03:00
9613f96941 [ve] Move thumbnailsPositionMap to commonDefines.js; Fix visio opening 2025-03-09 16:30:05 +03:00
2b8d528d24 use parameter from config 2025-03-06 13:38:43 +03:00
3ec77e222d Merge branch 'develop' into feature/thumbnails-orientation 2025-02-28 21:55:44 +07:00
23580c93c4 Develop reserve masters and layouts 2025-02-26 08:55:29 +00:00
216e608060 Merge branch 'develop' into feature/thumbnails-orientation 2025-02-20 23:06:53 +07:00
e484cd2e2f [de] Get rid of obsolete NewLine/NewLineParagraphs parameters 2025-02-14 18:21:29 +03:00
a3d91cc42c fix tests 2025-02-04 20:50:39 +03:00
d97fbe3f83 fix unit-tests pe 2025-02-04 20:45:59 +03:00
4406b9087a Merge branch 'release/v8.3.0' of git.onlyoffice.com:ONLYOFFICE/sdkjs into feature/external_data_diagrams
# Conflicts:
#	common/Charts/DrawingObjects.js
#	common/HistoryCommon.js
#	common/apiCommon.js
#	word/api.js
2025-02-04 14:43:52 +03:00
642157c749 fix shortcuts tests 2025-02-02 08:17:51 +00:00
8f6ad782f8 fix test - getAnnotations 2025-02-02 09:33:51 +03:00
27f4504665 [thumbnails-orientation] Refactor CThumbnailsManager 2025-01-14 16:25:12 +07:00
02db3e7fa5 Fix tests 2024-12-09 13:42:11 +03:00
03f01dfad9 Merge branch 'release/v8.2.0' of git.onlyoffice.com:ONLYOFFICE/sdkjs into feature/external_data_diagrams
 Conflicts:
	cell/api.js
	cell/model/WorkbookElems.js
	common/Charts/DrawingObjects.js
	common/Drawings/CommonController.js
	common/Drawings/Format/ChartFormat.js
	common/Drawings/Format/ChartSpace.js
	common/HistoryCommon.js
	common/SerializeChart.js
	common/Shapes/SerializeWriter.js
	common/apiCommon.js
	slide/Editor/CollaborativeEditing.js
	slide/Editor/Format/Presentation.js
	slide/api.js
	tests/slide/common/editor.js
	tests/word/common/editor.js
2024-09-10 14:51:19 +03:00
6c6db83ab5 Fix presentation editor tests 2024-09-02 17:47:51 +03:00
bec087d8d6 [all] Fix tests 2024-08-29 17:06:19 +03:00
46081a0b19 Merge branch 'release/v8.1.0' into develop
# Conflicts:
#	common/wordcopypaste.js
2024-06-14 10:31:31 +03:00
9e64bbe665 fix tests 2024-06-10 11:51:12 +03:00
900e24f20c fix textarts in presentation 2024-06-07 12:25:27 +03:00
055c6ba4ee fix tests 2024-06-07 12:03:27 +03:00
08a8d84ee9 Merge branch 'release/v8.1.0' into develop
# Conflicts:
#	cell/apiBuilder.js
#	cell/model/FormulaObjects/lookupandreferenceFunctions.js
#	cell/model/Workbook.js
#	tests/cell/spreadsheet-calculation/FormulaTests.js
2024-06-06 14:55:01 +03:00
2760870e7a Feature/master slide (#4581)
* [master-slide] draw master slide and layout

* [master-slide] developing

* .

* developing

* .

* .

* ю

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* fix unit test

* fix tests
2024-06-06 11:08:38 +03:00
df319ba348 [copyright] Update Copyright date 2024-04-23 19:18:31 +03:00
4b89ef16e4 [copyright] Update address in Copyright 2024-04-23 18:54:50 +03:00
e638575941 Mock external chart collector 2023-11-23 16:02:25 +03:00
dd06c879e5 Disable browser zoom in 2023-11-15 13:49:55 +05:30
4f9ea35b40 Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into fix/refactorShortcutTests
 Conflicts:
	tests/slide/shortcuts/shortcuts.js
2023-10-19 13:27:56 +03:00
9e8aa66d67 Add macOs text movement tests 2023-10-03 14:17:11 +03:00
dcf09124d8 [pe] Add moving to specific slide tests 2023-10-03 14:16:22 +03:00
4d439b7de7 Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into develop
# Conflicts:
#	slide/Drawing/MorphTransition.js
#	slide/Editor/Format/Presentation.js
2023-10-03 13:27:53 +03:00
381780f76d [pe]Remove unused methods 2023-10-02 19:24:11 +03:00
6ad29f861e [pe]Refactor shortcut tests 2023-09-21 15:11:03 +03:00
a28a7112fb Merge remote-tracking branch 'remotes/origin/release/v7.5.0' into fix/bug64097
# Conflicts:
#	common/Charts/charts.js
2023-09-20 11:34:09 +03:00
ca94479a9b Fix bug 47961 2023-09-19 16:37:22 +03:00
827348dbd6 For bug 64097 2023-09-14 17:05:56 +03:00
3af6a9b4bd Fix bug 63598 2023-09-13 13:10:08 +03:00
982cb0efbc Revert commit "For bug 63598 (#3658)"
revision 513f3cf9ea
2023-09-13 13:10:08 +03:00
7a0e727b33 [anim-color] add ability to set color in some effects 2023-09-06 14:25:43 +03:00
a9a8c5dd76 Fix bug 47957 2023-09-01 15:21:53 +03:00