Commit Graph

1059 Commits

Author SHA1 Message Date
807215a0cb Web:Client:OAuth: fix mobx warning, add infinity list for table view 2023-09-27 18:13:07 +03:00
dc1274fb88 Web:Client:PortalSettings: add OAuth empty page 2023-09-25 17:03:25 +03:00
4048d8dc82 Web: removed useless translation key ResetButton 2023-09-22 17:21:24 +04:00
8371330d3c Web: Applied new design 2023-09-22 16:39:08 +04:00
44dbeb48cd Merge branch 'develop' into feature/document-service-location 2023-09-21 13:38:25 +04:00
9c9f33cf12
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
2023-09-20 19:46:48 +04:00
Viktor Fomin
c0d87940f0 Web: move ExpiredLink translate to Common 2023-09-20 17:35:38 +03:00
gazizova-vlada
69961e6900 Merge branch 'develop' into feature/reassign-data 2023-09-20 17:19:12 +03:00
gazizova-vlada
183b32c2aa Merge branch 'develop' into feature/reassign-data 2023-09-20 16:27:26 +03:00
bdabb35e55 Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-20 15:03:02 +03:00
940338fd9d Web: Files: Leave-room: bugs fixed 2023-09-20 15:02:34 +03:00
3d20697ac0 Web: Translation: Fix UTC key duplication + sorting 2023-09-20 15:36:34 +04:00
gazizova-vlada
cc31a46cb9 Web:Fix common. 2023-09-20 12:53:29 +03:00
3a1bf92291 Merge branch 'develop' into feature/leave-room 2023-09-20 13:20:56 +04:00
e356f361f3
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
2023-09-20 13:10:36 +04:00
Akmal Isomadinov
c1983fcfa6 Web:Cron Added translation 2023-09-20 13:34:26 +05:00
ca76336fc3 Merge branch 'develop' into feature/leave-room 2023-09-19 10:44:07 +03:00
Vlada Gazizova
3471bbf09f
Merge branch 'develop' into feature/reassign-data 2023-09-19 09:54:45 +03:00
mushka-n
d98680b350 moved translations and updated selector 2023-09-18 17:10:16 +03:00
gazizova-vlada
34a7c068a7 Web:Client:Add onStartAgain, onTerminate. 2023-09-18 16:55:03 +03:00
74f9ea784b Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 16:31:27 +04:00
33091f9304 Web: Client: fix long text in copy button 2023-09-18 12:55:29 +02:00
95424d49f9 Web: Added ru translations + autofixes 2023-09-18 14:17:00 +04:00
mushka-n
da7aec7445 Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 13:06:39 +03:00
0deac4bf00 Merge branch 'develop' into feature/mobile-sdk 2023-09-18 13:45:20 +04:00
35de42a262
Merge pull request #1739 from ONLYOFFICE/feature/version-error
feature/version-error
2023-09-18 13:01:24 +04:00
00c3d8a367 Merge branch 'develop' into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-15 18:46:34 +03:00
9b5572552e Web: Fix ru translations 2023-09-15 18:28:31 +04:00
7e4f102620 Web: Added display of error about outdated version of DesktopEditors on Linux. 2023-09-12 18:04:46 +03:00
675590854c Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
#	products/ASC.People/Server/Api/UserController.cs
2023-09-12 15:18:27 +03:00
mushka-n
95e3bc8f36 merge develop + merge fix 2023-09-11 13:52:47 +03:00
mushka-n
d96911a37c merge develop + merge fix 2023-09-11 13:26:58 +03:00
1f77cf82a2 Merge branch 'develop' into feature/leave-room 2023-09-11 13:28:56 +04:00
14e080abb6 Web: Cron: Added ru language 2023-09-11 13:16:39 +04:00
21fd5aa9d5 Merge branch 'develop' into feature/cron 2023-09-11 12:34:41 +04:00
0931a28a2f Web: Client: add mobile version of sdk 2023-09-08 23:19:47 +02:00
3ac5d9159a Merge branch 'develop' into feature/new-for-client 2023-09-08 18:51:06 +04:00
675755aedd Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop 2023-09-08 09:46:59 +03:00
mushka-n
e1d989c6d2 merge develop + merge fix 2023-09-08 03:27:39 +03:00
db3f75c78b added translations 2023-09-07 18:40:17 +03:00
c00645554b Web: SDK: Fixed setting base locale 2023-09-07 15:32:54 +03:00
Akmal Isomadinov
2ba6366f29 Merge branch 'develop' into feature/cron 2023-09-07 16:43:58 +05:00
Akmal Isomadinov
096e3dd687 Web:Cron Fixed translations 2023-09-07 16:40:45 +05:00
c29f577df6 Merge branch 'develop' into feature/adding-new_ru 2023-09-07 14:10:20 +04:00
gazizova-vlada
b224b1bb8f Merge branch 'develop' into feature/reassign-data 2023-09-06 13:00:15 +03:00
86257bb8da Web: SDK: Added onAuthSuccess event 2023-09-06 12:22:41 +03:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
761765cd2b Web: SDK: Allow calling framesdk function on editor.requestClose 2023-09-04 16:52:44 +03:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
613938b819 Web: Added Zoom login button, translates and icons 2023-09-04 16:06:55 +03:00