Commit Graph

7263 Commits

Author SHA1 Message Date
Timofey Boyko
29f5925b89 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 12:35:00 +03:00
Timofey Boyko
1278f5e722 Web:Client: fix double tab at desktop editors 2022-12-07 12:29:28 +03:00
Elyor Djalilov
1c98049afe fix color 2022-12-07 14:21:00 +05:00
Elyor Djalilov
cd75b1a668 fixed display tooltip 2022-12-07 14:12:26 +05:00
Elyor Djalilov
a687cd3152 fix color 2022-12-07 13:57:22 +05:00
Elyor Djalilov
6cd251efe0 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:48:11 +05:00
Elyor Djalilov
56eff4a55b fix color 2022-12-07 13:47:58 +05:00
35f694e722 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:39:50 +03:00
d2538e677e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:38:47 +03:00
Viktor Fomin
8ef407a8ed Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 11:38:44 +03:00
Viktor Fomin
a6bdce28c8 Client: CreateEditRoomDialog: TagInput: fix style 2022-12-07 11:38:39 +03:00
918bd1cc0b Web: Added color for filter tags on hover, change color for dark theme. 2022-12-07 11:38:26 +03:00
Viktor Fomin
eb37008dd4 Components: Themes: add colors 2022-12-07 11:38:09 +03:00
Akmal Isomadinov
510adbf43e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:35:25 +05:00
Akmal Isomadinov
b38fd74f7d Web:Client:Pages:Home:Section:Filter Fixed warning, removed duplicate item 2022-12-07 13:35:13 +05:00
Elyor Djalilov
29663b39af Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:04:55 +05:00
Elyor Djalilov
e45a063e22 fixed display tooltip 2022-12-07 13:04:49 +05:00
641dc357b4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:00:40 +03:00
7cc108a13e Web: GlobalEvents: Fixed after merge. 2022-12-07 11:00:26 +03:00
Timofey Boyko
8d6c2cdb9e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 10:53:05 +03:00
Timofey Boyko
6b94bf83a4 Web:Common:Navigation: fix height for desktop editors for open navigation 2022-12-07 10:53:01 +03:00
4d090c4873 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 10:27:02 +03:00
dfd3f8a6ce Web: Components: Added a component update if the isDisable parameter was changed. 2022-12-07 10:26:43 +03:00
Akmal Isomadinov
b1aa666620 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 12:13:42 +05:00
Akmal Isomadinov
7698f5694f Web:Components Fixed the color of the filter icon and sorting on hover 2022-12-07 12:13:30 +05:00
6909826eb5 Update package.json
Restore default client api origin
2022-12-06 21:49:42 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
d295f82b8f Update FilesStore.js
Extended logging
2022-12-06 17:47:30 +03:00
fa863d3055 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 17:29:26 +03:00
a976c1523a Web: Components: Scroll: fixed theme colors 2022-12-06 17:29:20 +03:00
f52d67b1a8 Update FilesStore.js
Fix negative badge count
2022-12-06 17:18:25 +03:00
Viktor Fomin
5e23a21b4e Client: PortalSettings: SSO: fix style 2022-12-06 16:46:08 +03:00
eac08833bb Web: PortalSettings: Restore: Fixed text color. 2022-12-06 16:33:10 +03:00
151962311b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 15:57:39 +03:00
f57215053a Web: Fixed icons hover. 2022-12-06 15:54:24 +03:00
108e73c22a Update FilesStore.js
Fix create file on socket
2022-12-06 14:53:35 +03:00
Viktor Fomin
49bb0be1de Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-06 14:05:06 +03:00
Viktor Fomin
b73c4e1968 Components: CatalogItem: fix color 2022-12-06 14:04:42 +03:00
Viktor Fomin
40f199211d Components: Themes: add colors 2022-12-06 14:04:26 +03:00
bcdd69decc Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 14:04:20 +03:00
2b2927f40d Web: Components: ComboBox: fixed dark theme 2022-12-06 14:04:15 +03:00
Viktor Fomin
81c9aae6de Components: Combobox: align arrow 2022-12-06 13:44:28 +03:00
c74d98edb9 Web: Files: fixed arrow icon 2022-12-06 12:27:32 +03:00
6db14e1da7 Update FilesStore.js
Added update of root folders on new count changes
2022-12-06 10:49:14 +03:00
68cde355e7 Update FilesStore.js
Added setup file status new
2022-12-05 22:22:38 +03:00
f9a863f6dd Update FilesStore.js
Added setup folder new count
2022-12-05 22:08:51 +03:00
26b5290de5 Update EmptyFolderContainer.js
Simplified condition
2022-12-05 20:02:36 +03:00
850d39a789 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 19:24:07 +03:00
ec5439b97e Update EmptyFolderContainer.js
Fix detect of root room empty screen
2022-12-05 19:23:58 +03:00
54a6eb9eec Update Files.json
Removed !
2022-12-05 19:23:23 +03:00
Akmal Isomadinov
f15eddf917 Web:Common:Componnets:ColorTheme:Styled:Button Fix: removed the accent color from the ghost button 2022-12-05 21:12:14 +05:00
9bfb819505 Web: Components: AccessRightSelect: Added ColorTheme property for badge 2022-12-05 18:27:34 +03:00
Akmal Isomadinov
3ab0eb4391 Web:Components: Removed accent color from input component 2022-12-05 19:27:54 +05:00
7afd2775d5 Web: Components: AccessRightSelect: Fixed description color 2022-12-05 17:09:58 +03:00
39d4e2bd4d Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 16:57:46 +03:00
6a3fb0717d Web: Components: Checkbox: Fixed theme usage 2022-12-05 16:57:38 +03:00
3a6b699a96 Web: Files: fixed tiles theme 2022-12-05 16:31:25 +03:00
337a1969e4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 16:07:49 +03:00
49d8146cfd Web: Files: fixed rooms tile 2022-12-05 16:07:40 +03:00
f5a16c7e64 Merge branch 'develop' into feature/socket-newtag 2022-12-05 15:55:26 +03:00
Viktor Fomin
68a074da10 Client: Profile: fix 2022-12-05 15:41:38 +03:00
51670464be Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:50:24 +03:00
02b5e6e938 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:49:30 +03:00
83c1946399 Web: PortalSettings: Security: Fixed styles. 2022-12-05 14:49:24 +03:00
Akmal Isomadinov
65f8f27359 Web:Common:Components:ColorTheme:Styled:TextInput fixed the border color TextInput dark theme 2022-12-05 16:49:13 +05:00
Viktor Fomin
a352fc76b8 Components: Themes: fix color 2022-12-05 14:26:40 +03:00
Akmal Isomadinov
235d4d3ca3 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 16:22:19 +05:00
Akmal Isomadinov
9a92bfda12 Web:Common:Components:ColorTheme:Styled:inputBlock Fixed dark theme border color searchInput 2022-12-05 16:20:52 +05:00
Viktor Fomin
6174c37676 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:13:26 +03:00
Viktor Fomin
02a7f78d3e Client: Profile: ActiveSessions: fix color 2022-12-05 14:12:46 +03:00
Viktor Fomin
9317960d17 Components: Themes: add colors 2022-12-05 14:12:38 +03:00
bd040302c7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:07:59 +03:00
1a60d4ed39 Web: PortalSettings: Backup: Fixed styles. 2022-12-05 14:07:35 +03:00
Viktor Fomin
39f03f1d5f Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:07:09 +03:00
Viktor Fomin
c2712f33e4 Client: Profile: ActiveSessions: fix color 2022-12-05 14:07:00 +03:00
Viktor Fomin
596fdeaac5 Components: Themes: add colors 2022-12-05 14:06:42 +03:00
26ca74b440 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 13:47:01 +03:00
78cac85e69 Web: PortalSettings: Deleted useless code. 2022-12-05 13:42:54 +03:00
bc01d0ef49 Web: Added new icon for payment page. 2022-12-05 13:38:29 +03:00
d01a3b8af9 Web: PortalSettings: Payments: Fixed styles. 2022-12-05 13:34:14 +03:00
Viktor Fomin
6f426b4642 Components: Themes: fix color 2022-12-05 13:23:11 +03:00
Viktor Fomin
a449330c35 Client: Profile: fix color 2022-12-05 13:22:53 +03:00
Viktor Fomin
fb5a8fde5d Components: Themes: add color 2022-12-05 13:22:42 +03:00
01dca8c21c Web: Components: Input: fixed error color 2022-12-05 12:06:58 +03:00
c3a7e4d02c Web: Files: removed portal settings title 2022-12-05 11:39:03 +03:00
9a654120a3 Web: Files: removed Rooms title 2022-12-05 11:22:00 +03:00
af22ce1b55 Web: Components: fixed badges theme 2022-12-05 11:12:47 +03:00
eb3e6a226d Web: Files: fixed submenu text color 2022-12-05 10:34:29 +03:00
2cd587a829 Web: Files: fixed edit room dialog 2022-12-05 09:51:13 +03:00
8e0bc0a732 Merge branch 'develop' into release/rc-v1.2.0 2022-12-02 19:56:43 +03:00
c3578d1661 Fix EnDublicatesByContentTest issues 2022-12-02 18:58:36 +03:00
d683aa65b3 Fix all UselessTranslationKeysTest issues 2022-12-02 18:33:25 +03:00
Mushka Nikita
e5ebca27ee Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-02 17:39:48 +03:00
Mushka Nikita
b4dcc58d4f cleaned up code 2022-12-02 17:34:10 +03:00
Mushka Nikita
51e687d8d7 after-merge fixes 2022-12-02 17:27:39 +03:00
Mushka Nikita
131d8bcf50 Merge branch 'feature/new-docspace-translations' of github.com:ONLYOFFICE/AppServer into feature/new-docspace-translations 2022-12-02 17:27:19 +03:00
Viktor Fomin
f703d1b47e Common: Article: open profile by click username 2022-12-02 17:22:29 +03:00
Viktor Fomin
f6d5d22987 Common: Article: add background 2022-12-02 17:20:08 +03:00
Mushka Nikita
35aafe6058 fixed createRoomDialog translations 2022-12-02 17:18:30 +03:00
fa4674f2b0 Web: Files: FormGallery: fixed tiles display 2022-12-02 17:12:04 +03:00
dd4260acaa Update Settings.json
Fix NotFoundKeysTest issues
2022-12-02 17:02:55 +03:00
b73c4a8762 Web: Removed useless translations 2022-12-02 16:29:52 +03:00
c0d1645b45 Fix some UselessTranslationKeysTest issues 2022-12-02 15:56:05 +03:00
Akmal Isomadinov
72a7240cb8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-02 17:03:01 +05:00
Akmal Isomadinov
a38a85ebbf Web:Client:Components:GlobalEvents:EditRoomEvent Added reloadSelection for update state info panel 2022-12-02 17:00:49 +05:00
Akmal Isomadinov
195a3ce167 Web:Client:Store:FilesStore Added updateSelection method and duplicate methods removed 2022-12-02 16:59:46 +05:00
0f96d279d3 Fix some UselessTranslationKeysTest issues 2022-12-02 14:28:02 +03:00
135ea764dc Web: Editor: Fixed action link. 2022-12-02 13:46:06 +03:00
Viktor Fomin
5293738b49 Client: Confirm: CreateUser: fix style 2022-12-01 19:07:19 +03:00
80273d8392 Fix NotFoundKeysTest issues 2022-12-01 18:55:05 +03:00
b0a8c93054 Merge branch 'develop' into feature/new-docspace-translations 2022-12-01 18:43:19 +03:00
Viktor Fomin
ae9e16238b Client: Confirm: fix style 2022-12-01 18:32:59 +03:00
Viktor Fomin
05db34e801 Client: Confirm: delete useless 2022-12-01 18:31:25 +03:00
Viktor Fomin
c4d5f3b5ff Client: Confirm: get data from store 2022-12-01 18:27:46 +03:00
Viktor Fomin
9951111cd3 Common: AuthStore: add methods 2022-12-01 18:27:18 +03:00
Viktor Fomin
2c9c5a7dfc Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-01 18:09:28 +03:00
Viktor Fomin
70d45fd976 Client: Confirm: CreateUser: refactoring 2022-12-01 18:09:16 +03:00
c84faa2bc0 Merge branch 'develop' into release/rc-v1.2.0 2022-12-01 17:57:55 +03:00
1058e30a9b
Merge pull request #1096 from ONLYOFFICE/combobox-arrow
fixed bug with arrow
2022-12-01 17:56:30 +03:00
Timofey Boyko
73b45d7820 Web:Client:Home: fix filter by subject 2022-12-01 16:53:47 +03:00
4f48b93572 Merge branch 'develop' into feature/accounts-room-list 2022-12-01 15:29:38 +03:00
05e3889d68
Merge pull request #1093 from ONLYOFFICE/bugfix/info-panel-room-tags
Bugfix/info panel room tags
2022-12-01 15:23:57 +03:00
Mushka Nikita
34c6946477 fixed hover and cleaned up code 2022-12-01 15:21:59 +03:00
6f0a751cf5 Web: Files: fixed file creation with empty name 2022-12-01 15:09:50 +03:00
Mushka Nikita
8dc13f3d72 changed tag hover logic, now it depends on provided onClick func 2022-12-01 15:08:34 +03:00
3e734bb2a1
Merge pull request #1092 from ONLYOFFICE/bugfix/create-room-tag-input
Bugfix/create room tag input
2022-12-01 14:47:08 +03:00
Mushka Nikita
018e9789c2 cleaned up code 2022-12-01 14:45:18 +03:00
1e28a01f08 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-01 14:42:46 +03:00
d29ca023cc Web: Client: InvitePanel: Fixed issue with input height on webkit platforms 2022-12-01 14:42:39 +03:00
d678891bde Web: Files: added an error when creating a room without a title 2022-12-01 14:15:57 +03:00
3b70343764 Fix NotAllLanguageTranslatedTest issues 2022-12-01 13:38:03 +03:00
Elyor Djalilov
2433ca0705 fixed bug with arrow 2022-12-01 14:28:50 +05:00
Timofey Boyko
e4df954e8e Web: delete console log 2022-12-01 11:55:29 +03:00
Timofey Boyko
04e0d9bf2b Merge branch 'develop' into feature/accounts-room-list 2022-12-01 11:53:22 +03:00
Timofey Boyko
a37f503651 Web:Client:Home: fix filter 2022-12-01 11:51:57 +03:00
Elyor Djalilov
45efe52e96 fixed when selecting with arrow from the keyboard 2022-12-01 13:50:38 +05:00
Timofey Boyko
ad5c75a09e Web:Common:Loaders: fix filter block loader for rooms 2022-12-01 11:29:39 +03:00
Timofey Boyko
aa6946f14b Web:Client:Home: update filter for subjectFilter 2022-12-01 11:26:40 +03:00
Timofey Boyko
da5e1ef89f Web:Client:Accounts: add logic for open new tab with user rooms 2022-12-01 11:26:25 +03:00
Timofey Boyko
d661c36791 Web:Common:API: add new parametr for rooms filter 'subjectFilter' 2022-12-01 11:25:55 +03:00
Timofey Boyko
58b57245e2 Web:Common:FilterInput: update selected items 2022-12-01 11:25:27 +03:00
Mushka Nikita
2f02bdf8b5 fixed add tags api call with no tags provided 2022-12-01 01:36:52 +03:00
Mushka Nikita
41c2549e3b Merge branch 'develop' into bugfix/info-panel-room-tags 2022-12-01 01:15:14 +03:00
Mushka Nikita
bfda270277 added dark theme support for tagList tags 2022-12-01 01:04:43 +03:00
Mushka Nikita
fb528365ed removed default room type tag 2022-12-01 00:57:23 +03:00
Mushka Nikita
0f625dfbf9 fixed tagInput onClick blur issue 2022-12-01 00:44:09 +03:00
Mushka Nikita
ae766dbe69 fixed tag dropdown flickering issue 2022-12-01 00:43:29 +03:00
Mushka Nikita
f95b1c7689 Merge branch 'develop' into bugfix/create-room-tag-input 2022-12-01 00:07:29 +03:00
Elyor Djalilov
7e06c67e00 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2022-11-30 23:07:13 +05:00
Elyor Djalilov
b69c737c9d key was moved to the Common 2022-11-30 22:58:33 +05:00