Elyor Djalilov
|
b8348af578
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/public/locales/en/DeleteDialog.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/public/locales/en/InviteDialog.json
# packages/client/public/locales/en/Payments.json
# packages/client/public/locales/en/Profile.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/ru/Files.json
# packages/client/public/locales/ru/InfoPanel.json
# packages/client/public/locales/ru/Payments.json
# packages/client/src/components/GlobalEvents/RenameEvent.js
# packages/client/src/pages/Home/Section/Filter/index.js
|
2022-11-25 16:27:23 +05:00 |
|
|
23a7210fbc
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 20:33:59 +03:00 |
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
|
0ee0cdadcc
|
Web:Common:Removed adding a theme for the buttons that are in the top panel when working with a file.
|
2022-11-23 17:33:24 +03:00 |
|
|
5d6e0b17c9
|
Web:Common:Fix hover.
|
2022-11-23 14:52:36 +03:00 |
|
Viktor Fomin
|
5c997947f8
|
Common: Article: fix close
|
2022-11-23 14:45:22 +05:00 |
|
|
9ad9127eeb
|
Web: Removed the ability to delete a room without being in the archive.
|
2022-11-22 17:12:32 +03:00 |
|
|
ff53dc882e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-22 17:03:12 +03:00 |
|
|
407dd9c74e
|
Update socket.js
Fix work of early subscriptions to socket events
|
2022-11-22 16:59:23 +03:00 |
|
|
4cbe007ac4
|
Web:Components:Fix button border.
|
2022-11-22 16:39:40 +03:00 |
|
|
76b9752791
|
Web:Common:With a dark theme, added icon highlighting.
|
2022-11-22 16:18:23 +03:00 |
|
|
e74f9b538a
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-22 16:02:25 +03:00 |
|
|
513de72854
|
Web:Common:Fix pin.
|
2022-11-21 18:53:07 +03:00 |
|
|
1d4168c81d
|
Web:Common:Fix.
|
2022-11-21 18:46:59 +03:00 |
|
|
98df2d2e3d
|
Web:Common:Add class filter-text.
|
2022-11-21 16:05:47 +03:00 |
|
TimofeyBoyko
|
a78e3ef29f
|
Web:Common:DialogAsideLoader: delete useless code
|
2022-11-21 13:48:56 +03:00 |
|
TimofeyBoyko
|
12e8686839
|
Web:Common:DialogAsideLoader: fix styles
|
2022-11-21 13:45:36 +03:00 |
|
|
7bbc8f4781
|
Merge branch 'develop' into bugfix/access-rights
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2022-11-21 11:23:16 +03:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
045c98258f
|
Web: Added check for archive folder.
|
2022-11-21 10:37:10 +03:00 |
|
|
f68789220e
|
Web: Refactoring.
|
2022-11-21 10:02:31 +03:00 |
|
|
c41a4bb17f
|
Web: Fixed error.
|
2022-11-21 10:01:12 +03:00 |
|
|
ec35693308
|
Merge pull request #1059 from ONLYOFFICE/bugfix/fix-info-panel
Web:Common:Add close InfoPanel for unmounting a component.
|
2022-11-18 18:33:41 +03:00 |
|
|
dee6ba8f60
|
Web: Common: fixed article loader
|
2022-11-18 18:17:17 +03:00 |
|
|
28b8ac504e
|
Web: Common: added getArchiveFileRoleActions
|
2022-11-18 18:01:58 +03:00 |
|
Akmal Isomadinov
|
b65f887f6b
|
Web:Common:Components:FilterInput: Updated id
|
2022-11-18 19:43:03 +05:00 |
|
|
94ce8ff399
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-18 17:41:40 +03:00 |
|
Akmal Isomadinov
|
7266f8ebb2
|
Web:Common:Components:FilterInput: Refactoring id
|
2022-11-18 19:16:45 +05:00 |
|
|
f445ff6a6a
|
Merge branch 'develop' into feature/Add-id-for-filter
|
2022-11-18 16:47:39 +03:00 |
|
|
36798c4241
|
Web:Common:Add close InfoPanel for unmounting a component.
|
2022-11-18 15:48:50 +03:00 |
|
|
d26c875f0a
|
Web: Added canCopy function.
|
2022-11-18 15:34:40 +03:00 |
|
TimofeyBoyko
|
1eaa81b43b
|
Web:Common:Api: fix request body for unarchive
|
2022-11-18 14:53:09 +03:00 |
|
|
811c58e4da
|
Web: Added canPinRoom function.
|
2022-11-18 14:11:39 +03:00 |
|
|
37952ee5b9
|
Web: Files: fixed display members tab for viewer
|
2022-11-18 14:05:22 +03:00 |
|
|
d29088c33f
|
Web: Common: added getArchiveRoomRoleActions
|
2022-11-18 14:04:29 +03:00 |
|
|
8bc024d260
|
Web: Added canMakeForm function.
|
2022-11-18 11:58:17 +03:00 |
|
Akmal Isomadinov
|
a1a056d2cd
|
Web:Common:Components:FilterInput:Sub-Components:SelectedItem Added className
|
2022-11-18 13:53:21 +05:00 |
|
|
1bd4897199
|
Web:Client:Fix theme.
|
2022-11-18 11:41:55 +03:00 |
|
|
90a0250ea8
|
Web:Common:Fix CatalogItem theme.
|
2022-11-18 11:30:12 +03:00 |
|
Akmal Isomadinov
|
986b77057e
|
Web:Common:Constants: Removed FilterTypeKeys constant
|
2022-11-18 13:10:52 +05:00 |
|
Akmal Isomadinov
|
cec0943a36
|
Web:Common:Components:FilterInput:Sub-Components:SortButton: Added id
|
2022-11-18 13:10:07 +05:00 |
|
Akmal Isomadinov
|
259b28f6e1
|
Web:Common:components:FilterInput:sub-components:FilterBlockItem Refactoring and added ids
|
2022-11-18 13:09:24 +05:00 |
|
|
39aa6cb0b2
|
Web:Common:Add MobileProgressBarTheme.
|
2022-11-17 22:32:01 +03:00 |
|
|
23dab23399
|
Web:Client:Fix submenu theme.
|
2022-11-17 22:31:15 +03:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
f306a525fb
|
Web:Common:Add ProgressTheme.
|
2022-11-17 12:27:32 +03:00 |
|
Akmal Isomadinov
|
4f4cdbfe63
|
Web:Common:Components:FilterInput Added ids
|
2022-11-16 20:33:19 +05:00 |
|
Akmal Isomadinov
|
fe6ec38dff
|
Web:Common:Constants: Added FilterTypeKeys
|
2022-11-16 20:31:14 +05:00 |
|
Viktor Fomin
|
893cc3f541
|
Common: move more login modal
|
2022-11-16 17:23:15 +05:00 |
|
|
0b22183c41
|
Web:Common:Fix button.
|
2022-11-16 14:26:04 +03:00 |
|