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

4213 Commits

Author SHA1 Message Date
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
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
AlexeySafronov
e8e1a176ea Update yarn.lock files 2021-03-12 18:38:55 +03:00
AlexeySafronov
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
gopienkonikita
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
gopienkonikita
4ec8f4958b Web: Files: fixed file action 2021-03-12 11:05:23 +03:00
gopienkonikita
131672666d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-12 10:51:06 +03:00
gopienkonikita
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
gopienkonikita
30e4390a39 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-11 13:57:24 +03:00
gopienkonikita
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
AlexeySafronov
392984ded3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 19:33:18 +03:00
AlexeySafronov
f0829f059d Webpack: Fix loading react.svg 2021-03-10 19:33:10 +03:00
AlexeySafronov
62488521e3 Web: Files: Modified production build 2021-03-10 19:07:54 +03:00
AlexeySafronov
e8992345ba Web: People: Modified production build 2021-03-10 18:38:53 +03:00
gopienkonikita
4eeb6322bd Web: Files: added file actions notification 2021-03-10 18:04:21 +03:00
gopienkonikita
4ed3a1a777 Web: Files: fixed files selection 2021-03-10 16:44:24 +03:00
gopienkonikita
557527a977 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 12:14:34 +03:00
gopienkonikita
fde03a699a Web: Files: moved downloadFiles action from Header 2021-03-10 12:14:23 +03:00
Vladislav Makhov
531a6e87d7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-10 12:05:49 +03:00
Vladislav Makhov
a7e7cf5f1a Web: people: router fix 2021-03-10 12:05:07 +03:00
Vladislav Makhov
41388d6f2a web: people: remove unused code 2021-03-10 11:17:49 +03:00
TatianaLopaeva
79465f6889 Web: People: Added loading when selected group. 2021-03-10 10:51:59 +03:00
gopienkonikita
7c04c68274 Web: Files: moved EmptyFilesContainer from Body 2021-03-09 19:23:17 +03:00
gopienkonikita
c504fe44a6 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-09 15:26:05 +03:00
gopienkonikita
26cf03878a Web: Files: moved MediaViewer from Body 2021-03-09 15:25:46 +03:00
Vladislav Makhov
4c37804df4 web: people: fix routing 2021-03-09 15:19:58 +03:00
Vladislav Makhov
f0b82c8cea web: people: fix routing in edit page 2021-03-09 15:05:52 +03:00
Vladislav Makhov
751eb1d4b6 web: people: refactoring 2021-03-09 14:53:33 +03:00
Vladislav Makhov
111c45f40a Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	yarn.lock
 2021-03-09 09:46:45 +03:00
