Commit Graph

4150 Commits

Author SHA1 Message Date
TatianaLopaeva
7950df5aaa Web: People: Fix translation after reload page. 2021-03-17 16:37:24 +03:00
Viktor Fomin
26318d3563 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 15:29:38 +03:00
Viktor Fomin
27e79b748e Web: Files: show rows loader on mobile 2021-03-17 15:29:29 +03:00
Artem Tarasov
1841730e20 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b Web: moved PeopleSelector to People 2021-03-17 13:37:22 +03:00
323d9fd76e Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-17 13:32:35 +03:00
4c55b2264a Web: Files: fixed files opening 2021-03-17 13:32:25 +03:00
062cc4cc78 Web: Disabled initialization of service-workers on development 2021-03-17 12:59:11 +03:00
8e7cad9b3f Web: Removed useless files 2021-03-17 12:36:14 +03:00
c08aad3ab1 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 22:47:49 +03:00
a25261f242 Web: Files: Fixed move from Folder to Settings and back 2021-03-16 22:47:41 +03:00
Artem Tarasov
e85b8f8118 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 18:04:54 +03:00
Artem Tarasov
517bbf9885 Web: Files: VersionHistory: fixed constant loading of the history of the first selected file, double request to the srver 2021-03-16 18:04:38 +03:00
Alexey Kostenko
299d7b888f Web: Files: Fixed first render icons in SharingPanel 2021-03-16 16:49:40 +03:00
Vladislav Makhov
b0c00fe749 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/Routes.jsx
2021-03-16 16:33:18 +03:00
Alexey Kostenko
3b6c2dc80b Web: Files: Fixed sharing panel styles 2021-03-16 16:23:05 +03:00
Alexey Kostenko
72aca76c12 Web: Files/Components: Fixed row styles 2021-03-16 16:17:50 +03:00
Artem Tarasov
f7ca96d0e4 Web: Files: VersionHistory: fixed warrning with keys of elements 2021-03-16 15:14:25 +03:00
7b5a9ab80d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 14:10:29 +03:00
24a6d61205 Web: Added creation and run of service-worker to all client apps 2021-03-16 14:10:20 +03:00
Vladislav Makhov
3caa960440 web: people: comment out 2021-03-16 13:40:18 +03:00
Alexey Kostenko
76f06ece3a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-16 11:26:59 +03:00
Alexey Kostenko
25b136eada Web: Components: Files: Fixed row styles 2021-03-16 11:26:49 +03:00
3ca1d1553e Web: Files: fixed fetchTreeFolders 2021-03-16 10:31:02 +03:00
TatianaLopaeva
6cd763a7d0 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 18:08:41 +03:00
TatianaLopaeva
9c119ca9c7 Web: Files fixed scroll top when selected a folder. (for Mobile) 2021-03-15 18:08:19 +03:00
Ilya Oleshko
d99e7b731f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 17:58:45 +03:00
Ilya Oleshko
0da65a6675 Web: Files: ConnectDialog: Fixed setting OAuth token after sending request 2021-03-15 17:58:37 +03:00
Ilya Oleshko
1964aaecdd Web: Files: TreeFoldersStore: Fixed returning folders after set and fetch 2021-03-15 17:57:23 +03:00
Vladislav Makhov
a8d439da3a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 17:22:32 +03:00
Vladislav Makhov
2224ae0b03 web: files: fix item creation render 2021-03-15 17:22:01 +03:00
Ilya Oleshko
dd8257daf5 Web: Files: ThirdPartyDialog: Fixed props usage 2021-03-15 17:16:03 +03:00
3c4f71c355 Web: Files: fixed remove third-party providers 2021-03-15 16:49:21 +03:00
8279174355 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4 Web: Files: fixed EmptyContainer 2021-03-15 14:51:23 +03:00
f3f4cfd0b2 Web: Files: fixed ThirdParty 2021-03-15 14:50:43 +03:00
Artem Tarasov
1ee2e02963 Web: People: TargetUserStore: fixed inability to change the language in the profile (an error appeared) 2021-03-15 10:03:30 +03:00
e47417cda9 Web: People: Moved pages folder from components 2021-03-13 20:07:32 +03:00
491e9c5a39 Web: Refactoring 2021-03-13 19:01:22 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
145d720299 Web: Webpack: Added base url and commented proxy 2021-03-13 18:31:09 +03:00
8e1f5b30b5 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-03-13 16:01:41 +03:00
4d5ca86a74 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/.env
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/modules/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
e8e1a176ea Update yarn.lock files 2021-03-12 18:38:55 +03:00
b90876c97d Bump version to v0.0.11 2021-03-12 17:20:24 +03:00
Alexey Kostenko
60fca302e0 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 16:59:05 +03:00
Alexey Kostenko
2489c25224 Web: Files: Fixed icons path in Sharing panel 2021-03-12 16:53:47 +03:00
ca94ae28cd Web: Files: fixed empty filter container 2021-03-12 16:30:36 +03:00
Alexey Kostenko
9f458a8bb5 Web: People: Fixed icons path in profile 2021-03-12 15:43:53 +03:00
Ilya Oleshko
e673f48751 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:00:24 +03:00