Commit Graph

22928 Commits

Author SHA1 Message Date
15c9b29d28 Web: Client: SSO: fix toast import 2022-07-24 00:44:05 +03:00
60469f901e Web: Client: Settings: SSO: fix disable save button 2022-07-24 00:31:29 +03:00
934dc28abe Web: Client: Settings: SSO: fix context scroll 2022-07-24 00:17:23 +03:00
a5ecd54dff Web: Client: Settings: SSO: fix generate cert 2022-07-24 00:16:35 +03:00
ce7e554927 Web: Client: Settings: SSO: fix metadata urls 2022-07-24 00:16:03 +03:00
da942bde48 Web: Client: Settings: SSO: fix table style 2022-07-24 00:15:40 +03:00
3fd8aa98fb Web: fix merge 2022-07-22 19:19:03 +03:00
df55fceb47 Web: Client: fix merge 2022-07-22 19:07:26 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
466d36a52d
Merge pull request #734 from ONLYOFFICE/feature/remove-header
Feature/remove header
2022-07-22 18:59:25 +03:00
1d10263162
Merge branch 'develop' into feature/remove-header 2022-07-22 18:59:13 +03:00
bbc26cca4e fix 2022-07-22 18:30:44 +03:00
a565d15673 Web: Client: SSO: fix button style 2022-07-22 18:21:57 +03:00
262d35a2c8 Web: Client: SSO: fix download 2022-07-22 18:15:56 +03:00
58626a8b4f Web: Components: HelpButton: fix icon 2022-07-22 18:13:17 +03:00
0275052613 Web: change icon 2022-07-22 18:12:58 +03:00
6dcac0eb0d Web: Components: Themes: fix color 2022-07-22 18:04:54 +03:00
809b3c17e9 Web: Client: Settings: SSO: fix icons 2022-07-22 18:04:36 +03:00
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
4ce9acce3d Merge branch 'develop' into feature/sso
# Conflicts:
#	products/ASC.Files/Server/DocStore
2022-07-22 17:23:36 +03:00
bf1ce10736 Web: Common: Article: fix styles 2022-07-22 16:20:01 +03:00
0a203dd532 Files: added new methods to api 2022-07-22 15:55:32 +03:00
5479b3452b Web: Common: Article: fix style 2022-07-22 13:50:57 +03:00
b8e7eb9752 Web: Common: Article: fix area click 2022-07-22 13:43:27 +03:00
93d7221388 Web: Components: IconButton: add height 2022-07-22 13:43:11 +03:00
aa6b674721 Web: change icon 2022-07-22 13:42:49 +03:00
23d6cb773e Web: Common: Article: fix styles 2022-07-22 13:29:22 +03:00
9a8177663b added new service 2022-07-22 13:15:27 +03:00
20d83a0059 Web: Common: Article: fix username 2022-07-22 12:53:02 +03:00
68907f79eb fix build 2022-07-22 11:54:42 +03:00
733cb618f3
Merge pull request #736 from ONLYOFFICE/bugfix/rooms-list
Bugfix/rooms list
2022-07-22 11:38:38 +03:00
af85268ff1 Web: Common: Article: fix styles 2022-07-22 10:55:26 +03:00
61a1862f50 Web: Client: ProfileActionsStore: add icon 2022-07-22 10:31:32 +03:00
180aa03d95 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-22 10:22:52 +03:00
TimofeyBoyko
9e3eb3c008 Web:Common:FilterInput: fix multy line of selected items 2022-07-22 05:37:17 +03:00
TimofeyBoyko
d15e4be920 Web:Files:TableView: fix table columns for rooms 2022-07-22 05:20:30 +03:00
09735323de
Merge pull request #621 from ONLYOFFICE/feature/doceditor-ssr
Feature/doceditor ssr
2022-07-21 18:49:06 +03:00
c15ca79dcb Web: Common: Article: fix styles 2022-07-21 18:40:45 +03:00
Artem Tarasov
1b667385f7 Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 18:17:21 +03:00
Artem Tarasov
284f0ef58d Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo 2022-07-21 18:05:23 +03:00
a288d72db2 Web: Common: Article: increase area click 2022-07-21 17:45:46 +03:00
afdd1b7908 Web: Components: ContextMenuButton: add iconClassName prop 2022-07-21 17:44:13 +03:00
5021a7c95e fix logs 2022-07-21 17:21:56 +03:00
459cc8d92e Web: Common: Article: truncate long text 2022-07-21 17:10:30 +03:00
fbc4bc000b Web: Login: add docspace logo 2022-07-21 17:08:58 +03:00
5e9a76a0fa Web: add logo 2022-07-21 17:08:41 +03:00
bdb3860b54 Web: Common: Article: add redirect to home page 2022-07-21 16:51:19 +03:00
88c23a0453 Web: Client: hide header on login page 2022-07-21 16:41:29 +03:00
07d8339b6a Web: Common: Article: fix styles 2022-07-21 16:41:12 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00