Vladislav Makhov
54ff155c85 web: people: add experimental separate context menu file 2021-03-09 09:44:08 +03:00
Vladislav Makhov
a7f5f57e55 web: people: fix routing 2021-03-09 09:37:51 +03:00
AlexeySafronov
2a5a78bc74 Web: Packages: stable versions 2021-03-06 21:46:04 +03:00
AlexeySafronov
a8a55167eb Web: Editor: Optimization 2021-03-06 18:50:06 +03:00
gopienkonikita
d4abc1dcdc Web: Files: fix 2021-03-05 17:51:39 +03:00
gopienkonikita
653440772d Web: Files: added translations to SimpleFilesRow 2021-03-05 17:27:44 +03:00
gopienkonikita
cee06497f8 Web: Files: fixed context menu actions 2021-03-05 17:06:23 +03:00
gopienkonikita
ce9cba95bd Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 17:04:27 +03:00
gopienkonikita
2e96e29f58 Web: Files: fixed context menu actions 2021-03-05 17:03:44 +03:00
Vladislav Makhov
012a3d0129 web: people: fix routing in user row 2021-03-05 16:46:08 +03:00
Alexey Kostenko
9a791c61ad Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 14:47:33 +03:00
Alexey Kostenko
80de5fcab9 Web: People: Fixed navigating from profile page to list 2021-03-05 14:47:12 +03:00
gopienkonikita
46f1495de5 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 14:38:50 +03:00
gopienkonikita
c52052a152 Web: Files: fixed context menu delete action, removed useless code 2021-03-05 14:38:41 +03:00
AlexeySafronov
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
6dcc819386 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 11:54:21 +03:00
TatianaLopaeva
58bebe1b83 Web: People: Fix icon path at profile menu. 2021-03-05 11:53:52 +03:00
gopienkonikita
7db261fea4 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 11:46:27 +03:00
gopienkonikita
25a2daeab5 Web: Files: moved editCompleteAction to store 2021-03-05 11:46:16 +03:00
TatianaLopaeva
5412f7b860 Web: NavMenu: Fixed icon path, deleted useless icons from modules. 2021-03-05 11:09:23 +03:00
TatianaLopaeva
993ddf9ac8 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 11:02:18 +03:00
TatianaLopaeva
e81d2c8bb7 Web: Common: Fixed logoUrl. 2021-03-05 11:01:49 +03:00
Ilya Oleshko
6442dfddca Web: Files: Fixed share icon path 2021-03-05 10:46:02 +03:00
AlexeySafronov
82a6dafb0f Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 19:09:58 +03:00
AlexeySafronov
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
gopienkonikita
4c1913c28a Web: Files: fixed files creation 2021-03-04 18:44:30 +03:00
gopienkonikita
63fec5b296 Web: Files: fixed download action 2021-03-04 16:53:16 +03:00
gopienkonikita
c655622794 Web: Files: added files actions store 2021-03-04 15:43:53 +03:00
gopienkonikita
3b93ba28de Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 15:42:52 +03:00
gopienkonikita
b93928948d Web: Files: fixed header delete action 2021-03-04 15:42:41 +03:00
TatianaLopaeva
249ea4ed7b Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 14:37:01 +03:00
TatianaLopaeva
5c826bcf29 Web: Added top loading indicator for desktop. 2021-03-04 14:36:31 +03:00
gopienkonikita
cc9a904dc2 Web: Files: fix 2021-03-04 13:23:48 +03:00
gopienkonikita
7cec3df259 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-04 12:33:06 +03:00
gopienkonikita
c35ed454af Web: Files: fixed files context menu actions 2021-03-04 12:32:53 +03:00
Vladislav Makhov
22c7dcb414 web: people: refactoring 2021-03-03 19:11:12 +03:00
AlexeySafronov
8c936e3ce0 Web: Styling 2021-03-03 18:21:06 +03:00
AlexeySafronov
47a030f5a1 Web: Restored process indication in Files 2021-03-03 17:58:56 +03:00
AlexeySafronov
8e1d5fb0b4 Web: webpack: changed devtool 2021-03-03 17:58:16 +03:00
AlexeySafronov
68930abdcb Web: Move toastr function to Web Client (mf: "studio/toastr") 2021-03-03 16:46:04 +03:00
TatianaLopaeva
17ac53d015 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 15:42:58 +03:00
TatianaLopaeva
ada47512f1 Web: Moved PeopleSelector to the Web Client. 2021-03-03 15:41:28 +03:00
Vladislav Makhov
34c1816aa5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 14:54:37 +03:00
Vladislav Makhov
57609a6e7e web: people: ProfileAction refactoring 2021-03-03 14:54:26 +03:00
gopienkonikita
238914e25e Web: Files: refactoring 2021-03-03 13:22:50 +03:00
Vladislav Makhov
1dbfd7f105 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 12:33:25 +03:00
Vladislav Makhov
d2dd11ef91 web: people: isMe refactoring 2021-03-03 12:33:17 +03:00
TatianaLopaeva
90831adc31 Web: Moved GroupSelector to the People module. 2021-03-03 12:09:12 +03:00
Vladislav Makhov
b8702eb270 web: people: add isMe 2021-03-03 12:05:34 +03:00
Vladislav Makhov
c2a5eea4be web: people: refactoring 2021-03-03 12:05:08 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
Vladislav Makhov
756039eccd Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 09:33:53 +03:00
AlexeySafronov
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
Vladislav Makhov
bb81b97df2 web: people: add missing prop 2021-03-02 16:36:45 +03:00
AlexeySafronov
df8d922b9a Web: People: refactoring 2021-03-02 15:44:14 +03:00
AlexeySafronov
3ce638b69a Web: People: Simplified People Home page (fixed render issues) 2021-03-02 15:11:17 +03:00
AlexeySafronov
c304bbe8b7 Web: People: Fixed displaying user list 2021-03-02 11:06:34 +03:00
AlexeySafronov
94708ed455 Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy 2021-03-01 22:48:48 +03:00
AlexeySafronov
8a6afa8111 Web: Fixed load source maps 2021-03-01 18:21:40 +03:00
AlexeySafronov
27ba8efeb3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 17:01:02 +03:00
AlexeySafronov
79cb70bc1f Web: Added opportunity to load people page by primary link 2021-03-01 17:00:54 +03:00
AlexeySafronov
0cf1150288 Web: Added opportunity to load files page by primary link 2021-03-01 16:29:37 +03:00
Ilya Oleshko
0c1689bec5 Bump version to v0.0.10 2021-03-01 16:27:21 +03:00
Vladislav Makhov
47004a1e1d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 
# Conflicts:
#	packages/asc-web-components/input-block/index.js
 2021-03-01 16:12:34 +03:00
