Commit Graph

24 Commits

Author SHA1 Message Date
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
8a4ab2171d Web:Common:Changed the setMailDomainSettings, setLifetimeAuditSettings requests. Added requests setDNSSettings, getAuditTrailReport to api settings. 2022-03-03 16:04:26 +03:00
2309bc060f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:25:08 +03:00
f695684b78 Web:Common:Added requests setPortalPasswordSettings, setMailDomainSettings, setIpRestrictions,setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings, setWhiteLabelSettings, restoreWhiteLabelSettings to api settings. 2022-03-02 11:08:48 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
4d5ada8381 Web: Common: add get capabilities 2022-01-31 12:32:59 +03:00
9ce696e624 Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
426fce6140 Web: Common: Added api method. 2021-07-01 13:18:43 +03:00
f993108d69 Web: Common: commentary changes 2021-05-30 17:26:30 +03:00
b2611343b6 Web: Common: get old backup codes 2021-05-20 01:44:03 +03:00
37267b624f Web: Common: added method for login with code and cookie 2021-05-19 18:21:40 +03:00
9b54835996 Web: Common: get secret key and qr 2021-05-14 15:58:50 +03:00
daef594561 Web: Packages: added tfa store 2021-05-05 14:59:08 +03:00
Alexey Kostenko
a550197bc5 Web: Common: Fixed getAuthProviders api url 2021-04-27 12:02:51 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
TatianaLopaeva
052157d1fe Web: Rename functions. 2021-04-16 15:35:02 +03:00
TatianaLopaeva
fc40487de0 Web: Added setCurrentShema and setCustomShema methods, added form validation. 2021-04-14 14:26:26 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
Alexey Kostenko
34973b123a Web: Common: Added api for linking providers and get available linked providers 2021-03-24 14:19:46 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00