Maxim Kadushkin
|
bd916d4d9b
|
Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
# Conflicts:
# apps/spreadsheeteditor/mobile/app-dev.js
# apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
# apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
|
2016-12-12 12:37:12 +03:00 |
|
|
Maxim Kadushkin
|
67e3aa2e35
|
[SSE mobile] debug CellEditor opening
|
2016-12-12 12:06:45 +03:00 |
|
|
Maxim Kadushkin
|
ca8751175f
|
[SSE mobile] added menu "Insert Other"
|
2016-12-12 12:05:41 +03:00 |
|
|
Maxim Kadushkin
|
8055bc958b
|
[SSE mobile] added menu "Insert Shape"
|
2016-12-12 12:02:51 +03:00 |
|
Alexander Yuzhin
|
76e30403ef
|
[SE ios] Add icons for Cell settings
|
2016-12-09 18:43:35 +03:00 |
|
|
Alexander Yuzhin
|
82294ade48
|
[SE ios] Cell settings
|
2016-12-09 15:44:26 +03:00 |
|
Oleg Korshul
|
dc5f3f8315
|
scripts
|
2016-12-09 13:08:05 +03:00 |
|
|
Alexander Yuzhin
|
677af5ae2d
|
Merge branches 'feature/new-mobile' and 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
|
2016-12-09 11:50:53 +03:00 |
|
|
Alexander Yuzhin
|
346573087c
|
[SE ios] Cell settings
|
2016-12-09 11:50:32 +03:00 |
|
Julia Radzhabova
|
0421a689d8
|
Merge remote-tracking branch 'origin/feature/new-mobile' into feature/new-mobile
|
2016-12-08 17:45:12 +03:00 |
|
|
Julia Radzhabova
|
dd6db343e9
|
[PE mobile] Editing slide settings.
|
2016-12-08 17:41:46 +03:00 |
|
|
Alexander Yuzhin
|
c4d4d9e5c9
|
[DE PE ios] Update style of editor_sdk.
|
2016-12-08 17:12:45 +03:00 |
|
|
Alexander Yuzhin
|
32442a17e7
|
Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
# Conflicts:
# apps/presentationeditor/mobile/resources/css/app-ios.css
|
2016-12-07 16:09:06 +03:00 |
|
|
Alexander Yuzhin
|
3a057c936e
|
[SE mobile] Add EditCell layout.
|
2016-12-07 16:05:50 +03:00 |
|
|
Julia Radzhabova
|
409121c262
|
[PE mobile] Add slides.
|
2016-12-07 15:15:15 +03:00 |
|
|
Maxim Kadushkin
|
35ed40ce15
|
Merge branch 'feature/new-mobile'
|
2016-12-07 14:35:41 +03:00 |
|
|
Maxim Kadushkin
|
ef6285f32b
|
[SSE mobile] debug toolbar hidding on android
|
2016-12-07 14:35:24 +03:00 |
|
|
Maxim Kadushkin
|
8164e2c89e
|
[SSE mobile] debug CellEditor for android, added animation on collapse/expand event
|
2016-12-07 14:29:38 +03:00 |
|
|
Julia Radzhabova
|
f03c42e1ca
|
Merge branch 'develop' into feature/new-mobile
|
2016-12-07 13:57:28 +03:00 |
|
|
Julia Radzhabova
|
bad28bbe33
|
Remove zoom correction on mobile devices.
|
2016-12-07 13:54:26 +03:00 |
|
Alexey Golubev
|
dd7ecf814f
|
Merge pull request #47 from ShockwaveNN/patch-1
Update about.js for 4.3
|
2016-12-07 13:02:09 +03:00 |
|
Pavel Lobashov
|
747d24cbd7
|
update about.js for 4.3
|
2016-12-07 13:00:05 +03:00 |
|
|
Julia Radzhabova
|
9c65d45fb6
|
[PE mobile] Edit hyperlinks.
|
2016-12-06 17:38:35 +03:00 |
|
|
Alexey Golubev
|
3cc828e09c
|
Merge tag 'v4.2.1' into develop
v4.2.1
|
2016-12-06 14:56:35 +03:00 |
|
|
Alexey Golubev
|
24ce4d9b3a
|
Merge branch 'hotfix/v4.2.1'
|
2016-12-06 14:56:23 +03:00 |
|
|
Oleg Korshul
|
9be7b6ef28
|
refactoring mobile (web)
|
2016-12-06 14:34:14 +03:00 |
|
|
Oleg Korshul
|
6f83abb8ee
|
refactoring mobile (web)
|
2016-12-06 14:32:37 +03:00 |
|
|
Alexander Yuzhin
|
848e27bbe2
|
[SE mobile] Add EditContainer.
|
2016-12-06 12:25:21 +03:00 |
|
|
Alexander Yuzhin
|
3a1e43e55a
|
[SE mobile] Add AddContainer.
|
2016-12-06 11:51:22 +03:00 |
|
|
Julia Radzhabova
|
f382936baf
|
[PE mobile] Insert links.
|
2016-12-06 10:30:33 +03:00 |
|
|
Maxim Kadushkin
|
cc4addb2ff
|
[SSE mobile] 'search' opened under expanded 'celleditor'
|
2016-12-05 19:44:34 +03:00 |
|
|
Alexander Yuzhin
|
93350b3c5d
|
Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile
|
2016-12-05 18:26:30 +03:00 |
|
|
Alexander Yuzhin
|
b2aea5eb2a
|
[SE mobile] Add Search.
|
2016-12-05 18:25:58 +03:00 |
|
|
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 |
|
|
Maxim Kadushkin
|
42e31d1811
|
[SSE mobile] added settings
|
2016-12-05 16:22:52 +03:00 |
|
|
Alexander Yuzhin
|
ef694c4cc5
|
[DE mobile] Replace ‘Line Break’ on ‘Column Break’
|
2016-12-05 14:12:35 +03:00 |
|
|
Alexey Golubev
|
f58a06c621
|
Merge pull request #45 from ONLYOFFICE/release/v4.2.0
[SSE] Fix Bug 33598.
|
2016-12-05 12:20:34 +03:00 |
|
|
Alexey Golubev
|
04872f2381
|
Merge pull request #44 from ONLYOFFICE/release/v4.2.0
[SSE] Fix Bug 33598.
|
2016-12-05 12:19:19 +03:00 |
|
|
Julia Radzhabova
|
48d244a513
|
[SSE] Fix Bug 33598.
|
2016-12-05 11:47:45 +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 |
|
|
Alexey Golubev
|
5b71bd2f0e
|
Merge branch 'release/v4.2.0'
|
2016-12-05 11:40:19 +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 |
|
|
Alexey Golubev
|
047a8ce750
|
Removed version number
|
2016-12-02 18:53:18 +03:00 |
|
|
Maxim Kadushkin
|
f12413af21
|
[SSE mobile] implemented search and undo/redo
|
2016-12-02 18:08:45 +03:00 |
|
|
Maxim Kadushkin
|
5b894fc0e4
|
[SSE mobile] updated styles for tabs bar. implemented 'add worksheet'
|
2016-12-02 15:41:16 +03:00 |
|
|
Oleg Korshul
|
c8176c94dc
|
zoom only for chrome
|
2016-12-02 14:06:27 +03:00 |
|
|
Alexander Yuzhin
|
e868764f93
|
Merge branch 'develop' into feature/new-mobile
|
2016-12-02 13:44:01 +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 |
|