Commit Graph

23360 Commits

Author SHA1 Message Date
TimofeyBoyko
b8a5f121e3 Web:Client: add new translation keys for accounts empty screen page 2022-08-17 14:49:53 +03:00
TimofeyBoyko
2dfb779793 Web:Client:Accounts: update combobox view for table view 2022-08-17 12:10:40 +03:00
TimofeyBoyko
40c4952632 Web:Components:Combobox: add new modern view 2022-08-17 12:07:36 +03:00
TimofeyBoyko
f44a49710e Web:Client:Accounts: add translation keys for section body 2022-08-17 11:20:47 +03:00
TimofeyBoyko
d371d865a8 Web: add new translation key 'Room' 2022-08-17 11:06:44 +03:00
TimofeyBoyko
59486ab21e Web:Client:Accounts: add translation keys for section header 2022-08-17 10:29:33 +03:00
TimofeyBoyko
6ab3da7752 Web:Client:Article: add translation keys for main button of accounts page 2022-08-16 18:45:54 +03:00
TimofeyBoyko
17ffdff16f Web:Public: add new translation key 'Invite' for en locale 2022-08-16 18:45:11 +03:00
TimofeyBoyko
c8cf18030e Web:Client: add new key for en locale 'Manager' 2022-08-16 18:43:04 +03:00
TimofeyBoyko
76dac756f1 Web:Client:Accounts: add translation key 'Paid' for paid badge 2022-08-16 18:35:28 +03:00
TimofeyBoyko
f5e6f97f52 Web:Public: add new translation key 'Paid' for en locale 2022-08-16 18:34:27 +03:00
TimofeyBoyko
12f59e8e35 Web:Client:Accounts: update position for badges on row view 2022-08-16 18:23:47 +03:00
TimofeyBoyko
9c220ab77b Web:Client:Accounts: update colors and add new paid badge for accounts 2022-08-16 17:27:46 +03:00
TimofeyBoyko
2633a0ed18 Web:Client:Accounts: update action menu for section header 2022-08-16 16:15:54 +03:00
TimofeyBoyko
58c8b138f2 Web:Components:TableContainer: change margin for settings table cell 2022-08-16 13:29:53 +03:00
TimofeyBoyko
1a1cbccd13 Web:Client:Acctouns: update table and row view 2022-08-16 13:29:30 +03:00
TimofeyBoyko
12c98c2cb8 Web:Client: rename PeopleBadges to Badges and move to accounts section 2022-08-16 13:29:08 +03:00
TimofeyBoyko
2c9004a08c Merge branch 'develop' into feature/accounts-list 2022-08-15 18:08:29 +03:00
TimofeyBoyko
74c2180584 Web:Client:Accounts: update empty screen 2022-08-15 18:07:50 +03:00
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
TimofeyBoyko
13c36ac4f3 Web:Client:MainButton: add invite actions to main button for accounts page 2022-08-15 15:56:52 +03:00
TimofeyBoyko
ae7b100014 Merge branch 'develop' into feature/accounts-list 2022-08-15 14:36:30 +03:00
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
TimofeyBoyko
64d794d184 Web:Client:Acctouns: update filter data 2022-08-15 14:24:08 +03:00
TimofeyBoyko
4879908b88 Web:Client:Pages: move PeopleHome page to accounts folder 2022-08-15 13:51:32 +03:00
TimofeyBoyko
f2e67660ca Web:Client:PeopleHome: fix active catalog item after reload page 2022-08-15 12:55:11 +03:00
TimofeyBoyko
818e3ff9ba Web:Client:Article: delete useless code 2022-08-15 12:54:44 +03:00
TimofeyBoyko
3420660eba Web:Client:Article: add isActive state for accounts item of catalog 2022-08-15 11:59:38 +03:00
fa1258618a fixed warnings 2022-08-12 17:49:34 +03:00
299bed5559
Merge pull request #758 from ONLYOFFICE/bugfix/editor-ssr-production-fix
Web: Editor: fixed duplication of global styles on each request (prod…
2022-08-12 17:27:17 +03:00
a04c6b3533
Merge branch 'develop' into bugfix/editor-ssr-production-fix 2022-08-12 17:25:49 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
a941da35b4 removed ignored files 2022-08-12 16:11:25 +03:00
87ee619e09
Merge pull request #756 from ONLYOFFICE/feature/async-fix
Feature/async fix
2022-08-12 11:59:54 +03:00
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
296959b9ea
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix
Bugfix/editor ssr fix
2022-08-12 10:44:24 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
23b059c0cc fix 2022-08-11 22:35:53 +03:00
2314d6fc47 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-11 22:33:13 +03:00
5b613b8078 Files: async fix 2022-08-11 22:25:29 +03:00
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00
2936cb4ca2 Files: fix 2022-08-11 16:44:08 +03:00
e54617c275 Files: fix 2022-08-11 16:37:18 +03:00
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
c0bf10af9e Files: fix 2022-08-10 22:27:44 +03:00
a63ee39d36 Files: removed unused method 2022-08-10 21:23:46 +03:00
69e5665763 Files: async fix 2022-08-10 19:45:59 +03:00
779c726e6d
Merge pull request #730 from ONLYOFFICE/feature/sso
Feature/sso
2022-08-10 16:00:35 +03:00
48d8e16d49 Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-10 15:33:13 +03:00