Commit graph

1494 commits

Author SHA1 Message Date
Alexey Golubev 93b75a8fcf Merge branch 'develop' into hotfix/v4.3.2 2017-04-17 15:35:52 +03:00
Julia Radzhabova 0b445bb224 Debug with jquery 3.2.1. 2017-04-17 15:06:39 +03:00
Alexey Golubev 8c3b46382a Merge branch 'hotfix/v4.3.2' 2017-04-17 15:00:21 +03:00
Julia Radzhabova 94134156b4 Merge branch 'feature/jquery-3.2.1' into develop 2017-04-17 11:31:32 +03:00
Julia Radzhabova 5230fd796a Fix Bug 34772. 2017-04-17 11:18:48 +03:00
Julia Radzhabova 25b65c5e63 [DE] Added Kazakh lang. 2017-04-17 09:55:45 +03:00
Julia Radzhabova 4a5e5bdb0f [Embedded] Migrate to jquery 3.2.1 2017-04-14 16:33:49 +03:00
Julia Radzhabova 0af709b923 [DE][PE][SSE] Mirgate to jquery 3.2.1 2017-04-14 16:30:16 +03:00
Julia Radzhabova 82f87770b0 Update jquery to 3.2.1 2017-04-14 16:27:53 +03:00
Julia Radzhabova 471a68b56b [PE + PE mobile] Download as ODP. 2017-04-13 17:26:32 +03:00
Julia Radzhabova 1b62ce408f Merge pull request #69 from ONLYOFFICE/feature/underscore-1.8.3
Feature/underscore 1.8.3
2017-04-13 16:31:22 +03:00
Julia Radzhabova 582f0a8b3e [SSE + SSE mobile] Update for underscore 1.8.3. 2017-04-13 15:45:16 +03:00
Julia Radzhabova fd17009203 [PE + PE mobile] Update for underscore 1.8.3. 2017-04-13 15:07:15 +03:00
Julia Radzhabova df96594911 [DE + DE mobile] Update for underscore 1.8.3. 2017-04-13 15:04:31 +03:00
Julia Radzhabova bd053831c8 [Common] Update for underscore 1.8.3. 2017-04-13 15:02:04 +03:00
Julia Radzhabova 6b1a247ef1 Update underscore to v.1.8.3 2017-04-13 14:37:20 +03:00
Julia Radzhabova cbcee82ff0 Update to jszip v3.1.3 2017-04-13 11:18:16 +03:00
Julia Radzhabova a79bfcabc5 [Mobile] New licence type SuccessLimit. 2017-04-13 10:16:59 +03:00
Julia Radzhabova cfa585bd7e Delete unused jsrsasign. 2017-04-12 17:03:21 +03:00
SergeyLuzyanin 4f1f551796 Notes 2017-04-12 11:14:36 +03:00
Julia Radzhabova b23cbb32af [DE] Bugs with document without styles: update from style, create new style, delete all styles. 2017-04-11 12:40:53 +03:00
Julia Radzhabova 65ccd92597 Fix Bug 34708. 2017-04-07 12:38:58 +03:00
Julia Radzhabova 6f0a3c33e5 Merge branch 'develop' into feature/special_paste_word 2017-04-07 10:39:29 +03:00
Julia Radzhabova b7f3904426 [SSE] Bug 32608. 2017-04-06 16:15:33 +03:00
Alexander Yuzhin b4a34cb546 [SE mobile] Fix load formula names 2017-04-06 12:58:44 +03:00
Julia Radzhabova c50acf7af1 Merge pull request #68 from ONLYOFFICE/feature/gradient-slider-change-markers
Feature/gradient slider change markers
Fix Bug 34376
2017-04-06 11:59:24 +03:00
Julia Radzhabova 4bf47a6e36 Merge pull request #67 from ONLYOFFICE/feature/update-translations-4.3
Feature/update translations 4.3
2017-04-06 11:38:11 +03:00
Alexander Trofimov 4d842c19d8 Merge pull request #66 from ShockwaveNN/develop
Add support of travis build
2017-04-06 11:33:09 +03:00
Pavel Lobashov f9f0d9f627
Add support of travis build 2017-04-06 10:11:47 +03:00
Julia Radzhabova 2c441b6fec Update translations + [DE] Fix Bug 34430. 2017-04-06 10:08:00 +03:00
Julia Radzhabova 7d4c2adb5e [DE][PE] Prevent browser event, when press Ctrl+S on dialog header. 2017-04-06 09:55:47 +03:00
Julia Radzhabova 16477c3927 [SSE] Added id-ID Indonesian (Bahasa Indonesia). 2017-04-06 09:47:47 +03:00
Julia Radzhabova b6a339c854 Fix Bug 34681. 2017-04-06 09:46:13 +03:00
Oleg Korshul 914a4e17dc add file character.js 2017-04-05 16:27:57 +03:00
Ilya Kirillov 311340c7c8 Updated list of scripts. 2017-04-05 15:50:29 +03:00
Julia Radzhabova 866ef756e8 [SSE] Fix Bug 33478. 2017-04-05 12:55:46 +03:00
Julia Radzhabova e487291617 Update helps. 2017-04-04 13:54:42 +03:00
Julia Radzhabova bc276dc809 Update translations. 2017-04-04 13:05:02 +03:00
Alexey Golubev 58b7bd5136 Merge tag 'v4.3.0' into develop
v4.3.0
2017-04-03 13:00:43 +03:00
Alexey Golubev 4faf90cbf7 Merge branch 'release/v4.3.0' 2017-04-03 13:00:31 +03:00
Julia Radzhabova 188bd2cde3 Merge remote-tracking branch 'origin/develop' into develop 2017-04-03 10:37:54 +03:00
Julia Radzhabova 88a336631d [SSE] Fix Bug 34640. 2017-04-03 10:35:24 +03:00
Alexander Yuzhin 538b7ff031 [mobile] Fix bug 33939 2017-04-03 10:33:25 +03:00
Julia Radzhabova 40a1ccca21 [PE mobile] Fix bug with layout name. 2017-03-31 18:44:19 +03:00
Julia Radzhabova f07f5d1f03 [DE] Enable mail merge for desktop application. 2017-03-31 13:56:45 +03:00
Alexander Yuzhin 85cbad20e1 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2017-03-29 17:35:42 +03:00
Julia Radzhabova 7225e7db71 Fix Bug 34590. 2017-03-29 14:38:44 +03:00
Julia Radzhabova d7baf269f5 [DE][PE] Fix Bug 29356, fix Bug 33671. 2017-03-29 14:22:12 +03:00
Julia Radzhabova fe3a83fd0f [PE] Strict co-editing: lock themes control when other users changed theme. 2017-03-29 13:13:58 +03:00
Alexander Yuzhin 2210d315fc [SE mobile] Fix load formula description 2017-03-29 12:40:40 +03:00