|
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 |
|
|
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 |
|
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 |
|
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 |
|
|
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 |
|
TimofeyBoyko
|
62bc6506a9
|
Merge branch 'develop' into bugfix/fix-article-iphone
|
2022-11-22 19:20:51 +03:00 |
|
TimofeyBoyko
|
0ac219e2d6
|
Web:Client: fix article mobile main button
|
2022-11-22 19:20:07 +03: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 |
|
Akmal Isomadinov
|
a5d09b9904
|
Merge branch 'develop' into Add-id-for-header-of-main-folders
|
2022-11-22 18:54:00 +05:00 |
|
|
4cbe007ac4
|
Web:Components:Fix button border.
|
2022-11-22 16:39:40 +03:00 |
|