IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,101 Commits 40 Branches 22 Tags 420 MiB
8279174355
Commit Graph

11101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gopienkonikita
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
gopienkonikita
9ba58855d4 Web: Files: fixed EmptyContainer 2021-03-15 14:51:23 +03:00
gopienkonikita
f3f4cfd0b2 Web: Files: fixed ThirdParty 2021-03-15 14:50:43 +03:00
Vladislav Makhov
daa0d070d5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-15 10:34:30 +03:00
Vladislav Makhov
ccb38f6725 web: people: fix group button menu re-render 2021-03-15 10:34:03 +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
Artem Tarasov
454b1a4077 Web: Components: refactoring .storybook/main.js 2021-03-14 21:42:23 +03:00
Artem Tarasov
460b34a1a8 Web: Components: added themes for storybook 2021-03-14 21:10:16 +03:00
Artem Tarasov
0748514a43 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-14 03:42:24 +03:00
Artem Tarasov
122a0501d1 Web: Components: added all story 2021-03-14 03:32:12 +03:00
Artem Tarasov
585ccaf09c Web: Components: added examples story 2021-03-14 03:17:30 +03:00
Artem Tarasov
bda09de462 Web: Components: added story for TreeMenu 2021-03-14 01:00:46 +03:00
AlexeySafronov
708a10a3f4 Web: Fixed logo displaying 2021-03-14 00:21:22 +03:00
AlexeySafronov
e47417cda9 Web: People: Moved pages folder from components 2021-03-13 20:07:32 +03:00
AlexeySafronov
491e9c5a39 Web: Refactoring 2021-03-13 19:01:22 +03:00
AlexeySafronov
b7a7be3d1f Web: Refactoring 2021-03-13 18:33:43 +03:00
AlexeySafronov
145d720299 Web: Webpack: Added base url and commented proxy 2021-03-13 18:31:09 +03:00
AlexeySafronov
1cf7415db7 Web: Added changing of base href on page load 2021-03-13 18:29:26 +03:00
AlexeySafronov
7ae980a4b5 Web: Removed LoginMobile 2021-03-13 16:09:59 +03:00
AlexeySafronov
ad8d6d89d2 Web: Shell: Added virtualPath (proxy: /appserver) 2021-03-13 16:03:31 +03:00
AlexeySafronov
372c06f911 Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector' 2021-03-13 16:02:22 +03:00
AlexeySafronov
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
AlexeySafronov
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
Alexey Safronov
027b88a359
Merge pull request #201 from ONLYOFFICE/hotfix/v0.0.11 
Hotfix/v0.0.11
 2021-03-12 18:52:06 +03:00
AlexeySafronov
e8e1a176ea Update yarn.lock files 2021-03-12 18:38:55 +03:00
AlexeySafronov
94b6750a6b web: common: bump version 2021-03-12 18:28:14 +03:00
AlexeySafronov
22c3cfffcd Web: Restored defaultPage 2021-03-12 18:27:52 +03:00
AlexeySafronov
bc8943083f Web: Clinet: Added default params to .env 2021-03-12 18:16:51 +03:00
AlexeySafronov
c2338d6636 Merge branch 'hotfix/v0.0.11' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.0.11 2021-03-12 18:00:33 +03:00
pavelbannov
e2061cd427 CustomNamingPeople: fix 2021-03-12 18:01:11 +03:00
AlexeySafronov
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
AlexeySafronov
ae7b7484b1 Web: Common: Fixed API proxy issue 2021-03-12 17:35:51 +03:00
AlexeySafronov
b90876c97d Bump version to v0.0.11 2021-03-12 17:20:24 +03:00
TatianaLopaeva
1675e77330 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 17:05:51 +03:00
TatianaLopaeva
71d1e79ea6 Web: Components:drop-down-item: Fix position of icons. (Ipad) 2021-03-12 17:05:18 +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
gopienkonikita
ca94ae28cd Web: Files: fixed empty filter container 2021-03-12 16:30:36 +03:00
Alexey Kostenko
50004b2ffd Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 15:44:00 +03:00
Alexey Kostenko
9f458a8bb5 Web: People: Fixed icons path in profile 2021-03-12 15:43:53 +03:00
Ilya Oleshko
60d1408d0d Web: Components: RowContainer: Fixed and added tests 2021-03-12 15:41:17 +03:00
Ilya Oleshko
fc2b9cff34 Web: Components: Row: Added tests 2021-03-12 15:40:49 +03:00
Ilya Oleshko
0a096a1304 Web: Components: Row: Removed unused property from PropTypes 2021-03-12 15:40:21 +03:00
gopienkonikita
ad913d34cb Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 15:20:59 +03:00
gopienkonikita
4fc9fbe4d3 Web: Files: fixed context-menu-button clickOutsideAction 2021-03-12 15:20:52 +03:00
AlexeySafronov
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
TatianaLopaeva
06e2d54b86 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 13:52:42 +03:00
AlexeySafronov
e8e78604f1 Web: Added products/apps dynamic loading 2021-03-12 13:52:30 +03:00
TatianaLopaeva
2d3b587286 Web: Components: main-button: Refactoring & Deleted useless import. 2021-03-12 13:52:14 +03:00
Ilya Oleshko
734675f559 Web: Components: ContextMenuButton: Returned click outside check 2021-03-12 13:42:16 +03:00