Commit graph

190 commits

Author SHA1 Message Date
Maxim Kadushkin 7fd2497462 Merge branch 'release/v5.1.0' into develop 2018-03-14 17:59:24 +03:00
Julia Radzhabova dc9158bc7b [DE] Fix Bug 37059 2018-03-05 12:28:37 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 9d1bf1199b [DE] Bug 36827 2018-02-26 17:38:35 +03:00
Maxim Kadushkin 09b9947051 [DE] defined button to indicate coauth changes 2018-02-26 16:31:34 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin fc6c6c2cb8 refactoring 2018-02-25 01:19:36 +03:00
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
Julia Radzhabova c172b0c69d [DE] Change name and layout for Links tab. 2018-02-16 12:14:20 +03:00
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +03:00
Julia Radzhabova 1954fa34f3 [DE][PE] Bug 36801. 2018-02-07 15:14:20 +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 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 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +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 09d019fa87 Change name and link for limitation window. 2017-10-18 15:08:11 +03:00
Julia Radzhabova 32267aa6ab [DE] Added tab Collaboration. 2017-10-07 16:06:51 +03:00
Julia Radzhabova eb5f62a041 Fix Bug 35630. 2017-09-15 13:31:59 +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 ea4b7f4366 [DE] Fix Bug 35757. 2017-09-04 13:38:48 +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
Maxim Kadushkin e4881516ba refactoring 2017-08-30 15:23:22 +03:00
Maxim Kadushkin c76a24beeb unified toolbar's components identifiers 2017-08-08 18:00:55 +03:00
Julia Radzhabova 2534172136 Update translations. 2017-08-08 14:15:53 +03:00
Maxim Kadushkin 55889a4bf4 [Common] collase toolbar immediately after switch on 'compact' view 2017-08-01 14:39:31 +03:00
Maxim Kadushkin 079cbe0a60 updated toolbar styles according to drafts 2017-07-21 13:48:02 +03:00
Maxim Kadushkin 86c3493c1c changed header layout for view mode 2017-07-13 12:43:40 +03:00
Maxim Kadushkin 27fd54d45e [DE] updated toolbar layout 2017-07-11 11:27:56 +03:00
Julia Radzhabova 62cf5948dd Remove surface charts. 2017-07-05 15:55:21 +03:00
Julia Radzhabova ecf196e98b Added surface charts. 2017-07-05 15:22:02 +03:00
Maxim Kadushkin 52750c5907 [DE] big 'Dropcap' button 2017-06-30 17:35:48 +03:00
Julia Radzhabova 63c7a61a01 [DE] Update translations. 2017-06-27 14:14:19 +03:00
Maxim Kadushkin 043594c5f4 [DE] debug toolbar's layout 2017-06-27 13:36:29 +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 5d40fdc1ed Debug toolbar layout. 2017-06-15 16:18:40 +03:00
Julia Radzhabova 22e130d9db [DE][PE] Change icons for selecting bullets/numbering. 2017-05-16 13:06:23 +03:00
Maxim Kadushkin 4bb630132e [DE] changed layout of 'insert' panel 2017-05-04 15:41:56 +03:00
Julia Radzhabova 03abcc2d8b [DE][PE] Debug view mode. 2017-04-26 16:51:23 +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
Julia Radzhabova 96712db8cb Update for underscore 1.8.3. 2017-04-21 11:10:07 +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 5821be5388 [DE] debug 2017-04-20 13:32:55 +03:00
Maxim Kadushkin 6e867fb9f0 [DE] updated translations 2017-04-20 13:23:50 +03:00
Julia Radzhabova 7af77fafb5 [DE] Added default translations. 2017-04-19 15:09:44 +03:00
Julia Radzhabova e24c0e4b38 [DE] Bug with co-editing in strict mode. 2017-04-19 14:24:23 +03:00
Julia Radzhabova 967af6951a Merge remote-tracking branch 'origin/feature/new-toolbar' into feature/new-toolbar 2017-04-12 13:01:38 +03:00
Julia Radzhabova 48453ecda4 [DE] Added option customization->statusBar to config for hiding status bar. 2017-04-12 10:59:28 +03:00
Julia Radzhabova d2d9b2b594 Merge feature/force-save. 2017-04-11 16:40:01 +03:00
Maxim Kadushkin 2c37dd34b3 [DE] fix 'zoom' button icon 2017-04-11 15:31:45 +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 721b785033 [DE] processed buttons for image arrangement 2017-04-04 18:43:19 +03:00
Maxim Kadushkin 3784eb0717 [DE] national's flags were moved to separate sprite 2017-04-04 17:47:21 +03:00
Maxim Kadushkin 09942d8d43 [DE] debug styles 2017-04-03 19:25:21 +03:00
Maxim Kadushkin 8765f5cc44 [DE] added extra buttons [PageBreak] 2017-03-31 13:54:02 +03:00
Maxim Kadushkin 2352646ec7 [DE] added buttons on toolbar 2017-03-29 19:24:20 +03:00
Maxim Kadushkin 86c82b1228 [DE] process moving for the 'post-rendered' tabs 2017-03-29 12:45:55 +03:00
Maxim Kadushkin b57830c9ab [DE] refactoring 2017-03-16 13:20:07 +03:00
Maxim Kadushkin 52a8419371 [DE] added plugins to toolbar 2017-03-13 19:14:26 +03:00
Maxim Kadushkin eed89a5c5b [DE] refactoring 2017-03-06 12:30:18 +03:00
Maxim Kadushkin 63da5b2483 [DE] added caption for some buttons 2017-03-06 12:26:18 +03:00
Maxim Kadushkin a3a896ac79 [DE] repaired header 2017-03-01 16:33:12 +03:00
Maxim Kadushkin 73364f7f8b [DE] implemeted toolbar folding 2017-02-28 13:09:05 +03:00
Maxim Kadushkin d20092c5b2 [DE] refactoring 2017-02-27 15:02:37 +03:00
Maxim Kadushkin 62587692c6 [DE] added scroll buttons for the short tabs panel 2017-02-20 17:51:33 +03:00
Maxim Kadushkin d9858934d0 [DE] toolbar's new layout 2017-02-15 16:45:25 +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 1ed82bd37a [DE] Disable insert footnotes button when paragraph is locked. 2016-12-28 14:05:01 +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 59a8fb5867 [DE] get_PropertyThemeColorSchemes -> asc_onSendThemeColorSchemes. 2016-12-21 12:13:33 +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 3fe8ee259f Changed layout for chart/sparkline type menu.
[SSE] Select chart/sparkline type from toolbar.
2016-12-16 11:37:57 +03:00