Timofey Boyko
|
620c44d834
|
Fixed Bug 60170 - Rooms. New member not showing up in Info/Members panel after adding.
|
2022-12-16 13:56:47 +03:00 |
|
|
|
966de4f2f2
|
Merge pull request #1126 from ONLYOFFICE/feature/logo
Feature/logo
|
2022-12-16 14:30:06 +04:00 |
|
Timofey Boyko
|
30692753bf
|
Web: remove logoHandlers
|
2022-12-15 18:41:19 +03:00 |
|
Mushka Nikita
|
0617a953d7
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-12-15 17:51:43 +03:00 |
|
Mushka Nikita
|
0b8412cb77
|
fixed aside close button styking
|
2022-12-15 17:51:33 +03:00 |
|
Mushka Nikita
|
53c50fba9a
|
improved filterblockItem interactive area
|
2022-12-15 17:35:06 +03:00 |
|
Mushka Nikita
|
8a9a35717c
|
fixed infoPanel and invitePanel overlaying
|
2022-12-15 17:34:41 +03:00 |
|
|
|
0cf0ffbadb
|
Merge branch 'release/rc-v1.2.0' into feature/advanced-security
|
2022-12-15 15:18:06 +03:00 |
|
|
|
5ccbda995b
|
Web: Deleted getArchiveRoomRoleActions;
|
2022-12-14 19:42:12 +03:00 |
|
|
|
c209e55210
|
Web: Deleted useless code.
|
2022-12-14 19:35:35 +03:00 |
|
Akmal Isomadinov
|
ae8040e7c0
|
Web:Common:Api:People:Filter Added getFilterWithOutDisabledUser static method
|
2022-12-14 18:17:15 +05:00 |
|
Timofey Boyko
|
3f588be767
|
Web:Common:API: refactoring getLogoIcon
|
2022-12-13 10:40:03 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
be698591d2
|
Merge branch 'develop' into bugfix/room-logo
|
2022-12-12 18:07:59 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
|
273d4cc8d5
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-12-12 17:02:35 +03:00 |
|
|
|
f7c7302bd5
|
Web:Common:Added info panel for Empty Container Room Created.
|
2022-12-12 17:02:21 +03:00 |
|
Mushka Nikita
|
55598886bb
|
returned feed translations and added new way of getting them
|
2022-12-12 15:38:15 +03:00 |
|
Timofey Boyko
|
5991cf3127
|
Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-12 14:14:33 +03:00 |
|
Timofey Boyko
|
1e59cf4db9
|
Web:Common:Navigation: fix navigation mobile styles
|
2022-12-12 14:14:03 +03:00 |
|
Akmal Isomadinov
|
687f8d9b07
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-12 14:42:29 +05:00 |
|
Akmal Isomadinov
|
ab27132eb5
|
Web:Fixed Sort button
|
2022-12-12 14:42:15 +05:00 |
|
Timofey Boyko
|
3e9f9ee526
|
Web:Common:InfoPanelStore: fix icon for archive room
|
2022-12-12 12:14:31 +03:00 |
|
Timofey Boyko
|
0a0640dda3
|
Web:Common:InfoPanelStore: fix icon for archive
|
2022-12-11 23:44:49 +03:00 |
|
Timofey Boyko
|
8dd0b37250
|
Web:Common:API: fix for archive rooms getFolderInfo and getRoomInfo
|
2022-12-11 23:44:33 +03:00 |
|
Timofey Boyko
|
68324dd5f1
|
Web: delete useless
|
2022-12-11 23:02:25 +03:00 |
|
Timofey Boyko
|
965b394789
|
Web:Common:API: update getFolder and getFolderInfo with getLogoIcon
|
2022-12-11 22:55:21 +03:00 |
|
Timofey Boyko
|
9b96920d7f
|
Web:Common:API: add getLogoIcon method, update getRooms and getRoomInfo methods with getLogoIcon
|
2022-12-11 22:54:31 +03:00 |
|
|
|
32ad4c9e2b
|
Web: Removed ability to delete users in the archive room.
|
2022-12-09 18:38:58 +03:00 |
|
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
Viktor Fomin
|
f3c2c3830e
|
Common: API: add login method
|
2022-12-09 10:40:38 +03:00 |
|
Timofey Boyko
|
8abbb0f250
|
Web:Common:Article: fix show text button color
|
2022-12-08 16:24:34 +03:00 |
|
Mushka Nikita
|
0aaf8d7c27
|
fixed bug with loaders in formGallery infoPanel
|
2022-12-08 14:33:50 +03:00 |
|
|
|
a03b50bd7c
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-07 16:20:29 +03:00 |
|
|
|
546c57017f
|
Web: Components: Added theme provider to circle svg.
|
2022-12-07 12:50:17 +03:00 |
|
|
|
918bd1cc0b
|
Web: Added color for filter tags on hover, change color for dark theme.
|
2022-12-07 11:38: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 |
|
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 |
|
Viktor Fomin
|
15ff7aa19d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-06 16:50:55 +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 |
|
Akmal Isomadinov
|
65f8f27359
|
Web:Common:Components:ColorTheme:Styled:TextInput fixed the border color TextInput dark theme
|
2022-12-05 16:49:13 +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 |
|
|
|
8e0bc0a732
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-02 19:56:43 +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 |
|
Viktor Fomin
|
14a0ed5541
|
Common: UserStore: fix get user theme
|
2022-12-02 15:38:35 +03:00 |
|
Viktor Fomin
|
eef250fa10
|
Common: SettingsStore: add request
|
2022-12-02 15:34:54 +03:00 |
|
Viktor Fomin
|
b8b0fe9139
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-02 14:55:23 +03:00 |
|
|
|
0f96d279d3
|
Fix some UselessTranslationKeysTest issues
|
2022-12-02 14:28:02 +03:00 |
|
|
|
b0a8c93054
|
Merge branch 'develop' into feature/new-docspace-translations
|
2022-12-01 18:43:19 +03:00 |
|
Viktor Fomin
|
9951111cd3
|
Common: AuthStore: add methods
|
2022-12-01 18:27:18 +03:00 |
|
|
|
c84faa2bc0
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-01 17:57:55 +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 |
|
Timofey Boyko
|
e4df954e8e
|
Web: delete console log
|
2022-12-01 11:55:29 +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
|
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 |
|
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 |
|
|
|
89f8195939
|
Web: Common: fixed navigation separator
|
2022-11-30 18:21:40 +03:00 |
|
Timofey Boyko
|
16a3e65c71
|
Web:Common:Constants: add new filter subject enum
|
2022-11-30 17:15:02 +03:00 |
|
Timofey Boyko
|
266fdabda9
|
Web:Common:API: add payments parametr
|
2022-11-30 15:47:34 +03:00 |
|
Timofey Boyko
|
9933e577e6
|
Web:Common:Constants: fix payments enum
|
2022-11-30 15:47:11 +03:00 |
|
Timofey Boyko
|
b2b137336c
|
Web:Common:API: add employeetype for accounts filter
|
2022-11-30 15:24:03 +03:00 |
|
|
|
6c5de0cf2d
|
Web: Common: added separator to navigation
|
2022-11-30 13:09:37 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
Timofey Boyko
|
a2213c9366
|
Web:Common:Constants: add new payments enum
|
2022-11-30 12:24:12 +03:00 |
|
Akmal Isomadinov
|
2f7db64c95
|
Web:Common:Components:Headline:Headline Fixed undefined className
|
2022-11-30 11:48:26 +05:00 |
|
|
|
8fb9fd6640
|
Web: Files: added route to new room, removed useless code
|
2022-11-29 18:05:44 +03:00 |
|
Akmal Isomadinov
|
95b903a28e
|
merge develop
|
2022-11-29 17:07:54 +05:00 |
|
Elyor Djalilov
|
d88331c704
|
deleted duplicate keys
|
2022-11-28 21:41:21 +05:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
Timofey Boyko
|
3703d3f7aa
|
Merge branch 'develop' into bugfix/149
|
2022-11-25 20:53:31 +03:00 |
|
Akmal Isomadinov
|
cdfe014a99
|
Web:Common:Components:Navigation:Sub-Components Added id
|
2022-11-25 19:51:24 +05:00 |
|
Akmal Isomadinov
|
dc3693358d
|
Web: Updated ids infoPanel
|
2022-11-25 19:43:51 +05:00 |
|
|
|
8826c473eb
|
Merge branch 'develop' into bugfix/fix-article-iphone
|
2022-11-25 15:40:47 +03:00 |
|
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 |
|
|
|
78f406f4d3
|
Merge pull request #1084 from ONLYOFFICE/bugfix/payments-page-loading
Bugfix/payments page loading
|
2022-11-25 14:13:03 +03:00 |
|
|
|
f929e42dcb
|
Merge branch 'develop' into bugfix/fix-article-iphone
|
2022-11-25 14:04:37 +03:00 |
|
|
|
ac236c8399
|
Web: Fixed checks.
|
2022-11-25 13:24:27 +03:00 |
|
|
|
95ff7c57e8
|
Web: Changed dependency array.
|
2022-11-25 13:08:34 +03:00 |
|
|
|
0999986a8c
|
Web: Renamed function.
|
2022-11-25 12:32:43 +03:00 |
|
|
|
4469e4aa63
|
Web: Added waiting for receiving information on the tariff on the payment page.
|
2022-11-25 12:31:18 +03:00 |
|
|
|
23a7210fbc
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 20:33:59 +03:00 |
|
Viktor Fomin
|
e48ffdd62f
|
Common: Article: delete console
|
2022-11-24 12:16:23 +05:00 |
|
Viktor Fomin
|
f52ec4e467
|
Common: Article: fix
|
2022-11-24 05:39:13 +05:00 |
|
Viktor Fomin
|
f80fcd591e
|
Common: get user theme
|
2022-11-24 05:39:00 +05:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05: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
|
fd181baae3
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 15:01:42 +05:00 |
|
Viktor Fomin
|
5c997947f8
|
Common: Article: fix close
|
2022-11-23 14:45:22 +05:00 |
|
Viktor Fomin
|
004aceda28
|
Common: Article: fix logo
|
2022-11-23 06:19:01 +05:00 |
|
Viktor Fomin
|
c2fb9f583e
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 04:36:46 +05:00 |
|
