Commit Graph

21 Commits

Author SHA1 Message Date
Alexey Kostenko
9e80a2010c Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module) 2021-03-04 13:13:26 +03:00
TatianaLopaeva
7b0faa4747 Web: Moved Main into the Web Client. 2021-03-03 13:02:56 +03:00
TatianaLopaeva
1e643edd16 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-03 12:48:07 +03:00
TatianaLopaeva
d6cf286cd0 Web: Moved Layout to the Web Client. 2021-03-03 12:47:28 +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
TatianaLopaeva
90831adc31 Web: Moved GroupSelector to the People module. 2021-03-03 12:09:12 +03:00
Vladislav Makhov
c2a5eea4be web: people: refactoring 2021-03-03 12:05:08 +03:00
TatianaLopaeva
988afe48fd Web: Moved profile menu to the NavMenu. 2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d Web: Moved errors from Common to the Web Client. 2021-03-03 11:15:11 +03:00
bf7f680d08 Web: Moved NavMenu to Web Client 2021-03-02 18:25:20 +03:00
ab139d373a Web: Changed opening @self profile without page refresh 2021-03-01 22:53:42 +03:00
Vladislav Makhov
f452b09ecd web: fix icons 2021-03-01 16:11:45 +03:00
Vladislav Makhov
ea7697d461 web: common: fix import 2021-03-01 12:30:21 +03:00
Vladislav Makhov
4f8ad66cc3 web: common: fix svg import 2021-03-01 11:56:44 +03:00
TatianaLopaeva
6d70daa26a Web: Headline: Fix headline color. 2021-02-26 15:46:02 +03:00
TatianaLopaeva
ca0c86f2d4 Web/Common: Fix active title of menu, fix transition without redirect. 2021-02-26 13:50:20 +03:00
Artem Tarasov
487fd2affc Web: Components/Common: fix imports 2021-02-26 00:19:45 +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
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
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +03:00