Commit graph

700 commits

Author SHA1 Message Date
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
Maxim Kadushkin f25b45ca00 [SSE mobile] removed unused resources 2017-01-17 17:15:42 +03:00
Maxim Kadushkin 41f2187e85 [SSE mobile] updated icons 2017-01-17 17:03:07 +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
Alexander Yuzhin 8ab93d34ca [SSE mobile] Append border style icons 2017-01-16 11:55:55 +03:00
Julia Radzhabova fbd5901542 [SSE] Added dialog for custom number format. 2017-01-16 11:48:21 +03:00
Maxim Kadushkin 8a7a321b8c [SSE mobile] refactoring 2017-01-13 18:37:15 +03:00
Maxim Kadushkin 37ee56347c [SSE mobile] debug of deployment 2017-01-13 18:35:56 +03:00
Maxim Kadushkin e608f0e838 [SSE] debug of deployment 2017-01-13 18:32:45 +03:00
Alexander Yuzhin 4297290b87 [SSE mobile] Fixed add/remove sheets via context menu 2017-01-13 12:17:42 +03:00
Alexander Yuzhin 6023cc1cb8 [SSE mobile] Fixed stlyles of statusbar 2017-01-13 12:16:36 +03:00
Julia Radzhabova 1caa8bd6c0 [SSE] Set current cell value for format example. 2017-01-13 11:01:32 +03:00
Maxim Kadushkin 7c9dd75922 [SSE mobile] updated icons for android version 2017-01-12 19:27:56 +03:00
Maxim Kadushkin edf3c79076 [SSE mobile] debug 'Add' options on android 2017-01-12 19:27:09 +03:00
Julia Radzhabova 56fbd1e085 [SSE] Change control for Number Format. 2017-01-12 17:14:51 +03:00
Maxim Kadushkin 8194d6fbf8 [SSE mobile] process locked/disconnected state 2017-01-12 17:03:26 +03:00
Maxim Kadushkin 39c281684f [SSE mobile] cutted down 'Add' options for image/chart/shape 2017-01-11 17:50:14 +03:00
Maxim Kadushkin e2f8b1d24e [SSE mobile] updated icons 2017-01-11 15:29:33 +03:00
Maxim Kadushkin a1b0a2a92c [SSE mobile] debug 'add function' option 2017-01-11 13:54:32 +03:00
Maxim Kadushkin bf10598c25 [SSE mobile] separate 'add hyperlink' option 2017-01-11 13:53:59 +03:00
Maxim Kadushkin 64c1b76f2c [SSE mobile] AddLink page moved to separate class 2017-01-11 13:50:34 +03:00
Maxim Kadushkin cc8843b75d [SSE mobile] add navbar dynamically 2017-01-11 13:45:53 +03:00
Alexander Yuzhin 7e897bc188 [SSE mobile] Add cell format icons 2017-01-10 15:49:44 +03:00
Alexey Golubev 933ae6ec68 Merge branch 'hotfix/staropramen' 2017-01-10 12:26:12 +03:00
Alexander Yuzhin 8e6c9b42de [SSE mobile] Append translation for DocumentHolder, AddContainer, AddFunction 2017-01-09 14:39:26 +03:00
Alexander Yuzhin 64d6f53869 [SSE mobile] Fixed display function description view 2017-01-09 14:38:39 +03:00
Maxim Kadushkin 8b7d463de6 [SSE mobile] refactoring 2017-01-09 11:57:45 +03:00
Maxim Kadushkin 0b5edaaee0 [SSE mobile] disable 'Add' and 'Edit' options for locked cell 2017-01-09 11:56:40 +03:00
Maxim Kadushkin 4a95770c71 [SSE mobile] hide/show options for row and collumn 2017-01-09 11:54:16 +03:00
Maxim Kadushkin 1e61072e96 [SSE mobile] open 'Edit' options instead of 'Add' 2017-01-09 11:37:53 +03:00
Alexander Yuzhin e6959997d0 [DE mobile] Add document settings. 2016-12-28 17:55:11 +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
Alexander Yuzhin 74080fa082 Merge branch 'develop' into feature/new-mobile 2016-12-28 13:03:05 +03:00
Alexander Yuzhin ec64c39a4a [SSE mobile] Update icon for cell editor and for wrap text in cell. 2016-12-27 17:46:20 +03:00
Julia Radzhabova a67e3d7790 [SSE] Fix Bug 33733. 2016-12-27 16:39:16 +03:00
Alexander Yuzhin 7f38473e2f [SSE mobile] Addpend border icons 2016-12-26 15:33:44 +03:00
Alexander Yuzhin 492d43cb7c [SSE mobile] Fixed implementation of the settings controller. 2016-12-26 15:17:12 +03:00
Alexander Yuzhin f7ca02554f [SSE mobile] Append translation for ‘add function’ and ‘add other’ views. 2016-12-26 14:30:56 +03:00
Alexander Yuzhin 4b339df3c1 [SSE mobile] Append translation for a settings and search. 2016-12-26 12:05:24 +03:00
Alexander Yuzhin beb9ffe313 Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 2016-12-26 12:04:45 +03:00
Maxim Kadushkin 878144e5e2 [SSE mobile] added context menu for cell 2016-12-26 10:48:53 +03:00
Alexander Yuzhin ae63473793 [SSE mobile] Append translation for a main controller. 2016-12-25 17:07:46 +03:00
Alexander Yuzhin 6b12e7e012 [SSE mobile] Additional options for open CSV. 2016-12-25 16:45:53 +03:00
Alexander Yuzhin e19908f21f [SE mobile] Add localization for the view of editing cell 2016-12-23 17:30:02 +03:00
Maxim Kadushkin 5fa7723d11 Merge branch 'feature/new-mobile' with local 2016-12-23 16:21:23 +03:00
Maxim Kadushkin 4e34dd17fd [SSE mobile] refactoring 2016-12-23 16:20:15 +03:00
Maxim Kadushkin 0095c26ef8 [SSE mobile] shift work area when navbar collapse 2016-12-23 16:19:16 +03:00
Maxim Kadushkin bcaf38223f [SSE mobile] add worksheet's tab context menu 2016-12-23 16:16:53 +03:00
Maxim Kadushkin 14d9de319f [SSE mobile] load worksheets tabs on app launch 2016-12-23 15:07:54 +03:00
Alexander Yuzhin 84aab33fe3 [SSE mobile] Fixed display context menu. 2016-12-23 14:31:28 +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 4178a2ee57 [SSE] Update translations. 2016-12-23 11:51:32 +03:00
Alexander Yuzhin c6783cd87e [SE mobile] Add localization for the view of editing charts 2016-12-22 13:41:12 +03:00
Alexander Yuzhin 1236267c37 [SE mobile] Add localization for the view of editing hyperlink 2016-12-22 12:45:05 +03:00
Alexander Yuzhin 307e3630dd [DE mobile] Fixed display context menu. Fixed display about view. 2016-12-21 19:16:25 +03:00
Alexander Yuzhin a465f3d109 [SE mobile] Fixed view of inser hyperlink 2016-12-21 18:14:06 +03:00
Maxim Kadushkin abdb11649a Merge branch 'feature/new-mobile' 2016-12-21 17:33:42 +03:00
Maxim Kadushkin 35073c9028 [SSE mobile] open Function panel for CellEditor 2016-12-21 17:33:17 +03:00
Maxim Kadushkin 0496f3ba90 [SSE mobile] repaired Function button in CellEditor 2016-12-21 17:31:03 +03:00
Maxim Kadushkin 8215869b76 [SSE mobile] removed se6 features 2016-12-21 17:29:10 +03:00
Maxim Kadushkin a426f2150b [SSE Mobile] debug Functions page 2016-12-21 17:27:35 +03:00
Alexander Yuzhin 50550a5163 Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 2016-12-21 17:20:38 +03:00
Alexander Yuzhin 8c0aef300a [SE mobile] Add editing text info shapes and charts. 2016-12-21 17:18:22 +03:00
Oleg Korshul 2387729e0c add script 2016-12-21 17:01:03 +03:00
Oleg Korshul 528ff8eef5 add script 2016-12-21 16:57:21 +03:00
Julia Radzhabova 518c4212a1 New licence type SuccessLimit. 2016-12-20 18:40:43 +03:00
Maxim Kadushkin ec45ab8d90 [SSE mobile] repaired Sort&Filter page 2016-12-20 18:23:02 +03:00
Maxim Kadushkin edac20cc81 [SSE mobile] repaired Add Hyperlink page 2016-12-20 18:21:35 +03:00
Maxim Kadushkin 9a35a4593a [SSE mobile] debug Function page 2016-12-20 18:10:26 +03:00
Maxim Kadushkin 16d34bc887 [SSE mobile] removed ES6 features 2016-12-20 18:09:16 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +03:00
Alexander Yuzhin 34b58a505f [SE mobile] Edit hyperlink 2016-12-20 14:33:24 +03:00
Alexander Yuzhin ef7fc59735 [SE mobile] Add editing of image 2016-12-19 18:12:18 +03:00
Alexander Yuzhin e9c73ce811 [SE mobile] Add editing of shape 2016-12-19 16:17:04 +03:00
Alexander Yuzhin ccc40403cd [SE mobile] Fixed main controller. 2016-12-19 11:42:37 +03:00
Alexander Yuzhin b60195c1ad [SE mobile] Fixed cell styles 2016-12-19 10:30:50 +03:00
Maxim Kadushkin f18d3874fd [SSE mobile] refactor captions for "Functions" 2016-12-16 19:50:48 +03:00
Maxim Kadushkin 4f9c256dee [SSE mobile] added page "Sort & Filter" 2016-12-16 19:49:25 +03:00
Maxim Kadushkin f8a23844bb [SSE mobile] added chart icons for android 2016-12-16 17:53:13 +03:00
Maxim Kadushkin 9de0c0e68d [SSE mobile] added option "insert function" 2016-12-16 17:52:24 +03:00
Maxim Kadushkin 7da46250d7 [SSE mobile] set chart's captions 2016-12-16 17:48:10 +03:00
Alexander Yuzhin 0a98532bf9 [SE mobile] Add horizontal axis handlers of charts 2016-12-16 15:26:53 +03:00
Alexander Yuzhin c90ffcc76e [SE mobile] Add vertical axis handlers of charts 2016-12-16 14:17:40 +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 Yuzhin 87d6c74c47 [SE mobile] Change datar-uri to url for chart types 2016-12-15 11:57:37 +03:00
Alexander Yuzhin 66b14418aa [SE mobile] Chart settings, layout handlers. 2016-12-15 11:43:29 +03:00
Alexander Yuzhin a1009beff6 Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 2016-12-14 17:14:58 +03:00
Alexander Yuzhin b0e635135f [SE mobile] Chart settings, layout 2016-12-14 17:14:00 +03:00
Maxim Kadushkin dc152bda46 [SSE mobile] refactoring 2016-12-14 15:38:50 +03:00
Maxim Kadushkin dd8845ea12 [SSE mobile] modified description 2016-12-14 15:38:22 +03:00
Maxim Kadushkin bfb8075b9a [SSE mobile] added option for insert chart 2016-12-14 15:35:55 +03:00
Alexander.Trofimov 3612a75823 asc_setSheetViewSettings -> asc_setDisplayGridlines + asc_setDisplayHeadings 2016-12-14 15:23:53 +03:00
Julia Radzhabova 8d444cd223 Check origin of messages received in api. 2016-12-14 14:20:18 +03:00
Alexander Yuzhin bf9e024087 [SE mobile] Chart settings, layout. 2016-12-13 18:13:49 +03:00
Alexander Yuzhin b88e4cd119 [SE mobile] Chart settings, fill and border. 2016-12-13 16:37:13 +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
Alexander Yuzhin 5f1958cc0e [SE mobile] Chart settings, type and styles. 2016-12-13 14:20:50 +03:00
Alexander Yuzhin cdcb934482 [SE mobile] Layout styles of Chart settings. 2016-12-13 13:26:05 +03:00
Alexander Yuzhin 2bc215773a [SE ios] Add layout Edit Chart settings. 2016-12-12 18:13:46 +03:00
Alexander Yuzhin f355a42418 [SE ios] Add icons of chart types. 2016-12-12 16:46:26 +03:00
Alexander Yuzhin 99ce3ad06d [SE ios] Remove unused code into cell settings 2016-12-12 15:44:10 +03:00
Maxim Kadushkin bd916d4d9b Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
# Conflicts:
#	apps/spreadsheeteditor/mobile/app-dev.js
#	apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
2016-12-12 12:37:12 +03:00
Maxim Kadushkin 67e3aa2e35 [SSE mobile] debug CellEditor opening 2016-12-12 12:06:45 +03:00
Maxim Kadushkin ca8751175f [SSE mobile] added menu "Insert Other" 2016-12-12 12:05:41 +03:00
Maxim Kadushkin 8055bc958b [SSE mobile] added menu "Insert Shape" 2016-12-12 12:02:51 +03:00
Alexander Yuzhin 76e30403ef [SE ios] Add icons for Cell settings 2016-12-09 18:43:35 +03:00
Alexander Yuzhin 82294ade48 [SE ios] Cell settings 2016-12-09 15:44:26 +03:00
Alexander Yuzhin 346573087c [SE ios] Cell settings 2016-12-09 11:50:32 +03:00
Julia Radzhabova 1ee50da033 Merge branch 'feature/interface-customizer' into develop 2016-12-08 12:14:41 +03:00
Alexander Yuzhin 32442a17e7 Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
# Conflicts:
#	apps/presentationeditor/mobile/resources/css/app-ios.css
2016-12-07 16:09:06 +03:00
Alexander Yuzhin 3a057c936e [SE mobile] Add EditCell layout. 2016-12-07 16:05:50 +03:00
Maxim Kadushkin 35ed40ce15 Merge branch 'feature/new-mobile' 2016-12-07 14:35:41 +03:00
Maxim Kadushkin ef6285f32b [SSE mobile] debug toolbar hidding on android 2016-12-07 14:35:24 +03:00
Maxim Kadushkin 8164e2c89e [SSE mobile] debug CellEditor for android, added animation on collapse/expand event 2016-12-07 14:29:38 +03:00
Julia Radzhabova f03c42e1ca Merge branch 'develop' into feature/new-mobile 2016-12-07 13:57:28 +03:00
Alexander Yuzhin 848e27bbe2 [SE mobile] Add EditContainer. 2016-12-06 12:25:21 +03:00
Alexander Yuzhin 3a1e43e55a [SE mobile] Add AddContainer. 2016-12-06 11:51:22 +03:00
Maxim Kadushkin cc4addb2ff [SSE mobile] 'search' opened under expanded 'celleditor' 2016-12-05 19:44:34 +03:00
Alexander Yuzhin 93350b3c5d Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 2016-12-05 18:26:30 +03:00
Alexander Yuzhin b2aea5eb2a [SE mobile] Add Search. 2016-12-05 18:25:58 +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
Maxim Kadushkin 42e31d1811 [SSE mobile] added settings 2016-12-05 16:22:52 +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
Maxim Kadushkin f12413af21 [SSE mobile] implemented search and undo/redo 2016-12-02 18:08:45 +03:00
Maxim Kadushkin 5b894fc0e4 [SSE mobile] updated styles for tabs bar. implemented 'add worksheet' 2016-12-02 15:41:16 +03:00
Alexander Yuzhin e868764f93 Merge branch 'develop' into feature/new-mobile 2016-12-02 13:44:01 +03:00
Maxim Kadushkin 8e8027d7df [SSE mobile] added status bar 2016-12-01 20:12:44 +03:00
Maxim Kadushkin 7c5a886a47 [SSE mobile] created view for CellEditor controller 2016-12-01 20:11:16 +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
Alexander Yuzhin 193c1a3f04 Merge branch 'develop' into feature/new-mobile 2016-11-30 18:25:26 +03:00
Oleg Korshul 641a4962e8 change scripts list 2016-11-30 18:00:23 +03:00