Commit Graph

13 Commits

Author SHA1 Message Date
877016d8e3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-05 12:41:08 +03:00
TatianaLopaeva
e81d2c8bb7 Web: Common: Fixed logoUrl. 2021-03-05 11:01:49 +03:00
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
684c0e777f Web: Refactoring 2021-03-03 14:46:37 +03:00
4db48870cf Web: SettingsStore: Fixed warnings of mobx 2021-03-03 14:46:05 +03:00
8da0cbcb63 Web: Fixed displaying login errors 2021-03-03 14:09:00 +03:00
TatianaLopaeva
0a97830634 Web: Common: Fix icon for menu. 2021-03-02 21:16:50 +03:00
8ee7563caf Web: Client: fixed mobx warnings 2021-03-01 18:15:11 +03:00
Vladislav Makhov
ea7697d461 web: common: fix import 2021-03-01 12:30:21 +03:00
Vladislav Makhov
1695b9649d web: common: fix title 2021-03-01 12:03:12 +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
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
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00