Maxim Kadushkin
|
482a7d11bf
|
Merge branch 'develop' into feature/desktop-new
# Conflicts:
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/controller/Toolbar.js
# apps/presentationeditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/controller/Main.js
|
2018-02-22 02:41:49 +03:00 |
|
|
Maxim Kadushkin
|
5f1b291886
|
[DE][PE][SSE] synchronize extra buttons state through events
|
2018-02-16 02:56:17 +03:00 |
|
|
Maxim Kadushkin
|
cb82ea8230
|
[DE PE] refactoring
|
2018-02-16 02:52:44 +03:00 |
|
|
Maxim Kadushkin
|
0fb072b9fa
|
refactoring. created controller for set of buttons
|
2018-02-13 17:37:22 +03:00 |
|
|
Maxim Kadushkin
|
b5a5c97735
|
hide some buttons for desktop mode
|
2018-02-07 18:30:45 +03:00 |
|
Julia Radzhabova
|
e92d353971
|
[DE] Fix Bug 36847.
|
2018-02-07 14:51:19 +03:00 |
|
|
Maxim Kadushkin
|
c8e9fe9a63
|
Merge branch 'develop' into feature/desktop-new
# Conflicts:
# apps/common/main/lib/util/utils.js
|
2018-02-02 16:18:07 +03:00 |
|
|
Julia Radzhabova
|
bb36c63c13
|
[DE] Added print, save, undo, redo buttons and user name to header panel.
|
2018-01-24 13:57:58 +03:00 |
|
|
Julia Radzhabova
|
6ee6336001
|
Merge branch 'develop' into feature/table-of-contents
|
2018-01-16 11:12:47 +03:00 |
|
|
Julia Radzhabova
|
833f9fc1b1
|
Merge branch 'hotfix/v5.0.7' into develop
|
2018-01-15 16:11:11 +03:00 |
|
|
Julia Radzhabova
|
8ca83c7144
|
[DE] Added hyperlink button to the Links tab.
|
2017-12-26 10:32:52 +03:00 |
|
|
Julia Radzhabova
|
be416c5ed2
|
Add Note editing button to the Links tab.
|
2017-12-25 15:55:26 +03:00 |
|
|
Julia Radzhabova
|
db8840f4ec
|
[DE] Added Links tab, added inserting and updating table of contents.
|
2017-12-23 11:33:49 +03:00 |
|
|
Julia Radzhabova
|
14d06a5f95
|
[DE] AscCommon.sdtlocktype -> Asc.c_oAscSdtLockType, AscCommon.sdttype -> Asc.c_oAscSdtLevelType
|
2017-12-15 11:50:56 +03:00 |
|
|
Julia Radzhabova
|
4d213595ca
|
[DE] AscCommonWord -> AscCommon for woring with class CContentControl.
|
2017-12-14 15:13:40 +03:00 |
|
|
Julia Radzhabova
|
e7b722c021
|
[DE] Updated icons. Added context menu for content controls.
|
2017-12-13 16:52:14 +03:00 |
|
|
Julia Radzhabova
|
eb3efa3778
|
[DE] Insert content controls.
|
2017-12-12 14:14:27 +03:00 |
|
|
Julia Radzhabova
|
d1e3692e48
|
Merge branch 'develop' into hotfix/v5.0.6
|
2017-12-11 13:24:21 +03:00 |
|
|
Julia Radzhabova
|
4d90badb55
|
Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature
|
2017-12-06 14:53:09 +03:00 |
|
|
Julia Radzhabova
|
a0ea3d2903
|
[DE] Signature refactoring.
|
2017-11-28 15:33:54 +03:00 |
|
|
Julia Radzhabova
|
9e458a51f8
|
[DE] Added Protection tab with the ability to encrypt and sign document.
|
2017-11-28 15:23:37 +03:00 |
|
|
Julia Radzhabova
|
a90f108209
|
[DE] Change applying the license (disable editing when connections are over the limitations).
|
2017-11-22 15:20:51 +03:00 |
|
|
Julia Radzhabova
|
565e0bd750
|
[DE] Signature refactoring.
|
2017-11-17 16:11:40 +03:00 |
|
|
Julia Radzhabova
|
222c0bf74d
|
[DE] Added Protection tab with the ability to encrypt and sign document.
|
2017-11-15 10:59:06 +03:00 |
|
|
Julia Radzhabova
|
d598aed90d
|
Menu component: added clearAll method.
|
2017-11-13 11:41:32 +03:00 |
|
|
Julia Radzhabova
|
c02389ab21
|
Merge branch 'develop' into hotfix/v5.0.3
|
2017-10-31 20:15:07 +03:00 |
|
|
Julia Radzhabova
|
db3475a6e6
|
Merge branch 'feature/collaboration-tab' into develop
|
2017-10-27 16:03:03 +03:00 |
|
|
Julia Radzhabova
|
03890e6403
|
Fix Bug 36134.
|
2017-10-24 15:59:18 +03:00 |
|
|
Julia Radzhabova
|
32267aa6ab
|
[DE] Added tab Collaboration.
|
2017-10-07 16:06:51 +03:00 |
|
|
Julia Radzhabova
|
a3117efe05
|
[DE] Check selected page size preset depending on page orientation.
|
2017-09-27 14:35:12 +03:00 |
|
|
Maxim Kadushkin
|
b17354f2cc
|
[Common] fix bug 35651
|
2017-09-08 10:35:47 +03:00 |
|
|
Julia Radzhabova
|
43222dfa9d
|
Merge pull request #4 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
|
2017-09-07 11:49:02 +03:00 |
|
|
Julia Radzhabova
|
c1039d2d77
|
Synchronize save buttons in the toolbar and left menu.
|
2017-09-05 10:54:44 +03:00 |
|
|
Julia Radzhabova
|
e86804cbb2
|
[DE] Fix Bug 35757. Disable save button in the preview mode for review.
|
2017-09-01 17:48:31 +03:00 |
|
|
Julia Radzhabova
|
9939a4c15a
|
[DE] Toolbar lock refactoring.
|
2017-09-01 10:03:11 +03:00 |
|
|
Maxim Kadushkin
|
5409048345
|
[Common] fix bug 35651
|
2017-08-31 11:16:15 +03:00 |
|
|
Julia Radzhabova
|
fe462bd08b
|
Merge pull request #3 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
|
2017-08-30 15:07:13 +03:00 |
|
|
Julia Radzhabova
|
57a8cdadb4
|
[DE] Set display mode for review.
|
2017-08-23 17:49:56 +03:00 |
|
|
Julia Radzhabova
|
c5d19bfb89
|
Fix Bug 35715, fix Bug 35714.
|
2017-08-23 14:51:27 +03:00 |
|
|
Julia Radzhabova
|
13b623ef0c
|
Fix Bug 35525. + Set focus to document after "insert table" dialog is closed.
|
2017-08-23 11:02:04 +03:00 |
|
|
Maxim Kadushkin
|
c76a24beeb
|
unified toolbar's components identifiers
|
2017-08-08 18:00:55 +03:00 |
|
|
Julia Radzhabova
|
bd5ae6e902
|
Update hint for Add Comment button.
|
2017-08-02 16:47:40 +03:00 |
|
|
Maxim Kadushkin
|
05ce65f5ee
|
implemented 'Download As' for 'preview' mode
|
2017-07-21 17:55:27 +03:00 |
|
|
Maxim Kadushkin
|
0a1324217e
|
[Common] added button 'Edit Document' to 'preview' mode
|
2017-07-21 13:41:56 +03:00 |
|
|
Maxim Kadushkin
|
86c3493c1c
|
changed header layout for view mode
|
2017-07-13 12:43:40 +03:00 |
|
|
Maxim Kadushkin
|
cb9b82e0f0
|
[Common] refactoring
|
2017-07-10 18:32:33 +03:00 |
|
|
Julia Radzhabova
|
64355cc7db
|
[DE] Disable comments on toolbar when objects are locked.
[PE] Disable comments on toolbar when no slides.
|
2017-06-29 15:06:31 +03:00 |
|
|
Julia Radzhabova
|
fae2867431
|
Disable/enable comment button in the toolbar.
|
2017-06-28 14:20:49 +03:00 |
|
|
Maxim Kadushkin
|
64ee1c86bc
|
Merge branch 'feature/new-toolbar'
|
2017-06-27 11:33:33 +03:00 |
|
|
Maxim Kadushkin
|
0ec42dad0e
|
[DE] replaced 'insert' buttons
|
2017-06-26 16:11:50 +03:00 |
|
|
Julia Radzhabova
|
f3c9df235f
|
[DE] Add custom columns.
|
2017-06-23 17:27:20 +03:00 |
|
|
Julia Radzhabova
|
b16aadf69b
|
[DE] Translate default paragraph styles.
|
2017-06-23 16:46:10 +03:00 |
|
|
Julia Radzhabova
|
6d3f1f88f9
|
[DE] Fix Bug 35084.
|
2017-06-20 13:12:31 +03:00 |
|
|
Julia Radzhabova
|
5d40fdc1ed
|
Debug toolbar layout.
|
2017-06-15 16:18:40 +03:00 |
|
|
Maxim Kadushkin
|
ac59e8b46e
|
[DE, PE] tab 'File' didn't select after 'FileMenu' opened programmatically
|
2017-04-27 17:34:34 +03:00 |
|
|
Julia Radzhabova
|
76efc03e39
|
[DE] Debug image advanced settings.
|
2017-04-25 16:16:12 +03:00 |
|
|
Julia Radzhabova
|
293d08c2be
|
[DE][PE] Close toolbar menus when toolbar is collapsed. Collapse toolbar when document context menu is opened.
|
2017-04-24 17:35:00 +03:00 |
|
|
Julia Radzhabova
|
e2363e519a
|
[DE][PE] Fix loading color palettes in the toolbar menu.
|
2017-04-24 14:41:51 +03:00 |
|
|
Maxim Kadushkin
|
096060a55f
|
[DE] implemented Mixtbar
|
2017-04-22 15:42:52 +03:00 |
|
|
Maxim Kadushkin
|
679af22f14
|
[DE, PE] refactoring
|
2017-04-21 16:36:06 +03:00 |
|
|
Maxim Kadushkin
|
ada56664f3
|
[DE, PE] refactoring
|
2017-04-20 17:45:47 +03:00 |
|
|
Maxim Kadushkin
|
60e0feecfc
|
Merge
|
2017-04-20 16:50:10 +03:00 |
|
|
Julia Radzhabova
|
487c26dfe3
|
[DE] Debug opening in the compact mode.
|
2017-04-20 14:16:50 +03:00 |
|
|
Maxim Kadushkin
|
610a47ab75
|
[DE] debug of compact mode
|
2017-04-20 13:35:06 +03:00 |
|
|
Maxim Kadushkin
|
6e867fb9f0
|
[DE] updated translations
|
2017-04-20 13:23:50 +03:00 |
|
|
Maxim Kadushkin
|
6842d8dfc2
|
[DE] keep bool value in local storage
|
2017-04-20 12:27:27 +03:00 |
|
|
Julia Radzhabova
|
e24c0e4b38
|
[DE] Bug with co-editing in strict mode.
|
2017-04-19 14:24:23 +03:00 |
|
|
Julia Radzhabova
|
ecae264fd3
|
[DE] Common.localStorage.getItem -> Common.localStorage.getBool.
|
2017-04-19 14:22:31 +03:00 |
|
|
Julia Radzhabova
|
24dec9d752
|
[DE] Bugs with document without styles: update from style, create new style, delete all styles.
|
2017-04-12 13:00:17 +03:00 |
|
|
Julia Radzhabova
|
7ea197b4eb
|
Fix Bug 34708.
|
2017-04-12 12:58:20 +03:00 |
|
|
Julia Radzhabova
|
ea9c74f08f
|
[DE] Fix Bug 34403.
|
2017-04-12 11:07:53 +03:00 |
|
|
Julia Radzhabova
|
c39e55d631
|
[DE] Fix Bug 34343. Disable inserting footnotes to shapes, charts, equations, header/footer.
|
2017-04-11 16:40:44 +03:00 |
|
|
Julia Radzhabova
|
d2d9b2b594
|
Merge feature/force-save.
|
2017-04-11 16:40:01 +03:00 |
|
|
Maxim Kadushkin
|
acd5224632
|
[DE] hidded menu "Hide title bar"
|
2017-04-10 16:40:48 +03:00 |
|
|
Maxim Kadushkin
|
bf95ec509e
|
[DE] 'view' mode
|
2017-04-10 16:39:03 +03:00 |
|
|
Maxim Kadushkin
|
011130b5bd
|
[DE] removed nativeApp flag
|
2017-04-10 16:11:09 +03:00 |
|
|
Maxim Kadushkin
|
c8e40f6d03
|
[DE] refactoring
|
2017-04-06 12:42:43 +03:00 |
|
|
Maxim Kadushkin
|
c1c6ce3061
|
[DE] compact view for toolbar
|
2017-04-06 12:34:01 +03:00 |
|
|
Maxim Kadushkin
|
0cf3621991
|
[DE] processed permissions for review
|
2017-04-05 12:11:15 +03:00 |
|
|
Maxim Kadushkin
|
721b785033
|
[DE] processed buttons for image arrangement
|
2017-04-04 18:43:19 +03:00 |
|
|
Maxim Kadushkin
|
375b2e400f
|
[DE] processed buttons [Document Language], [Spell checking]
|
2017-04-04 18:22:02 +03:00 |
|
|
Maxim Kadushkin
|
240a3c1358
|
[DE] refactoring
|
2017-04-03 19:24:24 +03:00 |
|
|
Maxim Kadushkin
|
a90af06647
|
[DE] debug
|
2017-03-31 13:55:10 +03:00 |
|
|
Maxim Kadushkin
|
8765f5cc44
|
[DE] added extra buttons [PageBreak]
|
2017-03-31 13:54:02 +03:00 |
|
|
Maxim Kadushkin
|
98b1168c06
|
[DE] processed toolbar's [Comments] button
|
2017-03-29 19:29:04 +03:00 |
|
|
Maxim Kadushkin
|
2352646ec7
|
[DE] added buttons on toolbar
|
2017-03-29 19:24:20 +03:00 |
|
|
Maxim Kadushkin
|
ef2b590acb
|
[DE] StatusBar's refactoring. moved functions for changes to ReviewChanges controller
|
2017-03-29 14:19:57 +03:00 |
|
|
Maxim Kadushkin
|
9707822f7c
|
[DE] repaired viewport's layers after cutted header off
|
2017-03-01 16:37:27 +03:00 |
|
|
Maxim Kadushkin
|
73364f7f8b
|
[DE] implemeted toolbar folding
|
2017-02-28 13:09:05 +03:00 |
|
|
Maxim Kadushkin
|
b0935bca7a
|
[DE] show FileMenu from the toolbar
|
2017-02-20 17:54:12 +03:00 |
|
|
Julia Radzhabova
|
3d549e1bdf
|
[DE] Set focus to document after Prev/Next footnotes buttons are pressed.
|
2017-01-17 21:42:00 +03:00 |
|
|
Julia Radzhabova
|
2b10bc3411
|
[DE] Add footnote by clicking btnNotes button.
|
2017-01-17 21:27:30 +03:00 |
|
Alexander.Trofimov
|
126a0c9c4b
|
change license to 2017
|
2017-01-17 17:58:08 +03:00 |
|
|
Julia Radzhabova
|
b2c3707a6e
|
[DE] [PE] Change tooltip for Insert Chart button in the toolbar when chart is selected.
|
2016-12-27 12:34:08 +03:00 |
|
|
Julia Radzhabova
|
96dba54f6d
|
[DE] Show footnote tooltip. Debug applying note settings.
Fix fast mousemove from one footnote/hyperlink to another.
|
2016-12-26 17:07:50 +03:00 |
|
|
Julia Radzhabova
|
e93ec60426
|
[DE] Insert custom footnotes.
|
2016-12-26 13:54:36 +03:00 |
|
|
Julia Radzhabova
|
e1049695fc
|
[DE] Update note settings.
|
2016-12-23 15:29:16 +03:00 |
|
|
Julia Radzhabova
|
857d1ff790
|
[DE] Remove all footnotes.
|
2016-12-22 14:14:15 +03:00 |
|
|
Julia Radzhabova
|
6faa69ff4d
|
[DE] Update footnotes settings.
|
2016-12-20 17:34:01 +03:00 |
|
|
Julia Radzhabova
|
fa6d7451e6
|
[DE] Add footnote settings.
|
2016-12-19 14:44:02 +03:00 |
|
|
Julia Radzhabova
|
cb05587be1
|
[DE] [PE] Change chart type from the toolbar when chart is selected .
|
2016-12-16 14:33:38 +03:00 |
|
|
Julia Radzhabova
|
d3748cdd94
|
[DE][SSE] 1 call of fillEquations.
|
2016-10-24 13:58:34 +03:00 |
|
|
Julia Radzhabova
|
b9d5642a44
|
[DE] Move DE.define to Common
|
2016-10-21 13:54:36 +03:00 |
|
|
Julia Radzhabova
|
ee13c7a3f3
|
[DE] Fix Bug 33038.
|
2016-10-13 11:40:59 +03:00 |
|
|
Julia Radzhabova
|
0dd09875b8
|
Disable download as, print, save and version history when server is disconnected.
|
2016-10-12 16:32:48 +03:00 |
|
|
Julia Radzhabova
|
71390d54be
|
[DE] Add pages count to document.
|
2016-10-04 15:05:12 +03:00 |
|
|
Julia Radzhabova
|
c1333599b9
|
[DE][SSE] Update zoom value in the toolbar menu when editor is loading.
|
2016-09-02 15:30:55 +03:00 |
|
|
Julia Radzhabova
|
3342f6e62e
|
[DE desktop] Bug with editor loading.
|
2016-08-23 14:36:55 +03:00 |
|
|
Julia Radzhabova
|
880fad0c9f
|
[DE][SSE] Loading text arts and equations when editors are opened with compact toolbar.
|
2016-08-23 11:50:19 +03:00 |
|
|
Julia Radzhabova
|
d38c871476
|
Merge branch 'develop' into refactor
|
2016-08-19 17:20:32 +03:00 |
|
|
Julia Radzhabova
|
de773f8618
|
Debug opening/moving/resizing menus, dialogs, tips and others (using mouse events), when browser zoom != 100%.
|
2016-08-19 16:41:48 +03:00 |
|
|
Maxim Kadushkin
|
3e82cb1af3
|
delayed load for the menu of some buttons
|
2016-08-04 20:02:57 +03:00 |
|
|
Julia Radzhabova
|
9297531dff
|
Update copy/cut/paste from toolbar and context menu.
|
2016-07-26 17:46:42 +03:00 |
|
|
Julia Radzhabova
|
e6e7be6f84
|
Fixed bugs with focus and keydown events in menus.
|
2016-07-08 12:25:30 +03:00 |
|
|
Julia Radzhabova
|
1ccae8d386
|
[DE] revert dc6db03de9 (Fixed bug with closing menus and combo-boxes from toolbar and right panel, closing left panel and comments)
|
2016-07-08 12:12:09 +03:00 |
|
|
Julia Radzhabova
|
dc6db03de9
|
[DE] Fixed bug with closing menus and combo-boxes from toolbar and right panel, closing left panel and comments.
|
2016-07-08 10:04:34 +03:00 |
|
|
Julia Radzhabova
|
74eb399f59
|
[DE] Change page orientation using pop-up menu.
|
2016-07-04 16:04:05 +03:00 |
|
|
Julia Radzhabova
|
56af9c6c06
|
Отладка (удален повторный код).
|
2016-05-21 15:12:07 +03:00 |
|
|
Alexander.Trofimov
|
e436a3a17f
|
CDocumentSectionProps -> Asc.CDocumentSectionProps
|
2016-05-06 18:20:32 +03:00 |
|
|
Alexander.Trofimov
|
3180c98ee2
|
to Asc namespace
|
2016-04-18 15:21:15 +03:00 |
|
|
Alexander.Trofimov
|
a01ec32edb
|
FONT_THUMBNAIL_HEIGHT -> Asc.FONT_THUMBNAIL_HEIGHT
shd_Clear -> Asc.c_oAscShdClear
shd_Nil -> Asc.c_oAscShdNil
|
2016-04-05 19:18:57 +03:00 |
|
|
Alexander.Trofimov
|
7d6675b5b8
|
global clases -> Asc namespace
|
2016-04-05 15:57:51 +03:00 |
|
|
Alexander.Trofimov
|
eec1f68457
|
use 'c_oAsc...' variables from Asc namespace
|
2016-04-05 14:52:34 +03:00 |
|
|
Maxim Kadushkin
|
1bd7d37f93
|
license info added to js
|
2016-04-01 16:17:09 +03:00 |
|
|
Maxim Kadushkin
|
741b10515d
|
webapps added
|
2016-03-10 21:48:53 -03:00 |
|