Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
809 commits 47 branches 5000 tags 623 MiB
Commit graph

225 commits

Author SHA1 Message Date
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 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
Julia Radzhabova e818ddf253 Fix Bug 33560, Fix Bug 33549 2016-12-01 12:59:02 +03:00
Oleg Korshul 12d6ef13ee detect browser zoom (chrome) 2016-11-29 13:13:58 +03:00
Maxim Kadushkin c187296222 [embed] removed unnecessary symbol 2016-11-25 15:05:17 +03:00
Maxim Kadushkin b3ceec763e [embed] fix bug 33454 2016-11-23 15:52:11 +03:00
Maxim Kadushkin 493ec48743 [embed] fix bug 33454 2016-11-21 18:25:52 +03:00
Julia Radzhabova ec4eb281f6 [SSE] Bug with border size in toolbar. 2016-11-21 13:51:30 +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
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
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
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 aa58b8afdb [common] added controller 'modals' to embed 2016-11-02 13:28:44 +03:00
Maxim Kadushkin c2d14e0ff7 [common] added utils.js to embed 2016-11-02 12:34:10 +03:00
Maxim Kadushkin 3c44af10e7 [DE embed] view changed: popovers => modals, action buttons => dropdown 2016-10-31 17:49:53 +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 6c7ea6afe2 [DE] Changed format for data in setHistoryData. 2016-10-28 16:19:03 +03:00