JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
SergeyEzhin
|
acc1f43a9a
|
[common] Bug 47778
|
2021-05-07 17:34:02 +03:00 |
|
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
|
ccaf637c6a
|
[DE mobile] Fix open searchbar, add logo in navbar
|
2021-03-31 22:23:53 +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 |
|
|
SergeyEzhin
|
99fc32bf99
|
[SSE mobile] Added Find and Replace
|
2021-03-11 20:21:55 +03:00 |
|
|
SergeyEzhin
|
e0258fa0b7
|
[DE mobile] Corrected Find and Replace
|
2021-03-09 22:42: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 |
|
|
JuliaSvinareva
|
c446eb4db4
|
[mobile][de] Add insert comment
|
2021-02-18 18:40:54 +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 |
|
Julia Radzhabova
|
e69c7968ad
|
[DE mobile] Fix text auto color
|
2020-10-28 16:55:22 +03:00 |
|
|
JuliaSvinareva
|
a626ca471d
|
[mobile] Fix bug 45445
|
2020-05-26 22:28:35 +03:00 |
|
|
JuliaSvinareva
|
a9984c8eee
|
[DE mobile] Change review template
|
2020-05-13 18:59:42 +03:00 |
|
|
JuliaSvinareva
|
b944ddccfc
|
[mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft)
|
2020-05-07 19:28:58 +03:00 |
|
|
JuliaSvinareva
|
add8ec8621
|
[mobile] Fix comments
|
2020-05-06 15:46:12 +03:00 |
|
|
JuliaSvinareva
|
a3b347c911
|
[mobile] Сhanged tabs template into insert
|
2020-04-30 12:55:09 +03:00 |
|
|
JuliaSvinareva
|
43c5300cdc
|
[mobile] Comments (fix bugs)
|
2020-04-24 14:30:55 +03:00 |
|
|
JuliaSvinareva
|
5fa1b9dbb5
|
[mobile] Comments (refactoring, moved comment editing)
|
2020-04-21 18:36:06 +03:00 |
|
|
JuliaSvinareva
|
baf8ae6074
|
Merge branch 'develop' into feature/mobile-comments
|
2020-04-06 19:17:02 +03:00 |
|
|
JuliaSvinareva
|
cc4110dd5e
|
[DE mobile] Fix view/add/edit/delete comments
|
2020-04-03 21:01:26 +03:00 |
|
|
JuliaSvinareva
|
22604c0567
|
[de mobile] work with comments (fix styles)
|
2020-04-02 18:30:36 +03:00 |
|
|
JuliaSvinareva
|
218929dd3e
|
[DE mobile] add edit comments into collaboration section
|
2020-04-01 20:34:51 +03:00 |
|
|
JuliaSvinareva
|
2422fab071
|
[DE mobile] Add style of comments view for android
|
2020-03-31 20:14:05 +03:00 |
|
|
JuliaSvinareva
|
23f6028575
|
[de mobile] add comment move to add other
|
2020-03-30 19:52:13 +03:00 |
|
|
JuliaSvinareva
|
cc94f8bd3c
|
[de mobile] fix bug with overlay, add: edit comment, edit reply for iPad
|
2020-03-25 15:23:46 +03:00 |
|
|
Julia Svinareva
|
9621eab6b6
|
[de mobile] Add, view comment, add reply for iPad
|
2020-03-23 17:33:41 +03:00 |
|
|
Julia Svinareva
|
a98b2892bb
|
[de mobile] comments (add style for android)
|
2020-03-19 09:12:18 +03:00 |
|
|
Julia Svinareva
|
9670353c3b
|
[de mobile] edit comment, delete comment, prev comment, next comment, add reply, edit reply, delete reply, resolve comment (ios)
|
2020-03-15 18:59:42 +03:00 |
|
|
Julia Svinareva
|
9cc5e9ea4d
|
[de mobile] add comment, view comment
|
2020-03-05 14:20:04 +03:00 |
|
|
Julia Svinareva
|
af1d560430
|
Fix bug 43877 (add display of the current color scheme)
|
2019-12-24 16:58:06 +03:00 |
|
|
Julia Svinareva
|
163e0e26dc
|
[mobile] Custom color (add border, add translations)
|
2019-10-17 13:09:58 +03:00 |
|
|
Julia Svinareva
|
bf25a21455
|
[DE mobile] Custom Color
|
2019-10-07 17:42:36 +03:00 |
|
|
Julia Svinareva
|
3f97b8af79
|
[DE mobile] Custom Color (shape fill, border color)
|
2019-10-07 10:15:35 +03:00 |
|
|
Julia Svinareva
|
7b11701a7b
|
[Common mobile] Custom Color
|
2019-10-04 15:12:57 +03:00 |
|
|
Julia Svinareva
|
cf14768482
|
[Common mobile] Custom Color
|
2019-10-03 13:40:56 +03:00 |
|
|
Julia Svinareva
|
defd8e7edb
|
[Common mobile] Custom Color
|
2019-09-27 16:41:19 +03:00 |
|
|
Julia Svinareva
|
fc5d778134
|
[Common mobile] Add Comments into Collaboration
|
2019-07-18 11:08:26 +03:00 |
|
|
Julia Svinareva
|
b541c0ddbf
|
[SSE mobile] Fix bug 34113; Add Filter Options: Clear, Delete Filter, Selection Of Values
|
2019-06-19 09:48:37 +03:00 |
|
|
Julia Svinareva
|
783ec39e1a
|
[PE mobile] Add Collaboration, add Edit Users, fix less
|
2019-05-31 19:18:14 +03:00 |
|
|
Julia Svinareva
|
ff25393019
|
[DE mobile] Add icons for Collaboration
|
2019-05-31 16:28:17 +03:00 |
|
|
Julia Svinareva
|
0e341287a1
|
[DE mobile] Fix Collaboration template
|
2019-05-24 11:06:14 +03:00 |
|
|
Julia Svinareva
|
dc6402c41a
|
[DE mobile] Add Collaboration icon into toolbar, fix less
|
2019-05-22 15:36:43 +03:00 |
|
|
Julia Svinareva
|
3eb99a778a
|
[DE mobile] Fix text
|
2019-05-21 11:02:03 +03:00 |
|
|
Julia Svinareva
|
4f9d1e85f3
|
[DE mobile] Add styles collaboration.
|
2019-05-17 17:18:56 +03:00 |
|
|
Julia Svinareva
|
eca55fd472
|
[de mobile] corrected link and change less color schemes
|
2019-04-16 20:36:19 +03:00 |
|
|
Julia Svinareva
|
1ae45b6f2a
|
[de mobile] added color schemes
|
2019-04-15 17:42:17 +03:00 |
|
|
Maxim Kadushkin
|
8bf839db42
|
[all] changed templates and styles for vary production
|
2019-02-28 16:14:41 +03:00 |
|
|
Julia Radzhabova
|
f1280d2670
|
[DE mobile][PE][SSE] Merge from develop.
|
2017-04-11 14:05:56 +03:00 |
|
Alexander Yuzhin
|
307e3630dd
|
[DE mobile] Fixed display context menu. Fixed display about view.
|
2016-12-21 19:16:25 +03:00 |
|