Commit graph

853 commits

Author SHA1 Message Date
Alexey Golubev 4655b91e42 Merge branch 'hotfix/v4.1.8' 2016-11-03 13:51:21 +03:00
Julia Radzhabova d0636e8a06 [DE] Update styles for bootstrap-3.3.7 2016-11-03 13:41:44 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova 6b56aa8c4b Added bootstrap 3.3.7 2016-11-03 09:37:52 +03:00
Julia Radzhabova 6804c4a2de [DE] Disable language button in the status bar until languages are loaded. 2016-11-02 16:40:35 +03:00
Julia Radzhabova 24ad7e79d7 [DE] Bug with versions history when serverVersion for revision != app.buildVersion. 2016-11-02 15:29:48 +03:00
Maxim Kadushkin bbb45c4766 [common] updated tootip for embed mode 2016-11-02 13:45:30 +03:00
Maxim Kadushkin 3d18b36c28 [SSE embed] updated spreadsheet edbed viewer 2016-11-02 13:44:35 +03:00
Maxim Kadushkin 9cd0dcb9d4 [DE embed] debug bottom placement of toolbar 2016-11-02 13:35:55 +03:00
Maxim Kadushkin 3c27c09322 [DE embed] refactoring 2016-11-02 13:32:43 +03:00
Maxim Kadushkin aa58b8afdb [common] added controller 'modals' to embed 2016-11-02 13:28:44 +03:00
Julia Radzhabova 541000f308 Change DocEditor version. 2016-11-02 13:24:16 +03:00
Maxim Kadushkin c2d14e0ff7 [common] added utils.js to embed 2016-11-02 12:34:10 +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
Maxim Kadushkin 3c44af10e7 [DE embed] view changed: popovers => modals, action buttons => dropdown 2016-10-31 17:49:53 +03:00
Maxim Kadushkin aec0a03ed2 added bootstrap 3.3.7 2016-10-31 16:48:42 +03:00
Maxim Kadushkin 4861d56317 removed bootstrap 3.0.3 2016-10-31 16:44:28 +03:00
Julia Radzhabova a4a2ec003a Merge pull request #39 from ONLYOFFICE/feature/set-history-data
Feature/set history data
2016-10-31 16:32:40 +03:00
Maxim Kadushkin 1ce369cd54 [DE] removed ZeroClipboard library 2016-10-31 16:16:56 +03:00
Maxim Kadushkin e50396f5ae [DE] refactoring 2016-10-31 15:59:10 +03:00
Julia Radzhabova 8b90eb4925 [DE] Changed format for data in setHistoryData (+ support for old format).
{
  version: '...',
  url: '...',
  key: '...',
  changesUrl: '...',
  previous: {
    url: '...',
    key: '...',
  }
}
2016-10-31 15:01:45 +03:00
Julia Radzhabova 0c251ec008 [DE] Delete unused field opts.data.urlDiff in SetHistoryData. 2016-10-28 17:40:53 +03:00
Julia Radzhabova 8b13150ddc [SSE] Update layout for new translations. 2016-10-28 17:38:46 +03:00
Julia Radzhabova a8dbadb2ae Update translations. 2016-10-28 16:52:51 +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 6c7ea6afe2 [DE] Changed format for data in setHistoryData. 2016-10-28 16:19:03 +03:00
Alexey Golubev d9ada27263 Merge tag 'v4.1.7' into develop
v4.1.7 v4.1.7
2016-10-28 15:35:23 +03:00
Alexey Golubev cd86b75952 Merge branch 'hotfix/v4.1.7' 2016-10-28 15:35:20 +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 218385d386 Fix bug with underscore _.each method in IE9. 2016-10-27 15:42:02 +03:00
Julia Radzhabova 67cdfb5592 Fix bug with underscore _.each method in IE9. 2016-10-27 14:39:54 +03:00
Julia Radzhabova 28bdc1b91a Update translations. 2016-10-27 13:38:24 +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 c40b96d685 Update translations. 2016-10-26 13:30:55 +03:00
Julia Radzhabova af438ff5f2 Update translations. 2016-10-25 16:46:21 +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
Alexey Golubev 4dd21ea516 Merge branch 'hotfix/v4.1.6' 2016-10-25 16:15:44 +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 0a853a9c0d [SSE] Added translations for equations. 2016-10-24 17:04:34 +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