Commits · 15bc2dfc68a3c575dbadd5c4e61d289fb20f206a · Boris Kocherov / sdkjs

12 Dec, 2016 1 commit
- error after merge · 15bc2dfc
  konovalovsergey authored Dec 12, 2016
  
  15bc2dfc
06 Dec, 2016 8 commits
- unlockRecal · 531487de
  konovalovsergey authored Dec 06, 2016
  
  531487de
- Merge branch 'develop' into formuladependence · 81438f83
  konovalovsergey authored Dec 06, 2016
  
  81438f83
- dataRange <-> locationRange · c59de594
  Alexander.Trofimov authored Dec 06, 2016
  
  c59de594
- fix bug 33606 🐛 · 7744bdf4
  Alexander.Trofimov authored Dec 06, 2016
  
  7744bdf4
- fix bug 33607 🐛 · 800e065e
  Alexander.Trofimov authored Dec 06, 2016
  
  800e065e
- fix bug 33608 🐛 · b90efd53
  Alexander.Trofimov authored Dec 06, 2016
  
  b90efd53
- delete check return value from _getVisibleCell function 💤 · c5828af2
  Alexander.Trofimov authored Dec 06, 2016
  
  c5828af2
- delete check return value from _getVisibleCell function · 86fa708a
  Alexander.Trofimov authored Dec 06, 2016
  
  86fa708a
05 Dec, 2016 23 commits
- fix bug 31395 · 73d6a7c0
  konovalovsergey authored Dec 05, 2016
  
  73d6a7c0
- . · 495bd233
  Oleg Korshul authored Dec 05, 2016
  
  495bd233
- Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop · c0079117
  Alexey.Musinov authored Dec 05, 2016
```
* 'develop' of https://github.com/ONLYOFFICE/sdkjs:
  fix Bug 33612
  fix bug 33604
  🐛 fix bug 33602
  check Refresh_RecalcData
  correcting plotArea rect in scatter charts
  font style with null properties
  Fixed bugs with last commit.
  fix set localization formulas
  bug 32901 change link type
  fix get union for sparklines
  Function asc_AddPageCount added to export.
  fix Bug 33284
  Function asc_AddPageCount added to export.
  fix bug 33605
```
  c0079117
- insert images in collaboration mode · dd7b7d6d
  Alexey.Musinov authored Dec 05, 2016
  
  dd7b7d6d
- Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop · 00d75ab6
  Sergey Luzyanin authored Dec 05, 2016
  
  00d75ab6
- fix Bug 33612 · a651ec39
  Sergey Luzyanin authored Dec 05, 2016
  
  a651ec39
- fix bug 33604 · 4e594b28
  GoshaZotov authored Dec 05, 2016
  
  4e594b28
- 🐛 fix bug 33602 · 95f71751
  Alexander.Trofimov authored Dec 05, 2016
  
  95f71751
- check Refresh_RecalcData · 4e508095
  Sergey Luzyanin authored Dec 05, 2016
  
  4e508095
- correcting plotArea rect in scatter charts · 18d8c8c2
  Sergey Luzyanin authored Dec 05, 2016
  
  18d8c8c2
- font style with null properties · e5260fb1
  konovalovsergey authored Dec 05, 2016
  
  e5260fb1
- Merge pull request #87 from ONLYOFFICE/hotfix/v4.2.1 · 982f177e
  Ilya Kirillov authored Dec 05, 2016
```
Hotfix/v4.2.1
```
  982f177e
- Fixed bugs with last commit. · ed86c2f5
  Ilya Kirillov authored Dec 05, 2016
  
  ed86c2f5
- fix set localization formulas · 740894a4
  Alexander.Trofimov authored Dec 05, 2016
  
  740894a4
- bug 32901 · cc2d359f
  Alexander.Trofimov authored Dec 05, 2016
```
change link type
```
  cc2d359f
- fix get union for sparklines · 82d99ea3
  Alexander.Trofimov authored Dec 05, 2016
  
  82d99ea3
- Function asc_AddPageCount added to export. · 61e9f75c
  Ilya Kirillov authored Dec 05, 2016
  
  61e9f75c
- fix Bug 33284 · 44e00a4d
  Sergey Luzyanin authored Dec 05, 2016
  
  44e00a4d
- Merge pull request #86 from ONLYOFFICE/release/v4.2.0 · 38bcaf4b
  Ilya Kirillov authored Dec 05, 2016
```
Function asc_AddPageCount added to export.
```
  38bcaf4b
- Function asc_AddPageCount added to export. · 2bba62ff
  Ilya Kirillov authored Dec 05, 2016
  
  2bba62ff
- Merge tag 'v4.2.0' into develop · bf1f9afe
  Alexey Golubev authored Dec 05, 2016
```
v4.2.0 v4.2.0
```
  bf1f9afe
- Merge branch 'release/v4.2.0' · 817962df
  Alexey Golubev authored Dec 05, 2016
  
  817962df
- fix bug 33605 · 39b58f17
  Alexander.Trofimov authored Dec 05, 2016
  
  39b58f17
04 Dec, 2016 4 commits
- Some changes for table wasn't reworked into a new scheme. Fixed. · 8f1d24a3
  Ilya Kirillov authored Dec 04, 2016
  
  8f1d24a3
- fix typo · 847db11b
  Sergey Luzyanin authored Dec 04, 2016
  
  847db11b
- Merge branch 'release/v4.2.0' into develop · 12a34893
  Ilya Kirillov authored Dec 04, 2016
```
# Conflicts:
#	word/Editor/History.js
```
  12a34893
- Fixed bug #33362 · 1d100eda
  Ilya Kirillov authored Dec 04, 2016
  
  1d100eda
02 Dec, 2016 4 commits
- Removed version number · d13e5285
  Alexey Golubev authored Dec 02, 2016
  
  d13e5285
- fix bug - pasted table with style from presentation into presentation · 2d172d06
  GoshaZotov authored Dec 02, 2016
  
  2d172d06
- draw sparkline ranges selection · c3064009
  Alexander.Trofimov authored Dec 02, 2016
  
  c3064009
- add getLocationRanges · 8d6f8196
  Alexander.Trofimov authored Dec 02, 2016
```
add union on range
```
  8d6f8196