Maxim Kadushkin
|
75667dc229
|
Merge branch 'feature/mobile-apps-on-reactjs' into develop
# Conflicts:
# apps/api/documents/api.js
# apps/common/main/lib/util/utils.js
# apps/documenteditor/mobile/app/controller/DocumentHolder.js
# apps/documenteditor/mobile/app/controller/Main.js
# apps/documenteditor/mobile/app/controller/Search.js
# apps/documenteditor/mobile/app/controller/Settings.js
# apps/documenteditor/mobile/app/controller/Toolbar.js
# apps/documenteditor/mobile/app/controller/add/AddImage.js
# apps/documenteditor/mobile/app/controller/add/AddOther.js
# apps/documenteditor/mobile/app/controller/add/AddTable.js
# apps/documenteditor/mobile/app/controller/edit/EditChart.js
# apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
# apps/documenteditor/mobile/app/controller/edit/EditImage.js
# apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
# apps/documenteditor/mobile/app/controller/edit/EditShape.js
# apps/documenteditor/mobile/app/controller/edit/EditTable.js
# apps/documenteditor/mobile/app/controller/edit/EditText.js
# apps/documenteditor/mobile/app/template/EditTable.template
# apps/documenteditor/mobile/app/template/EditText.template
# apps/documenteditor/mobile/app/template/Settings.template
# apps/documenteditor/mobile/app/view/Settings.js
# apps/documenteditor/mobile/app/view/add/AddOther.js
# apps/documenteditor/mobile/app/view/edit/EditTable.js
# apps/documenteditor/mobile/index.html
# apps/documenteditor/mobile/index.html.deploy
# apps/documenteditor/mobile/index_loader.html
# apps/documenteditor/mobile/locale/en.json
# apps/documenteditor/mobile/locale/ru.json
# apps/documenteditor/mobile/resources/css/app-ios.css
# apps/documenteditor/mobile/resources/css/app-material.css
# apps/presentationeditor/main/app/view/SlideSettings.js
# apps/presentationeditor/mobile/app-dev.js
# apps/presentationeditor/mobile/app.js
# apps/presentationeditor/mobile/app/controller/DocumentHolder.js
# apps/presentationeditor/mobile/app/controller/Main.js
# apps/presentationeditor/mobile/app/controller/Search.js
# apps/presentationeditor/mobile/app/controller/Settings.js
# apps/presentationeditor/mobile/app/controller/Toolbar.js
# apps/presentationeditor/mobile/app/controller/add/AddImage.js
# apps/presentationeditor/mobile/app/controller/add/AddLink.js
# apps/presentationeditor/mobile/app/controller/add/AddTable.js
# apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
# apps/presentationeditor/mobile/app/controller/edit/EditImage.js
# apps/presentationeditor/mobile/app/controller/edit/EditLink.js
# apps/presentationeditor/mobile/app/controller/edit/EditShape.js
# apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
# apps/presentationeditor/mobile/app/controller/edit/EditTable.js
# apps/presentationeditor/mobile/app/controller/edit/EditText.js
# apps/presentationeditor/mobile/app/template/EditSlide.template
# apps/presentationeditor/mobile/app/template/EditTable.template
# apps/presentationeditor/mobile/app/template/EditText.template
# apps/presentationeditor/mobile/app/view/Settings.js
# apps/presentationeditor/mobile/app/view/add/AddOther.js
# apps/presentationeditor/mobile/app/view/add/AddSlide.js
# apps/presentationeditor/mobile/app/view/edit/EditSlide.js
# apps/presentationeditor/mobile/app/view/edit/EditTable.js
# apps/presentationeditor/mobile/index.html
# apps/presentationeditor/mobile/index.html.deploy
# apps/presentationeditor/mobile/index_loader.html
# apps/presentationeditor/mobile/locale/cs.json
# apps/presentationeditor/mobile/locale/de.json
# apps/presentationeditor/mobile/locale/en.json
# apps/presentationeditor/mobile/locale/es.json
# apps/presentationeditor/mobile/locale/fr.json
# apps/presentationeditor/mobile/locale/hu.json
# apps/presentationeditor/mobile/locale/it.json
# apps/presentationeditor/mobile/locale/ko.json
# apps/presentationeditor/mobile/locale/nl.json
# apps/presentationeditor/mobile/locale/pl.json
# apps/presentationeditor/mobile/locale/pt.json
# apps/presentationeditor/mobile/locale/ru.json
# apps/presentationeditor/mobile/locale/sk.json
# apps/presentationeditor/mobile/locale/zh.json
# apps/presentationeditor/mobile/resources/css/app-ios.css
# apps/presentationeditor/mobile/resources/css/app-material.css
# apps/presentationeditor/mobile/resources/less/app-ios.less
# apps/presentationeditor/mobile/resources/less/app-material.less
# apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
# apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
# apps/spreadsheeteditor/mobile/app/controller/Main.js
# apps/spreadsheeteditor/mobile/app/controller/Search.js
# apps/spreadsheeteditor/mobile/app/controller/Settings.js
# apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
# apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
# apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
# apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
# apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
# apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
# apps/spreadsheeteditor/mobile/app/template/EditCell.template
# apps/spreadsheeteditor/mobile/app/template/EditImage.template
# apps/spreadsheeteditor/mobile/app/template/EditText.template
# apps/spreadsheeteditor/mobile/app/template/Settings.template
# apps/spreadsheeteditor/mobile/app/view/Settings.js
# apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
# apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
# apps/spreadsheeteditor/mobile/app/view/edit/EditText.js
# apps/spreadsheeteditor/mobile/index.html
# apps/spreadsheeteditor/mobile/index.html.deploy
# apps/spreadsheeteditor/mobile/index_loader.html
# apps/spreadsheeteditor/mobile/locale/en.json
# apps/spreadsheeteditor/mobile/resources/css/app-ios.css
# apps/spreadsheeteditor/mobile/resources/css/app-material.css
# apps/spreadsheeteditor/mobile/resources/less/app-material.less
# apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
# apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
# apps/spreadsheeteditor/mobile/resources/less/statusbar.less
# build/package.json
|
2021-04-30 19:29:10 +03:00 |
|
JuliaSvinareva
|
61998a2c04
|
[mobile] Add hide navbar when sheet-modal is opened
|
2021-04-30 16:29:41 +03:00 |
|
SergeyEzhin
|
45b0cb2bac
|
[common] Edits toolbar and corrected searchbar
|
2021-04-30 01:18:03 +03:00 |
|
|
SergeyEzhin
|
4f6251fcbc
|
Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits
|
2021-04-28 17:17:35 +03:00 |
|
|
SergeyEzhin
|
79cc895ea7
|
[DE PE mobile] Correct text settings and styles
|
2021-04-28 16:35:35 +03:00 |
|
|
JuliaSvinareva
|
cc80c72411
|
[mobile] Fix icons
|
2021-04-28 12:33:15 +03:00 |
|
|
SergeyEzhin
|
141cd15ab6
|
[DE PE SSE mobile] Moved icon-collaboration
|
2021-04-28 12:19:09 +03:00 |
|
|
JuliaSvinareva
|
160b2baf7f
|
[mobile] Fix edit comments for tablet
|
2021-04-27 15:28:25 +03:00 |
|
|
SergeyEzhin
|
7dc0aee800
|
[SSE mobile] Bug 48029
|
2021-04-23 16:33:12 +03:00 |
|
|
SergeyEzhin
|
a490e8e239
|
[PE mobile] Bug 46990
|
2021-04-22 17:45:16 +03:00 |
|
|
SergeyEzhin
|
4c7138a74f
|
[common] Bug 47888
|
2021-04-20 18:34:21 +03:00 |
|
|
JuliaSvinareva
|
92520c0e13
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs
|
2021-04-15 13:26:46 +03:00 |
|
|
JuliaSvinareva
|
0277ac9306
|
[PE mobile] Add toolbar, add logo
|
2021-04-15 12:42:44 +03:00 |
|
|
JuliaSvinareva
|
87fb7fe1bd
|
[DE mobile] Add check to show logo in navbar
|
2021-04-14 20:27:33 +03:00 |
|
|
SergeyEzhin
|
5d68405408
|
[DE SSE mobile] Bug 48776
|
2021-04-02 16:16:23 +03:00 |
|
|
JuliaSvinareva
|
de241c88a6
|
[mobile] Fix page offset
|
2021-04-01 23:25:09 +03:00 |
|
|
SergeyEzhin
|
0bbd65fadd
|
[PE mobile] Bug 47909, Bug 48110
|
2021-04-01 18:50:48 +03:00 |
|
|
JuliaSvinareva
|
ccaf637c6a
|
[DE mobile] Fix open searchbar, add logo in navbar
|
2021-03-31 22:23:53 +03:00 |
|
|
JuliaSvinareva
|
d64eae031a
|
[DE mobile] Make toolbar controller
|
2021-03-30 23:11:49 +03:00 |
|
|
JuliaSvinareva
|
8d2f89b62e
|
Merge branch 'feature/mobile-apps-on-reactjs-statusbar' into feature/mobile-apps-on-reactjs
|
2021-03-29 14:49:40 +03:00 |
|
|
JuliaSvinareva
|
f9f53e6dfc
|
Merge branch 'feature/mobile-apps-on-reactjs-about' into feature/mobile-apps-on-reactjs
|
2021-03-29 13:38:22 +03:00 |
|
|
SergeyEzhin
|
705509e340
|
[SSE mobile] Add styles, corrected unhide and hiding
|
2021-03-25 23:34:22 +03:00 |
|
|
JuliaSvinareva
|
4b0ec3e352
|
[PE mobile] Add context menu
|
2021-03-23 14:05:45 +03:00 |
|
|
JuliaSvinareva
|
eda4736916
|
[mobile] Show foreign cursor label, enable collaboration fast mode
|
2021-03-19 19:11:57 +03:00 |
|
|
JuliaSvinareva
|
f33112be3a
|
[mobile] Fix icons
|
2021-03-19 13:53:33 +03:00 |
|
|
JuliaSvinareva
|
4687d2b127
|
[DE mobile] Add review, review change handler in context menu
|
2021-03-17 21:57:52 +03:00 |
|
|
SergeyEzhin
|
573d1c49c5
|
[mobile] Added About
|
2021-03-17 18:44:35 +03:00 |
|
|
JuliaSvinareva
|
c5ef8766d6
|
[DE mobile] Add cut, copy, paste handler in context menu
|
2021-03-17 11:46:57 +03:00 |
|
|
JuliaSvinareva
|
fd561f3687
|
Merge branch 'feature/mobile-apps-on-reactjs-se-edit-settings' into feature/mobile-apps-on-reactjs
|
2021-03-16 20:49:55 +03:00 |
|
|
JuliaSvinareva
|
586dbd5449
|
Merge branch 'feature/mobile-apps-on-reactjs-de' into feature/mobile-apps-on-reactjs
|
2021-03-16 19:42:45 +03:00 |
|
JuliaSvinareva
|
b4bd17d0bc
|
[mobile] Add actions for more items in context menu
|
2021-03-16 16:27:47 +03:00 |
|
|
JuliaSvinareva
|
299db5fcb6
|
[mobile] Make view current comments (fix on tablet, add reply, prev and next comment, add styles)
|
2021-03-11 23:38:53 +03:00 |
|
|
SergeyEzhin
|
99fc32bf99
|
[SSE mobile] Added Find and Replace
|
2021-03-11 20:21:55 +03:00 |
|
|
JuliaSvinareva
|
f5d48e6492
|
[mobile] Make view current comments, fixed change comment
|
2021-03-10 21:08:59 +03:00 |
|
|
Maxim Kadushkin
|
d3163b0be0
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de
# Conflicts:
# apps/common/mobile/resources/less/ios/icons.less
# apps/common/mobile/resources/less/material/icons.less
|
2021-03-10 10:41:56 +03:00 |
|
|
SergeyEzhin
|
e0258fa0b7
|
[DE mobile] Corrected Find and Replace
|
2021-03-09 22:42:29 +03:00 |
|
|
JuliaSvinareva
|
c9e5a41954
|
[mobile] Fixed swipe animation of view current comment
|
2021-03-09 19:29:06 +03:00 |
|
|
JuliaSvinareva
|
48c50b145b
|
[mobile] Make comment view from context menu
|
2021-03-08 21:30:42 +03:00 |
|
|
SergeyEzhin
|
e866cec627
|
[DE mobile] Small edits of styles
|
2021-03-05 23:11:07 +03:00 |
|
|
SergeyEzhin
|
f067ea4622
|
[DE mobile] Make Find and Replace for ios and android
|
2021-03-05 20:53:37 +03:00 |
|
|
JuliaSvinareva
|
7cf42452ae
|
[mobile] Add styles of comments for android
|
2021-03-04 20:25:50 +03:00 |
|
|
SergeyEzhin
|
d3dfbb3771
|
[DE mobile] Deleted flex-wrap from Searchbar Inner
|
2021-03-04 14:07:11 +03:00 |
|
|
SergeyEzhin
|
f9ffaf6891
|
[DE mobile] Added Replace All and adding styles for phones
|
2021-03-03 22:52:16 +03:00 |
|
|
JuliaSvinareva
|
e8749b09d6
|
[mobile] Comments (edit reply)
|
2021-03-03 21:21:03 +03:00 |
|
|
JuliaSvinareva
|
8410b269c4
|
[mobile] Comments (edit comment, add reply)
|
2021-03-03 19:49:36 +03:00 |
|
|
SergeyEzhin
|
4ed2a8a3c4
|
[SSE mobile] Added Spreadsheet About
|
2021-03-01 21:11:29 +03:00 |
|
|
JuliaSvinareva
|
37cce9d295
|
[mobile] Comments (add actions: resolve/reopen, delete comment; check canViewComments to display list of comments; change styles)
|
2021-02-28 20:47:47 +03:00 |
|
|
SergeyEzhin
|
9d1ccf2f84
|
[SSE mobile] Added Regional Settings
|
2021-02-25 20:42:07 +03:00 |
|
|
JuliaSvinareva
|
c3dd451d7a
|
[mobile] Made receiving and displaying comments into collaboration
|
2021-02-25 19:26:42 +03:00 |
|
|
Maxim Kadushkin
|
1c45047df5
|
[SSE mobile] repaired cell editor
|
2021-02-20 00:05:06 +03:00 |
|
|
Maxim Kadushkin
|
2942114c82
|
[SSE mobile]
|
2021-02-20 00:04:12 +03:00 |
|
|
JuliaSvinareva
|
c446eb4db4
|
[mobile][de] Add insert comment
|
2021-02-18 18:40:54 +03:00 |
|
|
SergeyEzhin
|
37248d0c0e
|
[SSE mobile] Corrected styles, Chart Settings and added Link Settings
|
2021-02-17 20:53:17 +03:00 |
|
|
SergeyEzhin
|
1cb18ade25
|
[SSE mobile] Corrected Text Settings and Chart Settings
|
2021-02-17 14:28:02 +03:00 |
|
|
SergeyEzhin
|
cc5e415edd
|
[SSE mobile] Added Chart Settings
|
2021-02-15 23:51:33 +03:00 |
|
|
JuliaSvinareva
|
4e8be323a8
|
[DE mobile] Add review settings
|
2021-02-12 20:33:38 +03:00 |
|
|
Maxim Kadushkin
|
89d297ea9c
|
[DE mobile] context menu moved to common
|
2021-02-10 00:01:42 +03:00 |
|
|
Maxim Kadushkin
|
1c3e77c22b
|
[stylesheets mobile] refactoring for icons
|
2021-02-09 23:59:49 +03:00 |
|
|
SergeyEzhin
|
ef0449b49b
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-se-edit-settings
|
2021-02-08 16:53:15 +03:00 |
|
|
JuliaSvinareva
|
683a9722e5
|
[SSE mobile] Added the ability insert links
|
2021-02-07 18:12:18 +03:00 |
|
|
Maxim Kadushkin
|
368c773d16
|
[DE mobile] start to implement context menu
|
2021-02-05 11:38:53 +03:00 |
|
|
SergeyEzhin
|
507ce63a98
|
[SSE mobile] Make Cell Settings
|
2021-02-04 21:00:21 +03:00 |
|
|
JuliaSvinareva
|
1a0a47a4a6
|
[SSE mobile] Add insert of functions (insert functions from groups, page info)
|
2021-02-03 19:44:11 +03:00 |
|
|
JuliaSvinareva
|
9d743bd814
|
[DE PE mobile] Hide styles for combined charts
|
2021-02-01 20:34:07 +03:00 |
|
|
JuliaSvinareva
|
82f29b99de
|
[SSE mobile] Added the ability to insert chart
|
2021-01-31 01:19:20 +03:00 |
|
|
JuliaSvinareva
|
6998771d0c
|
[PE mobile] Added the ability insert links
|
2021-01-29 00:30:33 +03:00 |
|
|
Maxim Kadushkin
|
711cea9e3e
|
[common] Searchbar moved to common
|
2021-01-28 13:27:18 +03:00 |
|
|
Maxim Kadushkin
|
962468fb83
|
[SSE mobile] added common stylesheets file
|
2021-01-27 16:38:13 +03:00 |
|
|
Maxim Kadushkin
|
defbbe6e94
|
[common] changed popover stylesheet
|
2021-01-27 16:37:00 +03:00 |
|
|
JuliaSvinareva
|
89eff1f6b8
|
[PE mobile] Added the ability to insert tables
|
2021-01-26 20:09:40 +03:00 |
|
|
JuliaSvinareva
|
3e6e71966e
|
[PE mobile] Added the ability to insert slides
|
2021-01-25 20:12:50 +03:00 |
|
|
JuliaSvinareva
|
955a6c7456
|
[PE mobile] Refactoring
|
2021-01-23 18:44:40 +03:00 |
|
|
JuliaSvinareva
|
7a867312a4
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-pe-edit-settings
|
2021-01-23 18:34:15 +03:00 |
|
|
Maxim Kadushkin
|
ba1cff609d
|
[DE mobile] extended Search view
|
2021-01-23 00:20:31 +03:00 |
|
|
JuliaSvinareva
|
e8f2c61f83
|
[DE mobile] Added the ability to add shapes
|
2021-01-20 20:59:19 +03:00 |
|
|
JuliaSvinareva
|
f3c4af7914
|
Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs
|
2021-01-20 19:24:51 +03:00 |
|
|
JuliaSvinareva
|
8a8e51abb6
|
[DE mobile] Added the ability to add tables
|
2021-01-20 19:23:49 +03:00 |
|
|
Maxim Kadushkin
|
ffcdc93055
|
[DE mobile] added searchbar
|
2021-01-20 19:19:30 +03:00 |
|
|
JuliaSvinareva
|
e9dffd3a22
|
[DE mobile] Fix styles
|
2021-01-20 19:00:16 +03:00 |
|
|
SergeyEzhin
|
032c1d9dda
|
[PE mobile] Fixed EditSlide and styles
|
2021-01-20 17:30:52 +03:00 |
|
|
SergeyEzhin
|
4b0b0478ad
|
[PE mobile] Maked Text Settings
|
2021-01-19 20:34:11 +03:00 |
|
|
SergeyEzhin
|
79da854961
|
[PE mobile] Make Text Settings
|
2021-01-18 21:03:39 +03:00 |
|
|
JuliaSvinareva
|
157fde006d
|
[DE mobile] Added style settings for chart object
|
2021-01-18 20:41:29 +03:00 |
|
|
JuliaSvinareva
|
3dad63735f
|
Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' into feature/mobile-apps-on-reactjs
|
2021-01-18 11:56:59 +03:00 |
|
|
JuliaSvinareva
|
070f1988ac
|
[common mobile] Added dataview styles
|
2021-01-17 19:31:49 +03:00 |
|
|
JuliaSvinareva
|
a7b2440afa
|
[DE mobile] Added table style settings
|
2021-01-17 19:30:57 +03:00 |
|
|
SergeyEzhin
|
26a4e263cb
|
[PE mobile] Refactoring Slide Settings, added duplicates and remove slides
|
2021-01-15 19:04:19 +03:00 |
|
|
JuliaSvinareva
|
1511daaa00
|
[DE mobile] Fixed styles
|
2021-01-15 00:07:56 +03:00 |
|
|
Maxim Kadushkin
|
c1eaaff061
|
merge feature/mobile-apps-on-reactjs-pe-about into feature/mobile-apps-on-reactjs
|
2021-01-14 20:57:03 +03:00 |
|
|
JuliaSvinareva
|
0126f6636a
|
[common mobile] Added styles
|
2021-01-14 18:42:43 +03:00 |
|
|
SergeyEzhin
|
7da390d917
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-pe-edit-settings
|
2021-01-13 18:32:33 +03:00 |
|
|
JuliaSvinareva
|
e00ef7022e
|
[common mobile] Fixed styles
|
2021-01-12 20:19:54 +03:00 |
|
|
JuliaSvinareva
|
c2ef4ad5ff
|
[common mobile] Fixed color-preview styles for ios
|
2021-01-12 16:30:50 +03:00 |
|
|
SergeyEzhin
|
093fd8f5ed
|
Fixed styles before merge master
|
2021-01-12 13:45:31 +03:00 |
|
|
SergeyEzhin
|
4feecef046
|
[PE mobile] Maked Layout, Theme and Transition Settings
|
2021-01-11 17:29:59 +03:00 |
|
|
JuliaSvinareva
|
f7892ac068
|
[common mobile] Fixed styles for transparent color
|
2021-01-11 17:19:45 +03:00 |
|
|
SergeyEzhin
|
b7ed3bee64
|
[PE mobile] Continue make transition settings
|
2020-12-30 02:51:05 +03:00 |
|
|
JuliaSvinareva
|
d15e3ae6a9
|
[mobile] Fixed auto color in palette, fixed styles
|
2020-12-29 20:18:08 +03:00 |
|
|
JuliaSvinareva
|
25150e6f36
|
Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs
|
2020-12-28 23:13:34 +03:00 |
|
|
JuliaSvinareva
|
355d2535f4
|
[mobile common] Added custom color picker
|
2020-12-28 23:02:43 +03:00 |
|