Commit Graph

4014 Commits

Author SHA1 Message Date
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
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
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
df8d922b9a Web: People: refactoring 2021-03-02 15:44:14 +03:00
3ce638b69a Web: People: Simplified People Home page (fixed render issues) 2021-03-02 15:11:17 +03:00
c304bbe8b7 Web: People: Fixed displaying user list 2021-03-02 11:06:34 +03:00
94708ed455 Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy 2021-03-01 22:48:48 +03:00
8a6afa8111 Web: Fixed load source maps 2021-03-01 18:21:40 +03:00
27ba8efeb3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 17:01:02 +03:00
79cb70bc1f Web: Added opportunity to load people page by primary link 2021-03-01 17:00:54 +03:00
0cf1150288 Web: Added opportunity to load files page by primary link 2021-03-01 16:29:37 +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
09d330104b Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 15:03:21 +03:00
1cfb03810e Web: Added imports 2021-03-01 15:03:13 +03:00
d66f299f87 Web: Files: fixed mobx warnings 2021-03-01 14:43:19 +03:00
7339fec101 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-01 14:16:47 +03:00
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
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
a2ace1a012 Web: People: Fix opening 2021-02-26 13:06:59 +03:00
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
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
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
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