Commit graph

227 commits

Author SHA1 Message Date
Julia Radzhabova fde00ea2d2 Update jquery to 3.2.1. 2017-04-21 11:20:40 +03:00
Julia Radzhabova f1280d2670 [DE mobile][PE][SSE] Merge from develop. 2017-04-11 14:05:56 +03:00
Maxim Kadushkin 55e48173ce [Common] refactoring 2017-03-29 19:27:44 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Alexander Yuzhin 03c1d710e3 [SSE] Reset bugfix for mobile 2017-02-07 14:12:41 +03:00
Alexander Yuzhin 01473b7240 [SSE] Fix Bug 33907 2017-02-07 12:58:35 +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
Maxim Kadushkin 4de7a13fc5 merge with default 2017-01-23 14:04:37 +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
Maxim Kadushkin e608f0e838 [SSE] debug of deployment 2017-01-13 18:32:45 +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
Alexey Golubev da8c914a01 Merge tag 'v4.2.3' into develop
v4.2.3 v4.2.3
2016-12-23 14:23:17 +03:00
Julia Radzhabova 705677a3e1 [SSE] Update hints for inserting and editing chart/sparklines buttons.
[Common] Fix updating hints for buttons.
2016-12-23 13:03:08 +03:00
Julia Radzhabova 518c4212a1 New licence type SuccessLimit. 2016-12-20 18:40:43 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +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 1ee50da033 Merge branch 'feature/interface-customizer' into develop 2016-12-08 12:14:41 +03:00
Julia Radzhabova b89d8f3522 Merge pull request #46 from ONLYOFFICE/hotfix/v4.2.1
Hotfix/v4.2.1
2016-12-05 17:11:09 +03:00
Julia Radzhabova dd1a531707 Fix Bug 33597 (+ disable clicking on btnCancel when frame is loading). 2016-12-05 17:08:58 +03:00
Julia Radzhabova df7db81378 Merge pull request #43 from ONLYOFFICE/release/v4.2.0
Release/v4.2.0
2016-12-01 17:33:19 +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 93cf75ce81 [SSE] Disable adding formula from the cell editor line only when input text to the cell. 2016-11-29 14:59:05 +03:00
Julia Radzhabova 38444d61fa Added new error messages. 2016-11-28 14:52:03 +03:00
Julia Radzhabova 4f47545717 [SSE] Added sparkline clearing to context menu. 2016-11-25 15:58:57 +03:00
Julia Radzhabova e82da5ebab Added "token" parameter to api config. 2016-11-24 16:44:54 +03:00
Julia Radzhabova fe0026bc30 [SSE] Fix bug with layout for username-tip on the locked sheet. 2016-11-24 15:30:38 +03:00
Julia Radzhabova 09ce1fb212 [SSE] Fix Bug 33509. 2016-11-24 15:26:22 +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