|
06803de440
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/components/dialogs/BackupCodesDialog/index.js
# packages/client/src/pages/My/index.js
# packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# packages/client/src/pages/Profile/Section/Body/index.js
# packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
# packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# packages/client/src/pages/ProfileAction/index.js
|
2022-09-08 17:31:12 +03:00 |
|
|
46acc3ac19
|
Web: Made toastr work from single function (duplicate issue)
|
2022-09-08 14:29:59 +03:00 |
|
|
bcdc2993c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/My/i18n.js
# packages/client/src/pages/Profile/Section/Body/index.js
|
2022-09-05 16:47:09 +03:00 |
|
|
f69bf45e31
|
Client: delete useless
|
2022-09-05 13:55:09 +03:00 |
|
Artem Tarasov
|
907923add1
|
Web: Editor/Client: added ts support
|
2022-08-17 10:21:43 +03:00 |
|
Artem Tarasov
|
06981645c1
|
Web: Common/Client: added ts support in client, getOAuthToken, getLoginLink placed in common/utils
|
2022-08-15 17:27:40 +03:00 |
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
a87497a385
|
Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings
|
2022-07-28 17:34:27 +03:00 |
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +03:00 |
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|