|
|
01eff8cfa3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-05-03 21:22:17 +03:00 |
|
|
|
860c53378b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-03 21:18:54 +03:00 |
|
|
|
3f4a828771
|
Web:Studio:Added placeholder "EnterName".
|
2022-04-29 12:52:06 +03:00 |
|
|
|
175b934fc8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-21 20:28:36 +03:00 |
|
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
|
3ab0bdd11f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-15 20:34:36 +03:00 |
|
|
|
b20f4cfed1
|
Web: Backup: Added new translation.
|
2022-04-10 13:14:40 +03:00 |
|
|
|
ab0404e1dc
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-07 17:32:15 +03:00 |
|
|
|
b7d45c2e66
|
Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-07 17:24:39 +03:00 |
|
|
|
eeac7377be
|
Web: Client: delete useless
|
2022-04-07 16:19:08 +03:00 |
|
|
|
2962c0ca38
|
Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-07 04:10:15 +03:00 |
|
|
|
c6b81c6e94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail
|
2022-04-06 21:32:36 +03:00 |
|
|
|
1755d03b4e
|
Web:Studio:Styling Settings. Added locales en PortalRenamingMobile.
|
2022-04-06 17:07:48 +03:00 |
|
|
|
92899d14df
|
Web: Client: add settings translate
|
2022-04-06 17:04:49 +03:00 |
|
|
|
48240c6f77
|
Web:Studio:Added locales en PleaseNote, PleaseNoteDescription, PortalRenaming, PortalRenamingDescription, PortalRenamingDescriptionTooltip, PortalRenamingLabelText, PortalRenamingSettingsTooltip. Added tooltip PortalRenamingTooltip.
|
2022-04-06 12:37:15 +03:00 |
|
|
|
08d7647bbe
|
Web: Client: add settings translates
|
2022-04-06 12:24:35 +03:00 |
|
|
|
1cb67aacdb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-06 11:32:46 +03:00 |
|
|
|
5e890f81c9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 23:05:08 +03:00 |
|
|
|
7deb741978
|
Web:Studio:Added SuccessfullySavePortalNameMessage locales en.
|
2022-04-05 23:02:45 +03:00 |
|
|
|
331ab31e02
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
|
2022-04-05 11:18:28 +03:00 |
|
|
|
6fef466d23
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-04 22:12:05 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
|
f677b0e484
|
Web: Client: delete space
|
2022-04-04 17:11:44 +03:00 |
|
|
|
d866dfecfb
|
Web: Client: fix
|
2022-04-04 16:59:38 +03:00 |
|
|
|
bd7ebe0238
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-04 12:35:36 +03:00 |
|
|
|
b4533f6089
|
Web: Client: fix settings translates
|
2022-04-04 11:22:07 +03:00 |
|
|
|
30f16c8ab0
|
Web: Client: add settings translates
|
2022-04-02 22:35:01 +03:00 |
|
|
|
a62959aba1
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-02 22:02:26 +03:00 |
|
|
|
b4f7c427f9
|
Web: Client: add settings translates
|
2022-04-02 21:10:58 +03:00 |
|
|
|
d44921093f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/password-strength
|
2022-04-02 16:19:23 +03:00 |
|
|
|
8a8cc4d1f3
|
Web: Client: add settings translates
|
2022-04-01 14:59:55 +03:00 |
|
|
|
d5459374b9
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 19:05:05 +03:00 |
|
|
|
9929a88f9e
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-31 19:03:50 +03:00 |
|
|
|
710df955dc
|
Web:Studio:Added upper case.
|
2022-03-31 18:24:03 +03:00 |
|
|
|
90a3513630
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign
|
2022-03-31 15:47:47 +03:00 |
|
|
|
b26f0e3423
|
Web: Client: add settings translates
|
2022-03-31 13:12:18 +03:00 |
|
|
|
e87aa1a80f
|
Web: Client: delete useless
|
2022-03-31 12:33:46 +03:00 |
|
|
|
a7b00a4286
|
Web: Client: add settings translates
|
2022-03-31 01:10:06 +03:00 |
|
|
|
eff126236a
|
Web: Client: add settings translates
|
2022-03-30 20:56:56 +03:00 |
|
|
|
bd122ed006
|
Web: Client: add settings translates
|
2022-03-30 19:39:34 +03:00 |
|
|
|
89bf79e2d3
|
Web: Client: add translates
|
2022-03-28 14:40:32 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
c001de8f74
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-16 13:03:29 +03:00 |
|
|
|
c4c02698d3
|
Web:Studio:Changed the name "Time Zone" to "Time zone".
|
2022-03-16 11:32:41 +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 |
|
|
|
aa5fde9b18
|
Web:Studio:Changed translation of CustomizationDescription for locales ru. Added translation of CustomizationDescription for locales en.
|
2022-03-10 17:06:50 +03:00 |
|
|
|
48c35f981b
|
Web:Studio:Added locales en for CustomTitlesTooltip tooltip.
|
2022-03-10 16:18:46 +03:00 |
|
|
|
3bbf82d918
|
add new lines
|
2022-03-09 19:07:24 +03:00 |
|
|
|
5655f57acd
|
Web:Studio:Changed CustomTitlesSettingsDescription and LanguageAndTimeZoneSettingsDescription for locales en, pt-BR, ru, de, fr, it. Added CustomTitlesWelcome for locales en, pt-BR, de, fr, it.
|
2022-03-09 12:16:04 +03:00 |
|
|
|
4965f9ffb6
|
Web:Studio:Added a CustomizationDescription in the Customization component. Added ru locales for CustomizationDescription.
|
2022-03-04 09:29:12 +03:00 |
|
