Commit graph

397 commits

Author SHA1 Message Date
Julia Radzhabova a45f5891e6 Merge remote-tracking branch 'origin/develop' into develop 2017-01-18 11:18:14 +03:00
Julia Radzhabova cfd2b31b61 [SSE] Changed border styles for cell in the toolbar. 2017-01-18 11:17:58 +03:00
Alexander.Trofimov 5fafe6e304 2016 -> 2017 2017-01-18 11:08:19 +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
Julia Radzhabova 678ac9da70 [SSE] Update FormatSettingsDialog layout. 2017-01-17 20:44:36 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova d2421fee96 [SSE] Update FormatSettingsDialog layout. 2017-01-17 17:39:10 +03:00
Julia Radzhabova 4ac766e89c [SSE] Use Ctrl+1 for opening FormatSettingsDialog. 2017-01-17 16:40:18 +03:00
Julia Radzhabova cf5b29461b [SSE] FormatSettingsDialog: use current regional settings for applying custom formats. 2017-01-17 16:21:16 +03:00
Julia Radzhabova 681d032adb [SSE] Number format in the toolbar depends on regional settings. 2017-01-17 15:58:20 +03:00
Julia Radzhabova 708af63756 Merge branch 'feature/format-cells' of https://github.com/ONLYOFFICE/web-apps into feature/format-cells 2017-01-17 14:07:04 +03:00
Julia Radzhabova 75904432d6 [SSE] Change layout for FormatSettingsDialog. 2017-01-17 14:04:55 +03:00
Alexander.Trofimov 4deb5c6873 asc_getLocaleExample2 -> asc_getLocaleExample 2017-01-17 13:15:36 +03:00
Julia Radzhabova 5cf5f1e0c7 [SSE] Use asc_getLocaleExample2 instead of asc_getLocaleExample. 2017-01-17 12:45:48 +03:00
Julia Radzhabova f956912aa8 [SSE] FormatSettingsDialog: Use asc_getCurrencySymbols 2017-01-17 11:19:26 +03:00
Julia Radzhabova 05e604686a [SSE] Debug custom number format. 2017-01-17 09:51:08 +03:00
Julia Radzhabova 56e6f1c780 [SSE] Debug custom number format. 2017-01-16 17:06:46 +03:00
Julia Radzhabova 15a25b82e5 [SSE] Debug custom number formats. 2017-01-16 14:14:47 +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
Julia Radzhabova a67e3d7790 [SSE] Fix Bug 33733. 2016-12-27 16:39:16 +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 d5df1f4302 [SSE] Select data ranges for sparklines. 2016-12-13 15:54:58 +03:00
Julia Radzhabova 6c75dbabde Bug 33646 2016-12-13 15:33:28 +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 48d244a513 [SSE] Fix Bug 33598. 2016-12-05 11:47:45 +03:00
Alexey Golubev 33818c1833 Merge tag 'v4.2.0' into develop
v4.2.0 v4.2.0
2016-12-05 11:40:21 +03:00
Julia Radzhabova 95bccf6c37 Fix Bug 33599, fix Bug 33600 + fix bug with ThemeColorPalette, when zoom<100. 2016-12-05 11:06:53 +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 2d7f7737b7 [SSE] Added data and location ranges for sparklines. 2016-11-30 17:08:26 +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
Julia Radzhabova 0c9a6d4ff1 [SSE] Fix Bug 33512. 2016-11-23 16:38:30 +03:00
Julia Radzhabova 7e27652257 Fixed Bug 33189. 2016-11-23 14:15:14 +03:00
Julia Radzhabova c0c388f81a [SSE] Hide range data in the advanced sparkline settings. 2016-11-22 10:46:19 +03:00
Julia Radzhabova f4b556d30f [SSE] Hide the ability to add sparklines. 2016-11-21 17:35:03 +03:00
Julia Radzhabova 049d33a157 Fix Bug 33459. Update changes for Bug 33436. 2016-11-21 13:26:12 +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 2acc26495a [SSE] Fix Bug 33440 (depends on bootstap 3.3.7). 2016-11-18 17:17:20 +03:00
Julia Radzhabova de4dcb9107 [SSE] Added "Freeze Panes" to the toolbar. 2016-11-18 15:36:48 +03:00
Julia Radzhabova 7392d30a9d Change format for editorConfig->user (use "name" instead of "lastname" and "firstname"). 2016-11-18 14:48:24 +03:00
Julia Radzhabova 7d8b951852 [SSE] Fix Bug 33436. 2016-11-18 11:23:29 +03:00
Julia Radzhabova daf066c656 Change editor config: added "autosave" parameter to customization - initial option for autosaving.
Used if the user didn't change autosave or co-editing mode in the advanced settings.
2016-11-17 14:13:33 +03:00
Julia Radzhabova 39493539f7 [SSE] Close warnings with formula-error by esc. 2016-11-17 11:02:07 +03:00
Julia Radzhabova 275c592337 Update translations. 2016-11-16 13:35:26 +03:00
Julia Radzhabova 7dfcc927f6 Interface customization using plugins. Need to append config->editorConfig->pluigns->UIpluginsData field with list of customizer plugins. 2016-11-16 12:38:16 +03:00
Julia Radzhabova 5dcce1dab2 [SSE] Close confirm window by esc. 2016-11-11 16:25:04 +03:00
Julia Radzhabova 904bff55be [SSE] Fix Bug 33313. 2016-11-11 16:22:35 +03:00
Julia Radzhabova c8bcbf0feb [SSE] Fix Bug 33295. 2016-11-11 11:47:22 +03:00
Julia Radzhabova 73b4eb87a4 Merge branch 'develop' into feature/sparklines 2016-11-10 17:21:48 +03:00
Julia Radzhabova ad21492c29 Disable toolbar and right panel when lost editing rights (api method denyEditingRights). 2016-11-10 15:38:26 +03:00
Alexander.Trofimov 4f491a750c c_oAscVerticalTextAlign -> c_oAscVAlign
TEXT_ALIGN_BOTTOM -> Bottom
TEXT_ALIGN_CTR -> Center
TEXT_ALIGN_DIST -> Dist
TEXT_ALIGN_JUST -> Just
TEXT_ALIGN_TOP -> Top
2016-11-10 14:24:18 +03:00
Julia Radzhabova deb469bb83 [SSE] Change layout for chart settings in the right panel, remove chart style from the advanced chart settings. 2016-11-10 10:47:35 +03:00
Julia Radzhabova 9fcf4dcb91 [SSE] Fix Bug 33365. 2016-11-10 10:19:17 +03:00
Julia Radzhabova 22a5046f0a [SSE] Bug 33287. 2016-11-09 14:07:49 +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 d13f0ac0b0 [SSE] Don't show tab context menu when server is disconnected. 2016-11-03 15:00:48 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova 02897bda94 [SSE] Bug 33304: disable hyperlink actions in context menu when several cells are selected (multiselect is true). 2016-11-01 18:04:35 +03:00
Julia Radzhabova c87c80bfcb [SSE] Fix Bug 33304, fix Bug 33300. 2016-11-01 15:42:46 +03:00
Julia Radzhabova 8b13150ddc [SSE] Update layout for new translations. 2016-10-28 17:38:46 +03:00
Julia Radzhabova 2b4ebdefa1 Changed branding permissions. Use canBranding from license to hiding panels. 2016-10-28 16:38:33 +03:00
Julia Radzhabova 75a175b426 Merge pull request #38 from ONLYOFFICE/hotfix/v4.1.7
Hotfix/v4.1.7
2016-10-28 14:51:47 +03:00
Julia Radzhabova 67cdfb5592 Fix bug with underscore _.each method in IE9. 2016-10-27 14:39:54 +03:00
Julia Radzhabova db11c0939e [SSE] Set sparkline advanced settings. 2016-10-27 10:35:19 +03:00
Julia Radzhabova cf53fc04a1 [PE][SSE] Debug context menu for equations. 2016-10-26 16:20:51 +03:00
Julia Radzhabova 2e15b8aa2d [SSE] Set sparkline settings. 2016-10-26 15:16:45 +03:00
Julia Radzhabova 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova 1824834c01 [SSE] Add "Select from drop-down list" item to cell context menu. 2016-10-25 16:22:22 +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 65251b5250 [SSE] Debug equations. 2016-10-24 16:40:06 +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 04acc3ecc8 Autostart plugin after loading plugins. 2016-10-21 17:09:58 +03:00
Julia Radzhabova 1058d48f46 Add parameters to config for hiding toolbar, left menu, right menu. 2016-10-21 16:47:46 +03:00
Julia Radzhabova 6bb7470932 [SSE] Add equations. 2016-10-21 12:33:49 +03:00
Julia Radzhabova 1bcc69da7a Get edit rights from server config: asc_getRights. Used to set singletone mode 2016-10-20 10:22:16 +03:00
Julia Radzhabova 4048b849f8 Optimization for mouse click to document: replace heavy bootstrap function clearMenus. Elements with data-toggle=dropdown must have class dropdown-toggle. 2016-10-19 14:16:46 +03:00