Commit graph

509 commits

Author SHA1 Message Date
Julia Radzhabova 3d6ebf252c Disable protection feature. 2018-04-28 13:25:41 +03:00
Julia Radzhabova 5a39e55c21 [SSE] Hide options for export to pdf format (rev. 1aed6a07f5) 2018-04-17 13:38:26 +03:00
Julia Radzhabova 1aed6a07f5 [SSE] Fix Bug 34914 2018-04-05 14:29:37 +03:00
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Julia Radzhabova d968746171 [SSE] Add spanish translation for functions. 2018-03-30 12:48:54 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Julia Radzhabova dbe086d14f [SSE] Fix Bug 37137 2018-03-07 13:13:20 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 6cf3ee7fb9 [SE PE] absract 'save' button 2018-02-28 16:17:53 +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 a522822f1b [SSE] Fix Bug 35855 2018-02-21 11:51:36 +03:00
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin b5a5c97735 hide some buttons for desktop mode 2018-02-07 18:30:45 +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 fc6504f5ac [PE][SSE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 14:10:33 +03:00
Julia Radzhabova 079a046587 Menu component: added clearAll method. 2018-01-15 17:47:46 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova 0295612ce1 [SSE] Change order for super/subscript buttons. 2018-01-10 16:08:42 +03:00
Julia Radzhabova 89041a2ede Merge branch 'feature/SSE-bug26581' into feature/v5.0.6-signature 2017-12-11 12:29:26 +03:00
Julia Radzhabova a8a7a4f917 [SSE] Fix Bug 26581. 2017-12-05 16:58:01 +03:00
Julia Radzhabova bea598c4f0 [PE][SSE] Debug signature settings. 2017-11-28 17:35:51 +03:00
Julia Radzhabova 4a5d78f36e [SSE] Show tooltip and disable editing when document is signed. 2017-11-28 14:25:08 +03:00
Julia Radzhabova 147735ea7e [SSE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-17 17:35: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 76e2d4c290 [SSE] Show tooltip and disable editing when document is signed. 2017-11-10 10:50:01 +03:00
Julia Radzhabova a5c938338f [SSE] Fix Bug 36248. 2017-11-03 15:08:29 +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 de0b44f5dc [SSE] Added modifyFilter permission to config: when = false, disable add/remove filters,sort, change formatted table style. 2017-10-19 13:14:12 +03:00
Julia Radzhabova 7b935691dd [SSE] Show pivot tab. 2017-10-13 11:52:40 +03:00
Julia Radzhabova 5178858833 [SSE] Added collaboration tab. 2017-10-12 13:43:23 +03:00
Julia Radzhabova 76cbae43d5 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-10-11 12:14:58 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 571bab99cd [SSE] Fix Bug 35854. 2017-09-18 13:41:39 +03:00
Julia Radzhabova d0ce09c50f Revert "[SSE] Fix Bug 35842."
This reverts commit 86213ed908.
2017-09-14 15:48:54 +03:00
Julia Radzhabova 86213ed908 [SSE] Fix Bug 35842. 2017-09-14 13:57:50 +03:00
Julia Radzhabova 876eb58f8b Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-30 15:12:25 +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 3dee547c98 [SSE] Fix Bug 35722. 2017-08-29 15:43:16 +03:00
Julia Radzhabova 9efa672947 [SSE] Changed using asc_setCellVertAlign, asc_setCellAlign functions. 2017-08-24 14:22:59 +03:00
Julia Radzhabova c5d19bfb89 Fix Bug 35715, fix Bug 35714. 2017-08-23 14:51:27 +03:00
Julia Radzhabova 0a1d11cd18 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-22 14:31:14 +03:00
Maxim Kadushkin c76a24beeb unified toolbar's components identifiers 2017-08-08 18:00:55 +03:00
Julia Radzhabova 436588340a Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-08 17:06:32 +03:00
Julia Radzhabova 358ea3701e [SSE] Disable filters, sort, merge, hyperlinks when in pivot table. 2017-08-08 14:40:47 +03:00
Julia Radzhabova ceadc48c56 [SSE] Fix Bug 35503. 2017-08-04 14:03:02 +03:00
Julia Radzhabova b66fbdb59b Fix Bug 35511. 2017-08-03 17:40:28 +03:00
Julia Radzhabova bd5ae6e902 Update hint for Add Comment button. 2017-08-02 16:47:40 +03:00
Maxim Kadushkin 9b1a4a0904 [SSE, PE] fix bug 35473 2017-08-01 15:28:15 +03:00
Julia Radzhabova 0ca3e9fc41 Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-08-01 15:23:54 +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
Julia Radzhabova 6c6451d39c Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-07-18 16:01:51 +03:00
Julia Radzhabova bedfa57dcf [SSE][PE] Fix context menu. 2017-07-18 15:59:14 +03:00
Julia Radzhabova 3da75ce6ed Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-07-05 16:04:43 +03:00
Julia Radzhabova bccc2b7187 [SSE] Tooltips for cell styles. 2017-07-05 15:06:06 +03:00
Julia Radzhabova c230f90eec [SSE] Added PivotTable tab. 2017-06-30 17:49:58 +03:00
Julia Radzhabova 917ff1da54 Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-06-30 14:53:19 +03:00
Julia Radzhabova 10df370024 Debug adding comment from toolbar. [SSE] Lock commenting from toolbar when cell is selected and locked or has comments. Add comment to document when object is selected. 2017-06-30 14:33:31 +03:00
Julia Radzhabova 2b695f0b23 Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-06-28 17:39:28 +03:00
Maxim Kadushkin 32a688e910 Merge with remote 2017-06-28 14:53:50 +03:00
Julia Radzhabova fae2867431 Disable/enable comment button in the toolbar. 2017-06-28 14:20:49 +03:00
Maxim Kadushkin c529667cb4 debug toolbar's big buttons 2017-06-28 14:16:09 +03:00
Julia Radzhabova bafbdf6c3f [SSE] Disable filters, sort, merge, hyperlinks when in pivot table. 2017-06-21 12:47:22 +03:00
Julia Radzhabova 5d40fdc1ed Debug toolbar layout. 2017-06-15 16:18:40 +03:00
Julia Radzhabova 00fb06281e View mode with commenting (permissions.comments = true). 2017-06-14 14:53:29 +03:00
Julia Radzhabova 3d4e53f7b0 Added context menu in the viewer mode (Copy menu item). 2017-06-06 11:04:04 +03:00
Julia Radzhabova f69672d245 [SSE] For Bug 35040. Show current document locale in the settings in left panel. 2017-06-01 17:46:07 +03:00
Julia Radzhabova 5d08a22c80 [SSE] Enhancement: apply text orientation for shapes from toolbar menu (disable 45/-45). 2017-05-15 16:32:01 +03:00
Julia Radzhabova a661cb1698 [SSE] Changes for rev. [SSE] Disabled adding sparklines and changing data/location range. 2017-05-11 10:39:58 +03:00
Maxim Kadushkin e440e7d5af Merge branch 'feature/new-toolbar' 2017-05-01 14:31:22 +03:00
Maxim Kadushkin a178bfcb45 [SSE] debug 'EditDiagram' mode 2017-05-01 14:29:38 +03:00
Julia Radzhabova dead0af353 [SSE] Collapse toolbar when document context menu is opened. 2017-04-28 17:43:12 +03:00
Julia Radzhabova b53b32e67f [SSE] Fix loading color palettes in the toolbar menu. 2017-04-28 17:28:35 +03:00
Julia Radzhabova 23bb0084e9 [SSE] Bug with co-editing in strict mode and icons in the toolbar (border button). 2017-04-28 17:08:11 +03:00
Maxim Kadushkin be7577dd5b [SSE] repaired 'mail merge' mode 2017-04-28 16:37:28 +03:00
Maxim Kadushkin aa1fa0dd31 [SSE] repaired 'edit diagram' mode 2017-04-28 15:24:57 +03:00
Maxim Kadushkin b87e85ac92 [SSE] refactoring 2017-04-28 15:22:37 +03:00
Maxim Kadushkin e3bee31af6 [SSE] changed toolbar's layout 2017-04-27 18:40:27 +03:00
Maxim Kadushkin d2de0c7dfc [SSE] refactoring 2017-04-27 18:25:02 +03:00
Julia Radzhabova 5921702c18 [SSE] Fix Bug 34790. 2017-04-21 11:52:02 +03:00
Julia Radzhabova f1280d2670 [DE mobile][PE][SSE] Merge from develop. 2017-04-11 14:05:56 +03:00
Julia Radzhabova e258200a94 [SSE] Fill format settings info. 2017-02-07 12:56:32 +03:00
Julia Radzhabova 4d34160697 [Common] Window: use alerts without icon.
[SSE] Debug sorting.
2017-02-07 11:55:24 +03:00
Julia Radzhabova ead4d45e61 [SSE] Bug 32599. 2017-02-06 17:12:59 +03:00
Julia Radzhabova 1eae40c65b [SSE] Fix Bug 19709. 2017-02-06 14:22:34 +03:00
Alexander.Trofimov b726fc0e22 fix bug 33812 2017-01-20 13:34:52 +03:00
Alexander.Trofimov 081514512d add this 2017-01-19 15:08:55 +03:00
Alexander.Trofimov c41562925d asc_getNumFormatType -> asc_getNumFormatInfo 2017-01-19 15:03:32 +03:00
Julia Radzhabova 8319542564 [SSE] Select current table style in the toolbar when table is selected. 2017-01-19 14:46:00 +03:00
Julia Radzhabova 973b55315d [SSE] FormatSettingsDialog: add custom format to the list of formats. 2017-01-19 14:34:37 +03:00
Julia Radzhabova cfd2b31b61 [SSE] Changed border styles for cell in the toolbar. 2017-01-18 11:17:58 +03:00
Alexander Trofimov 581361b7d2 Merge pull request #51 from ONLYOFFICE/feature/format-cells
Feature/format cells
2017-01-18 10:34:41 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova 4ac766e89c [SSE] Use Ctrl+1 for opening FormatSettingsDialog. 2017-01-17 16:40:18 +03:00
Julia Radzhabova 681d032adb [SSE] Number format in the toolbar depends on regional settings. 2017-01-17 15:58:20 +03:00
Alexander.Trofimov 4deb5c6873 asc_getLocaleExample2 -> asc_getLocaleExample 2017-01-17 13:15:36 +03:00
Julia Radzhabova f956912aa8 [SSE] FormatSettingsDialog: Use asc_getCurrencySymbols 2017-01-17 11:19:26 +03:00
Julia Radzhabova 56e6f1c780 [SSE] Debug custom number format. 2017-01-16 17:06:46 +03:00
Julia Radzhabova fbd5901542 [SSE] Added dialog for custom number format. 2017-01-16 11:48:21 +03:00
Julia Radzhabova 1caa8bd6c0 [SSE] Set current cell value for format example. 2017-01-13 11:01:32 +03:00
Julia Radzhabova 56fbd1e085 [SSE] Change control for Number Format. 2017-01-12 17:14:51 +03:00
Julia Radzhabova cf8ee5878d [SSE] Disable changing type for the locked chart. 2016-12-28 14:54:48 +03:00
Julia Radzhabova 14c2a177de [SSE] Disable inserting sparklines when objects are selected (shape, image, chart). 2016-12-28 14:28:27 +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
Alexander.Trofimov 3612a75823 asc_setSheetViewSettings -> asc_setDisplayGridlines + asc_setDisplayHeadings 2016-12-14 15:23:53 +03:00
Julia Radzhabova 2600efb38c [SSE] Update table templates depending on whether or not a table is selected. Query table templates when theme colors are changed. 2016-11-29 15:48:18 +03:00
Julia Radzhabova 28a4bf62b7 [SSE] Added hints for the table templates. 2016-11-29 15:01:29 +03:00
Julia Radzhabova 0fe19076ee [SSE] Lock text editing in the toolbar when shape/chart is selected and locked 2016-11-24 11:36:52 +03:00
Julia Radzhabova 24e1663035 [SSE] Use asc_getLockedTable() instead of cellinfo.asc_getLocked() for detecting if the table is locked. 2016-11-24 10:23:02 +03:00
Julia Radzhabova 0c9a6d4ff1 [SSE] Fix Bug 33512. 2016-11-23 16:38:30 +03:00
Julia Radzhabova f4b556d30f [SSE] Hide the ability to add sparklines. 2016-11-21 17:35:03 +03:00
Alexander Trofimov b49489d2dd Merge pull request #42 from ONLYOFFICE/feature/sparklines
Feature/sparklines
2016-11-18 18:40:18 +03:00
Julia Radzhabova de4dcb9107 [SSE] Added "Freeze Panes" to the toolbar. 2016-11-18 15:36:48 +03:00
Julia Radzhabova 73b4eb87a4 Merge branch 'develop' into feature/sparklines 2016-11-10 17:21:48 +03:00
Julia Radzhabova c1fcad76d0 [SSE] Bug 26981. 2016-11-07 16:00:11 +03:00
Julia Radzhabova d2df65b0b6 [SSE] Fix Bug 33322. 2016-11-03 15:03:37 +03:00
Julia Radzhabova c87c80bfcb [SSE] Fix Bug 33304, fix Bug 33300. 2016-11-01 15:42:46 +03:00
Julia Radzhabova 9a284bffac Merge branch 'develop' into feature/sparklines 2016-10-25 13:50:30 +03:00
Julia Radzhabova 054319793f [PE] Added equations. 2016-10-25 13:48:31 +03:00
Julia Radzhabova 381e886ef9 [SSE] Context menu for equations. 2016-10-24 14:56:11 +03:00
Julia Radzhabova d3748cdd94 [DE][SSE] 1 call of fillEquations. 2016-10-24 13:58:34 +03:00
Julia Radzhabova fdc4e3ec70 Merge branch 'develop' into feature/sparklines 2016-10-24 12:07:08 +03:00
Julia Radzhabova 6bb7470932 [SSE] Add equations. 2016-10-21 12:33:49 +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 e32d00d91a Merge branch 'develop' into feature/sparklines 2016-10-07 11:10:43 +03:00
Julia Radzhabova 47edb2ef05 [SSE] use asc_getCellInfo().asc_getFormatTableInfo() instead of asc_getAddFormatTableOptions to check if a table is selected. 2016-10-05 18:53:56 +03:00
Julia Radzhabova 28f1d07c43 Merge branch 'develop' into feature/sparklines 2016-09-23 14:25:56 +03:00
Julia Radzhabova e0575a4db6 Fix Bug 33139. 2016-09-23 14:24:54 +03:00
Julia Radzhabova 73cfc7efb2 Merge branch 'develop' into feature/sparklines 2016-09-21 14:25:06 +03:00
Julia Radzhabova fee0e4362e [SSE] Use c_oAscSparklineType. 2016-09-16 16:24:46 +03:00
Julia Radzhabova 5924e4ff82 Added sparkline settings. 2016-09-14 16:34:08 +03:00
Julia Radzhabova a731a62c55 [SSE] Fix bug with updating zoom value in the toolbar menu when editor is loading. 2016-09-02 15:51:53 +03:00
Julia Radzhabova a84fd57c3d Merge branch 'develop' into refactor 2016-09-02 15:42:23 +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 d5b1e45152 [SSE] Delayed loading for the menu of some buttons. Don't read settings for hiding headings from local storage. 2016-09-01 17:45:04 +03:00
Julia Radzhabova 2a0ef264a5 Merge branch 'develop' into refactor 2016-08-30 14:36:24 +03:00
Julia Radzhabova b62a98c7aa [SSE] Fix Bug 33007 2016-08-29 11:01:44 +03:00
Julia Radzhabova 65ade4807e [SSE] Hints moved in delayed load 2016-08-24 17:46:45 +03:00
Julia Radzhabova 2c3891c2bd [SSE] Fix Bug 32990. 2016-08-24 11:35:32 +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 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 56af9c6c06 Отладка (удален повторный код). 2016-05-21 15:12:07 +03:00
Julia Radzhabova 3de9494268 [SSE] Применение сортировки и фильтрации по цвету. 2016-05-05 17:38:57 +03:00
Julia Radzhabova d64ddf5145 Merge branch 'develop' into feature/sse-table-settings 2016-04-08 14:20:34 +03:00
Alexander.Trofimov eec1f68457 use 'c_oAsc...' variables from Asc namespace 2016-04-05 14:52:34 +03:00
Julia Radzhabova 3f69d38f37 Merge branch 'feature/sse-print-settings' into develop 2016-04-04 11:56:49 +03:00
Julia Radzhabova 225120e0c3 [SSE] Bug 25965, 21666: при попытке печати всегда показывать окно с настройками печати. 2016-04-04 11:17:21 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00
Julia Radzhabova 7ad63bcae1 [SSE] Отладка настройки форматированных таблиц. 2016-03-29 17:35:28 +03:00
Julia Radzhabova 8a882bcb31 [SSE] оптимизация кода. 2016-03-15 13:53:55 +03:00
Julia Radzhabova 8625a594e5 [SSE] asc_getTableStyleName может отсутствовать в случае, если применена форматированная таблица (asc_getTableName есть всегда). 2016-03-15 13:16:57 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00