ShimaginAndrey
|
14220fe977
|
Fix Bug 47237 modification v2
|
2021-05-24 16:41:31 +03:00 |
|
|
ShimaginAndrey
|
4355f29cfc
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
# Conflicts:
# build/package.json
|
2021-05-24 10:58:40 +03:00 |
|
|
ShimaginAndrey
|
10927e6f63
|
Filter Options
|
2021-05-23 18:27:21 +03:00 |
|
Julia Radzhabova
|
f7ad092d81
|
Change comment groups: show comment replys from all users group if comment is visible for current user group
|
2021-05-18 15:18:58 +03:00 |
|
JuliaSvinareva
|
537f007461
|
[mobile] Fix view comment for tablet
|
2021-05-17 19:51:12 +03:00 |
|
|
JuliaSvinareva
|
383620fbc7
|
[DE mobile] Fix templates
|
2021-05-17 16:14:41 +03:00 |
|
|
JuliaSvinareva
|
7e7ce909ac
|
[mobile] Fix users into collaboration
|
2021-05-14 14:03:06 +03:00 |
|
|
JuliaSvinareva
|
861c60caff
|
Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop
|
2021-05-13 18:09:03 +03:00 |
|
|
JuliaSvinareva
|
2ae18c1787
|
[mobile] Fix template of user page
|
2021-05-12 20:00:00 +03:00 |
|
SergeyEzhin
|
acc1f43a9a
|
[common] Bug 47778
|
2021-05-07 17:34:02 +03:00 |
|
|
SergeyEzhin
|
2a7812bfa3
|
[common] Bug 37524
|
2021-05-06 15:01:29 +03:00 |
|
|
SergeyEzhin
|
d55aad76ac
|
Bug 49157
|
2021-05-05 16:06:07 +03:00 |
|
Maxim Kadushkin
|
295bc949c9
|
Merge branch 'feature/fix-bug-shimaginA' into develop
|
2021-05-05 00:31:01 +03:00 |
|
|
Julia Radzhabova
|
6eee4f8ae1
|
[Mobile] Fix plugins loading
|
2021-05-04 22:05:26 +03:00 |
|
|
Maxim Kadushkin
|
fdda540c47
|
[all] fix loading sdk scripts
|
2021-05-03 20:02:21 +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 |
|
|
SergeyEzhin
|
4b0722ad91
|
[common] Correct searchbar
|
2021-04-30 16:10:30 +03:00 |
|
|
SergeyEzhin
|
45b0cb2bac
|
[common] Edits toolbar and corrected searchbar
|
2021-04-30 01:18:03 +03:00 |
|
|
JuliaSvinareva
|
8cdb629864
|
[mobile] Fix open context menu, when dialog is opened
|
2021-04-28 12:04:50 +03:00 |
|
|
JuliaSvinareva
|
1d51be59a6
|
Merge branch 'feature/mobile-apps-on-reactjs-plugins' into feature/mobile-apps-on-reactjs
|
2021-04-27 17:28:49 +03:00 |
|
|
SergeyEzhin
|
a0538ee3e0
|
[common] Added plugins
|
2021-04-27 16:39:39 +03:00 |
|
|
JuliaSvinareva
|
160b2baf7f
|
[mobile] Fix edit comments for tablet
|
2021-04-27 15:28:25 +03:00 |
|
|
ShimaginAndrey
|
3c97073b0e
|
Merge branch 'feature/mobile-apps-on-reactjs' into feature/fix-bug-shimaginA
|
2021-04-27 15:18:14 +03:00 |
|
|
SergeyEzhin
|
33f1cc5985
|
[common] Make plugins
|
2021-04-27 00:02:07 +03:00 |
|
|
ShimaginAndrey
|
bacd0b5423
|
Fix Bug 47237 modification
|
2021-04-26 09:20:52 +03:00 |
|
|
ShimaginAndrey
|
c6b68ab7c6
|
Fix Bug 47237
|
2021-04-21 14:46:02 +03:00 |
|
|
Maxim Kadushkin
|
3dd26e178b
|
[common] switch off version compare for debug
|
2021-04-20 12:47:57 +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 |
|
|
Julia Radzhabova
|
c2e0ffb2be
|
Merge branch 'release/v6.3.0' into develop
|
2021-04-15 11:18:07 +03:00 |
|
|
JuliaSvinareva
|
eb6a25140d
|
[DE mobile] Add check to hide review in collaboration
|
2021-04-13 18:23:37 +03:00 |
|
|
Maxim Kadushkin
|
a9dda7fe6f
|
[common] don't open context menu if no items
|
2021-04-12 18:10:03 +03:00 |
|
|
Julia Radzhabova
|
49eba78cbc
|
Set plugin version
|
2021-04-06 21:25:24 +03:00 |
|
|
JuliaSvinareva
|
93152efb32
|
[DE mobile] Add apply license in main controller
|
2021-04-04 18:01:19 +03:00 |
|
|
JuliaSvinareva
|
babe1233a9
|
[mobile] Add handler for try undo in fast collaborative
|
2021-04-01 23:27:58 +03:00 |
|
|
JuliaSvinareva
|
d64eae031a
|
[DE mobile] Make toolbar controller
|
2021-03-30 23:11:49 +03:00 |
|
|
SergeyEzhin
|
dd3b5fafe0
|
[SSE mobile] Corrected some things
|
2021-03-30 17:51:53 +03:00 |
|
|
Julia Radzhabova
|
b1d3ba3fc0
|
Merge branch 'release/v6.3.0' into develop
|
2021-03-29 16:33:45 +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 |
|
|
Julia Radzhabova
|
78229a2bab
|
Merge branch 'develop' into feature/comment-permissions
|
2021-03-28 22:18:19 +03:00 |
|
|
Julia Radzhabova
|
7092ae1cbc
|
[Mobile] Fix plugins loading
|
2021-03-27 22:53:36 +03:00 |
|
|
Julia Radzhabova
|
cc3df7db90
|
[DE mobile] Fix review permissions
|
2021-03-26 20:54:38 +03:00 |
|
|
Julia Radzhabova
|
0b2a3aec7e
|
Add event onPluginsReady
|
2021-03-26 20:37:29 +03:00 |
|
|
Julia Radzhabova
|
2a6ed8f973
|
[DE] Fix review groups
|
2021-03-26 20:32:25 +03:00 |
|
|
SergeyEzhin
|
1876de1e87
|
[mobile] Corrected About
|
2021-03-26 17:48:18 +03:00 |
|
|
JuliaSvinareva
|
465fd40004
|
[SSE mobile] Fix comments
|
2021-03-26 16:23:17 +03:00 |
|
|
Julia Radzhabova
|
3b901f91e4
|
Use sdk class
|
2021-03-26 14:29:16 +03:00 |
|
|
JuliaSvinareva
|
56e316738e
|
[SSE mobile] Add comments
|
2021-03-25 01:07:10 +03:00 |
|
|
JuliaSvinareva
|
4b0ec3e352
|
[PE mobile] Add context menu
|
2021-03-23 14:05:45 +03:00 |
|
|
JuliaSvinareva
|
7fb9407ef6
|
[PE mobile] Add checking of hide insert comment, connecting comment components
|
2021-03-22 14:35:16 +03:00 |
|
|
JuliaSvinareva
|
db7c7343c5
|
[mobile] Add reset of coauthoring disconnect option in users store
|
2021-03-20 19:01:26 +03:00 |
|
|
JuliaSvinareva
|
eda4736916
|
[mobile] Show foreign cursor label, enable collaboration fast mode
|
2021-03-19 19:11:57 +03:00 |
|
|
Julia Radzhabova
|
916c911ac7
|
[Mobile] Use config permssions to view comments
|
2021-03-17 23:57:54 +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 |
|
|
Julia Radzhabova
|
f35e929713
|
Add permissions for edit/remove comments
|
2021-03-17 12:02:06 +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 |
|
|
Julia Radzhabova
|
5a373f76bb
|
[DE mobile] Refactoring review permissions
|
2021-03-16 20:17:35 +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 |
|
|
SergeyEzhin
|
32f5bd693e
|
[DE PE mobile] Correcting Find and Replace
|
2021-03-15 21:35:19 +03:00 |
|
|
SergeyEzhin
|
0fa56cd60b
|
[SSE mobile] Corrected stores according to mobx v. 6
|
2021-03-15 16:39:45 +03:00 |
|
|
SergeyEzhin
|
a556f4e196
|
[SSE mobile] Correcting Find and Replace
|
2021-03-12 20:54:11 +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 |
|
|
SergeyEzhin
|
5d06b05a51
|
Merge branch 'feature/mobile-apps-on-reactjs-de' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-de
|
2021-03-10 19:51:56 +03:00 |
|
|
SergeyEzhin
|
de79f6e526
|
[PE mobile] Added Find and Replace
|
2021-03-10 19:51:22 +03:00 |
|
|
Maxim Kadushkin
|
bb6172015c
|
[common mobile] fixes for mobx ver 6
|
2021-03-10 16:58:14 +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
|
1cf1bb5df3
|
[mobile] Fix users and comments stores according to mobx v. 6
|
2021-03-09 15:27:26 +03:00 |
|
|
JuliaSvinareva
|
48c50b145b
|
[mobile] Make comment view from context menu
|
2021-03-08 21:30:42 +03:00 |
|
|
SergeyEzhin
|
f067ea4622
|
[DE mobile] Make Find and Replace for ios and android
|
2021-03-05 20:53:37 +03:00 |
|
|
JuliaSvinareva
|
79e1acb89d
|
[mobile] Open add comment from context menu
|
2021-03-05 18:23:35 +03:00 |
|
|
JuliaSvinareva
|
7cf42452ae
|
[mobile] Add styles of comments for android
|
2021-03-04 20:25:50 +03:00 |
|
|
JuliaSvinareva
|
0f2a4d8138
|
[mobile] Fix comments
|
2021-03-04 20:24:35 +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 |
|
|
Maxim Kadushkin
|
5c53f958f8
|
[DE mobile] context menu depends on selected objects
|
2021-03-03 14:47:49 +03:00 |
|
|
SergeyEzhin
|
ed550f1dce
|
[DE mobile] Added replacing
|
2021-03-02 22:33:26 +03:00 |
|
|
JuliaSvinareva
|
2a90efa7b0
|
[mobile] Comments (applying comment display)
|
2021-03-01 23:09:39 +03:00 |
|
|
Maxim Kadushkin
|
dd78ba9395
|
[mobile] fixed context menu
|
2021-03-01 21:55:58 +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
|
c3dd451d7a
|
[mobile] Made receiving and displaying comments into collaboration
|
2021-02-25 19:26:42 +03:00 |
|
|
JuliaSvinareva
|
060e51b47a
|
[DE mobile] Refactoring review (remove html tags from translations, create array of elements instead of string)
|
2021-02-19 12:22:10 +03:00 |
|
|
JuliaSvinareva
|
a97d9d6aa9
|
Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs
|
2021-02-18 18:44:30 +03:00 |
|
|
JuliaSvinareva
|
c446eb4db4
|
[mobile][de] Add insert comment
|
2021-02-18 18:40:54 +03:00 |
|
|
SergeyEzhin
|
1cb18ade25
|
[SSE mobile] Corrected Text Settings and Chart Settings
|
2021-02-17 14:28:02 +03:00 |
|
|
Maxim Kadushkin
|
d6c6bc389b
|
[DE mobile] fix context menu close
|
2021-02-16 20:31:27 +03:00 |
|
|
JuliaSvinareva
|
4e8be323a8
|
[DE mobile] Add review settings
|
2021-02-12 20:33:38 +03:00 |
|
|
JuliaSvinareva
|
96795be9a6
|
Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs
|
2021-02-12 02:34:27 +03:00 |
|
|
JuliaSvinareva
|
c3437aa762
|
[DE mobile] Add review settings
|
2021-02-12 02:34:01 +03:00 |
|
|
Maxim Kadushkin
|
89d297ea9c
|
[DE mobile] context menu moved to common
|
2021-02-10 00:01:42 +03:00 |
|
|
SergeyEzhin
|
9e80ead4b4
|
[SSE mobile] Added Text Settings
|
2021-02-09 21:42:00 +03:00 |
|
|
JuliaSvinareva
|
3912fe4620
|
[mobile] Edit collaboration
|
2021-02-08 19:32:25 +03:00 |
|
|
Julia Radzhabova
|
60cbd47725
|
Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).
Deprecate customization.commentAuthorOnly parameter.
|
2021-02-04 12:39:56 +03:00 |
|
|
Maxim Kadushkin
|
c124342f12
|
[DE mobile] extended Searchbar
|
2021-01-29 10:01:02 +03:00 |
|