Commit Graph

15 Commits

Author SHA1 Message Date
85bd971735 Merge branch 'develop' into feature/translations 2021-05-14 12:07:48 +03:00
7c1283c26f Web: Fix login redirect on Editor not authorized link opening 2021-04-30 18:01:16 +03:00
c47f896f75 Client: added translations 2021-04-24 10:42:49 +03:00
Alexey Kostenko
571b412d27 Web: Client/Components: Fixed facebook button styles/icon, fixed translations 2021-04-13 11:17:39 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
6a6e4c4705 Web: Login: Added translations 2021-04-09 16:01:04 +03:00
Alexey Kostenko
aadb8e3827 Web: Login: Show notification if account not connected to provider 2021-04-02 13:06:27 +03:00
Alexey Kostenko
ab3d5f1e77 Web: Login: Added icons and translations 2021-03-26 17:17:34 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
f56970ed15 Web: Login: Fixed base urls 2021-03-17 12:48:22 +03:00
970ec1eecf Web: Login: Modified production build 2021-03-10 19:24:15 +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
b9b4c4b1e2 Web: Added opportunity to load login page by primary link 2021-03-01 15:28:51 +03:00
507fadff55 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	packages/asc-web-components/src/components/icons/svg/index.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	yarn.lock
2021-02-24 10:57:03 +03:00
4afadf2e0c Web: Added support of public folders + moved back to original index.html 2020-12-15 19:27:30 +03:00