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 |
|
Ilya Oleshko
|
4e5c42ff91
|
Web: Files: Row: Removed unused props
|
2021-03-12 13:00:15 +03:00 |
|
Vladislav Makhov
|
494bc7a828
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 11:40:44 +03:00 |
|
Vladislav Makhov
|
6a17922554
|
web: people: fix routing
|
2021-03-12 11:06:13 +03:00 |
|
|
|
4ec8f4958b
|
Web: Files: fixed file action
|
2021-03-12 11:05:23 +03:00 |
|
|
|
131672666d
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 10:51:06 +03:00 |
|
|
|
76ea36e661
|
Web: Files: added Router to files, fixed VersionHistoryPanel
|
2021-03-12 10:50:54 +03:00 |
|
Vladislav Makhov
|
fad5f13110
|
web: people: remove unused code
|
2021-03-12 10:23:57 +03:00 |
|
Vladislav Makhov
|
e018a15087
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-12 10:18:18 +03:00 |
|
Vladislav Makhov
|
aeecf33f95
|
web: people: fix invite dialog
|
2021-03-12 10:18:05 +03:00 |
|
TatianaLopaeva
|
eaa46e6c0f
|
Web: People: Added reload page when change language.
|
2021-03-12 09:37:55 +03:00 |
|
Alexey Kostenko
|
d5a6b5d81b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 17:36:01 +03:00 |
|
Alexey Kostenko
|
85fc7535bf
|
Web: Components/Files: Fixed rendering svg when change folder
|
2021-03-11 17:35:52 +03:00 |
|
Vladislav Makhov
|
f349eb4a96
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 16:10:35 +03:00 |
|
TatianaLopaeva
|
b57a5d0627
|
Web: Files: Fixed displaying icons.
|
2021-03-11 14:18:23 +03:00 |
|
|
|
30e4390a39
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-11 13:57:24 +03:00 |
|
|
|
e17f7d7799
|
Web: Files: fixed sharing panel
|
2021-03-11 13:57:14 +03:00 |
|
Vladislav Makhov
|
1ae9b03a9f
|
web: people: fix empty screen after delete group
|
2021-03-11 11:18:14 +03:00 |
|
Viktor Fomin
|
24b212246c
|
Web: Files: fixed favorite icon click
|
2021-03-11 11:00:53 +03:00 |
|
Viktor Fomin
|
56a5c1bf20
|
Web: Files: fixed lock file
|
2021-03-11 10:46:55 +03:00 |
|
Viktor Fomin
|
2872b75768
|
Web: Files: deleted extra icon
|
2021-03-10 22:29:23 +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 |
|
|
|
62488521e3
|
Web: Files: Modified production build
|
2021-03-10 19:07:54 +03:00 |
|
|
|
e8992345ba
|
Web: People: Modified production build
|
2021-03-10 18:38:53 +03:00 |
|
|
|
4eeb6322bd
|
Web: Files: added file actions notification
|
2021-03-10 18:04:21 +03:00 |
|
|
|
4ed3a1a777
|
Web: Files: fixed files selection
|
2021-03-10 16:44:24 +03:00 |
|