Vladislav Makhov
f452b09ecd web: fix icons 2021-03-01 16:11:45 +03:00
AlexeySafronov
09d330104b Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:03:21 +03:00
AlexeySafronov
1cfb03810e Web: Added imports 2021-03-01 15:03:13 +03:00
gopienkonikita
d66f299f87 Web: Files: fixed mobx warnings 2021-03-01 14:43:19 +03:00
pavelbannov
f734a91d82 Files: fix SaveEditing 2021-03-01 14:38:55 +03:00
gopienkonikita
7339fec101 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 14:16:47 +03:00
gopienkonikita
e6aeaac4a5 Web: Files: decomposed the settings store object 2021-03-01 14:16:37 +03:00
Vladislav Makhov
603db877b5 web: people: fix import 2021-03-01 12:30:33 +03:00
Vladislav Makhov
628916a1c1 web: people: fix svg import 2021-03-01 11:56:11 +03:00
TatianaLopaeva
b8fabd5de0 Update webpack.config for fix displaying of icons. 2021-02-28 21:59:50 +03:00
TatianaLopaeva
5ac0124640 Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons. 2021-02-28 21:39:50 +03:00
TatianaLopaeva
1e266d6fc8 Web: Files: Fix not displaying icon at actions. 2021-02-28 21:24:13 +03:00
Vladislav Makhov
7bf2a8e9b5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-26 18:33:28 +03:00
pavelbannov
7852dac3ca Files: fix saveediting 2021-02-26 17:07:08 +03:00
gopienkonikita
f357c8b78c Web: fixed icons for files module 2021-02-26 16:29:50 +03:00
Vladislav Makhov
ae45d875f6 web: people: fix group fetching 2021-02-26 15:53:06 +03:00
AlexeySafronov
a2ace1a012 Web: People: Fix opening 2021-02-26 13:06:59 +03:00
AlexeySafronov
96c4d63abe Web: Fixed Files opening + added devtool: "inline-source-map" 2021-02-26 12:02:54 +03:00
Artem Tarasov
f10d8ae11d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-02-26 00:20:24 +03:00
Artem Tarasov
904813031b Web; People/Files/Login: fix imports 2021-02-26 00:19:04 +03:00
pavelbannov
dccbe81002 DataAnnotations: fix 2021-02-25 21:18:27 +03:00
TatianaLopaeva
99ef717815 Web: Files: Fix url for common icons. 2021-02-25 19:12:39 +03:00
TatianaLopaeva
b7fc7dd523 Web: Files: Fix tree-folder icons. 2021-02-25 19:03:36 +03:00
Artem Tarasov
c35d0612f0 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 
# Conflicts:
#	products/ASC.Files/Client/src/store/InitFilesStore.js
 2021-02-25 18:42:10 +03:00
Artem Tarasov
15602c3a8f Web: Files: fix after merge 2021-02-25 18:41:06 +03:00
TatianaLopaeva
ab93fac698 Web: Files: Fix icons size. 2021-02-25 18:30:31 +03:00
gopienkonikita
933a1aec48 Web: Files: fixed tree menu 2021-02-25 18:03:54 +03:00
Artem Tarasov
9b27d51ac5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/helpers/desktop.js
#	products/ASC.Files/Client/src/i18n.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Client/src/store/SettingsStore.js
#	products/ASC.Files/Client/src/store/ThirdPartyStore.js
#	products/ASC.Files/Client/src/store/TreeFoldersStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Files/Client/src/store/VersionHistoryStore.js
#	products/ASC.People/Client/src/helpers/converters.js
#	products/ASC.People/Client/src/helpers/people-helpers.js
 2021-02-25 17:57:32 +03:00
gopienkonikita
8b962cd88d Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-02-25 17:20:19 +03:00
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +03:00
gopienkonikita
b4fa1b2bb1 Web: Files: fixed icons imports, fixed components imports, fixed files module 2021-02-25 17:20:06 +03:00
Artem Tarasov
69ed46e8ae Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	web/ASC.Web.Login/src/Login.jsx
 2021-02-25 15:27:36 +03:00
Artem Tarasov
989fba5ecc Web: applied new import from appserver/common 2021-02-25 15:22:53 +03:00
Vladislav Makhov
e91bb64d03 web: people: fix imports 2021-02-25 15:16:52 +03:00