Commit graph

433 commits

Author SHA1 Message Date
Julia Radzhabova 68bf190120 [DE] Check if token for history revision is expired. 2017-04-11 15:26:47 +03:00
Julia Radzhabova c35d3c544a [DE] Set token for history version. 2017-04-11 14:33:50 +03:00
Julia Radzhabova f1280d2670 [DE mobile][PE][SSE] Merge from develop. 2017-04-11 14:05:56 +03:00
Maxim Kadushkin c8e40f6d03 [DE] refactoring 2017-04-06 12:42:43 +03:00
Maxim Kadushkin 360cca6601 [DE] locked action for 'status' label 2017-04-06 12:42:10 +03:00
Maxim Kadushkin c1c6ce3061 [DE] compact view for toolbar 2017-04-06 12:34:01 +03:00
Maxim Kadushkin 0cf3621991 [DE] processed permissions for review 2017-04-05 12:11:15 +03:00
Maxim Kadushkin 375b2e400f [DE] processed buttons [Document Language], [Spell checking] 2017-04-04 18:22:02 +03:00
Maxim Kadushkin 4a44c1f344 [DE] refactoring 2017-04-04 18:14:47 +03:00
Maxim Kadushkin 3784eb0717 [DE] national's flags were moved to separate sprite 2017-04-04 17:47:21 +03:00
Maxim Kadushkin ae12690dea [Common] debug 2017-04-03 19:20:12 +03:00
Maxim Kadushkin 98b1168c06 [DE] processed toolbar's [Comments] button 2017-03-29 19:29:04 +03:00
Maxim Kadushkin 55e48173ce [Common] refactoring 2017-03-29 19:27:44 +03:00
Maxim Kadushkin 2352646ec7 [DE] added buttons on toolbar 2017-03-29 19:24:20 +03:00
Maxim Kadushkin ef2b590acb [DE] StatusBar's refactoring. moved functions for changes to ReviewChanges controller 2017-03-29 14:19:57 +03:00
Maxim Kadushkin ac79eacb35 [Common] refacted 'ReviewChanges' 2017-03-29 12:33:20 +03:00
Maxim Kadushkin 5ed32d082c [DE] refactoring 2017-03-29 12:01:34 +03:00
Maxim Kadushkin 181bdc7fa2 [Common] value in local storage transform to the boolean 2017-03-29 11:56:50 +03:00
Maxim Kadushkin f751aac0ab [Common] changed layout for the huge buttons 2017-03-29 11:49:42 +03:00
Maxim Kadushkin 71595d781c [Common] changed plugin's button 2017-03-23 16:02:19 +03:00
Maxim Kadushkin 7a2b4dab48 [Common] changed logic for the 'split' button 2017-03-23 16:00:24 +03:00
Maxim Kadushkin 49df5ea043 [Common] added template for the big button with caption without menu 2017-03-23 15:52:49 +03:00
Maxim Kadushkin 1e46c9b386 [DE] refactoring 2017-03-21 17:16:46 +03:00
Maxim Kadushkin 849ff6a91e [Common] added action for 'Back' menu 2017-03-16 16:59:04 +03:00
Maxim Kadushkin 57c35f7ca1 [Common] debug button 2017-03-16 14:38:12 +03:00
Maxim Kadushkin 7f972c790e [Common] added label for 'Save' operation 2017-03-16 13:24:03 +03:00
Maxim Kadushkin 10cb608a2c [Common] plugin's launch, updated styles 2017-03-16 13:21:36 +03:00
Maxim Kadushkin b57830c9ab [DE] refactoring 2017-03-16 13:20:07 +03:00
Maxim Kadushkin 994212108f [Common] apply button's icon from certain image 2017-03-16 12:55:11 +03:00
Maxim Kadushkin 10a55236d0 [DE] moved "coauthoring users" panel to toolbar 2017-03-13 19:29:05 +03:00
Maxim Kadushkin 52a8419371 [DE] added plugins to toolbar 2017-03-13 19:14:26 +03:00
Maxim Kadushkin 8de318a9b1 [Common] fixed counting online users 2017-03-13 19:01:32 +03:00
Maxim Kadushkin 02b779a0eb [Common] changed buttons on 'review' panel 2017-03-09 11:59:17 +03:00
Maxim Kadushkin 4dc8bdba37 [Common] implemented a big button with caption under the icon 2017-03-09 11:58:19 +03:00
Maxim Kadushkin 4cd69190ff [Common] button's refactoring 2017-03-09 11:41:47 +03:00
Maxim Kadushkin 13aff47a21 [Common] big buttons for ReviewChanges 2017-03-06 12:31:09 +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 357bcc9061 [Common] repaired button's caption 2017-03-06 12:02:32 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Maxim Kadushkin a3a896ac79 [DE] repaired header 2017-03-01 16:33:12 +03:00
Maxim Kadushkin ba2800c14e [DE] 'Review' controls moved to the toolbar 2017-02-27 15:04:18 +03:00
Maxim Kadushkin d880555bbf [DE] devided ReviewChanges for private members 2017-02-21 12:48:23 +03:00
Julia Radzhabova d80f5ed598 Fix Bug 33803. 2017-02-09 09:55:35 +03:00
Julia Radzhabova 20e00054bb About: delete link to onlyoffice when use branding. 2017-02-07 18:36:03 +03:00
Julia Radzhabova 4d34160697 [Common] Window: use alerts without icon.
[SSE] Debug sorting.
2017-02-07 11:55:24 +03:00
Julia Radzhabova d325acee07 [DE] Add languages for spellchecker. 2017-02-01 21:38:26 +03:00
Maxim Kadushkin e6bb8d54ca [mobile] fix for android context menu was moved to common.utils 2017-01-30 18:09:11 +03:00
Alexey.Golubev 3ad3aefac4 Added automatic version numbering 2017-01-25 19:30:08 +03:00
Julia Radzhabova 3abcf98b70 Fix bug 33822. 2017-01-25 14:21:30 +03:00
Maxim Kadushkin 46559ae2fb [SSE mobile] refactoring 2017-01-23 14:34:23 +03:00
Maxim Kadushkin 4de7a13fc5 merge with default 2017-01-23 14:04:37 +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 15a25b82e5 [SSE] Debug custom number formats. 2017-01-16 14:14:47 +03:00
Julia Radzhabova 54c8d379ac [Common] ComboBox: use itemsTemplate for custom dropdown menu. 2017-01-12 17:09:15 +03:00
Alexey Golubev 933ae6ec68 Merge branch 'hotfix/staropramen' 2017-01-10 12:26:12 +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
Julia Radzhabova 96dba54f6d [DE] Show footnote tooltip. Debug applying note settings.
Fix fast mousemove from one footnote/hyperlink to another.
2016-12-26 17:07:50 +03:00
Julia Radzhabova 265bf5084d [DE] Fix bug with review changes panel (it was over dropdown menu in the right panel). 2016-12-23 13:07:07 +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
Alexander Yuzhin 307e3630dd [DE mobile] Fixed display context menu. Fixed display about view. 2016-12-21 19:16:25 +03:00
Maxim Kadushkin a426f2150b [SSE Mobile] debug Functions page 2016-12-21 17:27:35 +03:00
Julia Radzhabova c490430580 [DE] Note settings: support start position in different formats. 2016-12-21 15:40:22 +03:00
Maxim Kadushkin 9a35a4593a [SSE mobile] debug Function page 2016-12-20 18:10:26 +03:00
Alexander Yuzhin 34b58a505f [SE mobile] Edit hyperlink 2016-12-20 14:33:24 +03:00
Alexander Yuzhin e9c73ce811 [SE mobile] Add editing of shape 2016-12-19 16:17:04 +03:00
Maxim Kadushkin 9de0c0e68d [SSE mobile] added option "insert function" 2016-12-16 17:52:24 +03:00
Julia Radzhabova 09671949ea Bug 20101. Bug with hiding tooltips for disabled split buttons (after timout only). 2016-12-16 16:26:37 +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 b0e635135f [SE mobile] Chart settings, layout 2016-12-14 17:14:00 +03:00
Julia Radzhabova 8d444cd223 Check origin of messages received in api. 2016-12-14 14:20:18 +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 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
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
Julia Radzhabova f03c42e1ca Merge branch 'develop' into feature/new-mobile 2016-12-07 13:57:28 +03:00
Julia Radzhabova bad28bbe33 Remove zoom correction on mobile devices. 2016-12-07 13:54:26 +03:00
Pavel Lobashov 747d24cbd7 update about.js for 4.3 2016-12-07 13:00:05 +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
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
Oleg Korshul c8176c94dc zoom only for chrome 2016-12-02 14:06:27 +03:00
Alexander Yuzhin e868764f93 Merge branch 'develop' into feature/new-mobile 2016-12-02 13:44:01 +03:00
Alexander Yuzhin d6011c15c4 Merge commit 'b37e1127e80535459d08d81fff869936edda5016' into develop 2016-12-02 13:43:03 +03:00
Oleg Korshul b37e1127e8 zoom bug 2016-12-02 13:20:41 +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 1451d68d48 [mobile] Fixed display color palette on material style. 2016-12-01 14:14:23 +03:00
Julia Radzhabova e818ddf253 Fix Bug 33560, Fix Bug 33549 2016-12-01 12:59:02 +03:00
Alexander Yuzhin 193c1a3f04 Merge branch 'develop' into feature/new-mobile 2016-11-30 18:25:26 +03:00
Julia Radzhabova 7a12d8c390 [mobile] Bug with theme color component (when color contains only digits). 2016-11-30 15:44:46 +03:00
Oleg Korshul 12d6ef13ee detect browser zoom (chrome) 2016-11-29 13:13:58 +03:00
Alexander Yuzhin 6f6569d538 [mobile] Fixed display active item of DataView. 2016-11-28 12:59:47 +03:00
Alexander Yuzhin cb49944b8c [mobile] Remove old common. 2016-11-28 12:51:40 +03:00
Alexander Yuzhin bfe6d0e0a5 [mobile] Append license info. 2016-11-28 12:50:52 +03:00
Alexander Yuzhin 6b1cb68e16 [mobile] Fixed material display an active element ot the color palette. 2016-11-28 12:37:53 +03:00
Alexander Yuzhin 78741d0138 [mobile] Fixed display an active element ot the color palette. 2016-11-28 11:39:26 +03:00
Maxim Kadushkin c187296222 [embed] removed unnecessary symbol 2016-11-25 15:05:17 +03:00
Alexander Yuzhin 12415ccb91 [mobile] Fixed app logo. 2016-11-25 12:37:46 +03:00
Alexander Yuzhin 79cc7e59bd [mobile] Fixed display last elements in matereal style. 2016-11-25 11:37:02 +03:00
Alexander Yuzhin 4189255a21 Merge develop into new-mobile 2016-11-23 19:05:03 +03:00
Maxim Kadushkin 07cea7e5dc [common] removed 'amd' support for Gateway and Analytics 2016-11-23 18:51:43 +03:00
Maxim Kadushkin b3ceec763e [embed] fix bug 33454 2016-11-23 15:52:11 +03:00
Alexander Yuzhin 7dbe75f117 [mobile] Add format method for the String type. 2016-11-23 11:43:13 +03:00
Alexander Yuzhin d264753c6b [Common mobile] Add common about logo. 2016-11-22 13:28:31 +03:00
Maxim Kadushkin 493ec48743 [embed] fix bug 33454 2016-11-21 18:25:52 +03:00
Maxim Kadushkin 2461b1d7b6 [common] depends moved for LocalStorage 2016-11-21 16:31:26 +03:00
Julia Radzhabova ec4eb281f6 [SSE] Bug with border size in toolbar. 2016-11-21 13:51:30 +03:00
Maxim Kadushkin bfecf9d525 moved module dependencies 2016-11-21 12:59:00 +03:00
Alexander Yuzhin 9e9e738dbd [DE mobile] Localization EditText, ThemeColorPalette. 2016-11-21 12:58:57 +03:00
Julia Radzhabova bf398318a2 Fix Bug 33458.
Fix Bug 33476.
Fix Bug 33475.
2016-11-21 11:36:28 +03:00
Alexander Trofimov b49489d2dd Merge pull request #42 from ONLYOFFICE/feature/sparklines
Feature/sparklines
2016-11-18 18:40:18 +03:00
Maxim Kadushkin 72712b2145 Merge branch 'develop' 2016-11-18 17:53:09 +03:00
Maxim Kadushkin e5902b973e [embed] changes for autotests 2016-11-18 17:49:10 +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
Alexander Yuzhin df055f1fa5 [DE mobile] Fix search and replace on phone. 2016-11-16 14:03:06 +03:00
Alexander Yuzhin 8d4a878299 [DE mobile] Search and replace. 2016-11-16 13:44:42 +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
Alexander Yuzhin 0255f1b309 [DE mobile] Change css name of settings container. 2016-11-16 11:01:10 +03:00
Alexander Yuzhin 45593c0e26 [DE mobile] Less to modules 2016-11-15 15:32:11 +03:00
Maxim Kadushkin 5e45c1f9e5 Merge branch 'develop' into feature/newembed 2016-11-15 15:27:01 +03:00
Julia Radzhabova 970d1368aa [SSE] Bug 33374. 2016-11-13 12:42:27 +03:00
Maxim Kadushkin 2c93966dd2 [common] debug after merging 2016-11-11 17:56:16 +03:00
Maxim Kadushkin cde02d1526 merge branches [newembed] and [bootstrap-3.3.7] 2016-11-11 16:59:11 +03:00
Alexander Yuzhin 25e20d4877 [DE mobile] Update document editor mobile. 2016-11-11 16:24:21 +03:00
Maxim Kadushkin 8851957a4a [embed] debug for styles 2016-11-11 15:09:58 +03:00
Julia Radzhabova 994ee98c00 Merge branch 'develop' into feature/bootstrap-3.3.7 2016-11-11 12:16:32 +03:00
Julia Radzhabova 73b4eb87a4 Merge branch 'develop' into feature/sparklines 2016-11-10 17:21:48 +03:00
Maxim Kadushkin be54167b60 refactoring for css-embedded images 2016-11-10 14:57:07 +03:00
Julia Radzhabova 46ebd78757 [SSE] Fixed Bug 33367. 2016-11-10 11:01:30 +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 8933204f73 [DE] Optimizing less files. 2016-11-09 14:36:29 +03:00
Maxim Kadushkin 8e39d48c7e [Common embed] debug of styles 2016-11-08 15:24:23 +03:00
Maxim Kadushkin 88205825af [embed] repaired deployment 2016-11-08 15:22:15 +03:00
Maxim Kadushkin 15f2d9edb2 [Common embed] removed unused resources 2016-11-08 15:06:20 +03:00
Maxim Kadushkin a6a9b10fdb [Common embed] minimized svg resources 2016-11-08 15:04:08 +03:00
Julia Radzhabova bb67b12eb2 Fix Bug 32650. 2016-11-07 17:52:07 +03:00
Julia Radzhabova 08e61d9cd8 Fix Bug 24462. 2016-11-07 14:43:41 +03:00
Julia Radzhabova c17a005117 Fix Bug 29708. 2016-11-07 11:45:55 +03:00
Julia Radzhabova 860a8114ec Fix Bug 33354. 2016-11-07 11:45:15 +03:00
Maxim Kadushkin 5b23abc070 [common] refactoring 2016-11-03 18:23:49 +03:00
Maxim Kadushkin 960d5850d4 [PE embed] updated embed viewer 2016-11-03 18:22:26 +03:00
Julia Radzhabova d0636e8a06 [DE] Update styles for bootstrap-3.3.7 2016-11-03 13:41:44 +03:00
Julia Radzhabova 6b56aa8c4b Added bootstrap 3.3.7 2016-11-03 09:37:52 +03:00