Commit Graph

927 Commits

Author SHA1 Message Date
8036cb3401 Web: fixed confirm route 2021-03-17 15:56:09 +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
062cc4cc78 Web: Disabled initialization of service-workers on development 2021-03-17 12:59:11 +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
Vladislav Makhov
1c59410c38 web: client: remove history props drilling 2021-03-16 16:31:49 +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
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
24d0af3851 Web: Client: Shell: Added route to ThirdPartyResponse page 2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb Web: Client: ThirdParty: Fixed import 2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b Web: Settings: Fix icons displaying when moving from other modules. 2021-03-15 17:08:35 +03:00
a015b618a2 Web: Client: Added new service-worker on workbox v6 2021-03-14 23:36:20 +03:00
708a10a3f4 Web: Fixed logo displaying 2021-03-14 00:21:22 +03:00
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +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
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
e514fe1a57 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	web/ASC.Web.Client/src/Shell.jsx
2021-03-12 14:58:24 +03:00
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
7465b6cda4 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:12:03 +03:00
25cbaf3c0c Web: Files: fixed NavMenu clickOutsideAction 2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b Web: Added translation for setting at Nav. 2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68 Web: Fix translation. 2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd Web: Client: Added bodyLoader to accessRights page 2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f Web: Client: hide header in editor 2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 21:14:21 +03:00
Artem Tarasov
96271b4dfb Web: Components/Client: changed the way of passing elements to TabContainer component 2021-03-11 13:43:54 +03:00
TatianaLopaeva
749e028beb Web: Layout: Fixed displaying of article. 2021-03-11 13:12:35 +03:00
TatianaLopaeva
1afbcc0009 Web: Settings: Added top loading indicator. 2021-03-11 10:19:56 +03:00
Alexey Kostenko
26a4d5e4cf Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d Web: Client: Fixed transition from documents to settings 2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680 Web: fixed loader 2021-03-10 11:27:20 +03:00
Viktor Fomin
9d06a6618a Web: Client: change loader 2021-03-09 19:36:15 +03:00
TatianaLopaeva
289f749288 Web: About: Fix translation. 2021-03-05 14:24:34 +03:00
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
82a6dafb0f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 19:09:58 +03:00
28a798c542 Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Alexey Kostenko
b0f3a4e426 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 17:32:09 +03:00
TatianaLopaeva
b64736c363 Web: Added translation to PeopleSelector. 2021-03-04 14:57:48 +03:00
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
Alexey Kostenko
9e80a2010c Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module) 2021-03-04 13:13:26 +03:00
Alexey Kostenko
b3a3851d68 Web: Client: Fixed the transition from the people module to the documents module 2021-03-03 19:17:00 +03:00