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 |
|
|
|
145d720299
|
Web: Webpack: Added base url and commented proxy
|
2021-03-13 18:31:09 +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 |
|
|
|
e8e1a176ea
|
Update yarn.lock files
|
2021-03-12 18:38:55 +03:00 |
|
|
|
bc8943083f
|
Web: Clinet: Added default params to .env
|
2021-03-12 18:16:51 +03:00 |
|
|
|
b1dfa97386
|
Web: Client: Added support of homepage
|
2021-03-12 17:53:02 +03:00 |
|
|
|
b90876c97d
|
Bump version to v0.0.11
|
2021-03-12 17:20:24 +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
|
9362f3cd2d
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 10:20:25 +03:00 |
|
TatianaLopaeva
|
1afbcc0009
|
Web: Settings: Added top loading indicator.
|
2021-03-11 10:19:56 +03:00 |
|
|
|
392984ded3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 19:33:18 +03:00 |
|
|
|
f0829f059d
|
Webpack: Fix loading react.svg
|
2021-03-10 19:33:10 +03:00 |
|
|
|
bac65c6744
|
Web: Client: Modified production build
|
2021-03-10 18:31:21 +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 |
|
|
|
40c7261fb1
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-10 10:36:14 +03:00 |
|
|
|
f962a2737b
|
Web: Remove slash
|
2021-03-10 10:35:43 +03:00 |
|
Viktor Fomin
|
9d06a6618a
|
Web: Client: change loader
|
2021-03-09 19:36:15 +03:00 |
|
|
|
2a5a78bc74
|
Web: Packages: stable versions
|
2021-03-06 21:46:04 +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 |
|
