Commit graph

689 commits

Author SHA1 Message Date
Julia Radzhabova 994ee98c00 Merge branch 'develop' into feature/bootstrap-3.3.7 2016-11-11 12:16:32 +03:00
Julia Radzhabova c8bcbf0feb [SSE] Fix Bug 33295. 2016-11-11 11:47:22 +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 3134a3f73c [DE] [PE] Change layout for chart settings in the right panel. 2016-11-10 12:37:28 +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 9fcf4dcb91 [SSE] Fix Bug 33365. 2016-11-10 10:19:17 +03:00
Julia Radzhabova 8933204f73 [DE] Optimizing less files. 2016-11-09 14:36:29 +03:00
Julia Radzhabova 22a5046f0a [SSE] Bug 33287. 2016-11-09 14:07:49 +03:00
Julia Radzhabova 5f82b1e5cd Update translations. 2016-11-08 11:53:01 +03:00
Julia Radzhabova bb67b12eb2 Fix Bug 32650. 2016-11-07 17:52:07 +03:00
Julia Radzhabova c1fcad76d0 [SSE] Bug 26981. 2016-11-07 16:00:11 +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
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 60afcdaff4 [SSE] Update styles for bootstrap-3.3.7. 2016-11-03 14:56:54 +03:00
Julia Radzhabova 267d6a2fa0 [PE] Update styles for bootstrap-3.3.7 2016-11-03 14:38:59 +03:00
Alexey Golubev 3ef127579c Merge tag 'v4.1.8' into develop
v4.1.8
2016-11-03 13:51:44 +03:00
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
Julia Radzhabova 541000f308 Change DocEditor version. 2016-11-02 13:24: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 a4a2ec003a Merge pull request #39 from ONLYOFFICE/feature/set-history-data
Feature/set history data
2016-10-31 16:32:40 +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 cf53fc04a1 [PE][SSE] Debug context menu for equations. 2016-10-26 16:20:51 +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 054319793f [PE] Added equations. 2016-10-25 13:48:31 +03:00