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 |
|
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 |
|
|
|
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 |
|
TimofeyBoyko
|
d2e272f15a
|
Web:Common:Section: add render info-panel with portal for mobile devices
|
2022-11-22 13:21:59 +03:00 |
|
TimofeyBoyko
|
60d83d8170
|
Web:Common:FilterInput: add render filter block with portal for mobile devices
|
2022-11-22 12:38:45 +03:00 |
|
TimofeyBoyko
|
91835c2b95
|
Web:Common:Article: add render with portal for mobile devices
|
2022-11-22 12:16:53 +03:00 |
|
Viktor Fomin
|
50c55f0e29
|
Common: fix logo
|
2022-11-22 13:06:07 +05:00 |
|
Akmal Isomadinov
|
8daa9b5291
|
Web:Common:Components:Navigation: Added ids
|
2022-11-22 12:49:07 +05:00 |
|
Viktor Fomin
|
248b2017ad
|
Common: API: delete useless
|
2022-11-22 12:34:57 +05:00 |
|
Elyor Djalilov
|
5b32fd4eb2
|
fixed style context menu
|
2022-11-22 11:49:46 +05: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 |
|
sk81.biz@gmail.com
|
af5829d92a
|
Mod package.json origin: https://system.onlyoffice.io
|
2022-11-21 14:39:12 +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 |
|
|
|
69944587b9
|
fix
|
2022-11-20 20:02:32 +03:00 |
|
|
|
0f49b15dd6
|
fix
|
2022-11-19 21:01:47 +03:00 |
|
|
|
9bcaf62b9a
|
temp
|
2022-11-18 21:54:05 +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 |
|
|
|
f557a3e177
|
Merge branch 'develop' into feature/api-origin
|
2022-11-17 20:26:07 +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 |
|
|
|
8b9683022c
|
Update axiosClient.js
|
2022-11-16 18:00:41 +03: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 |
|
|
|
bd38e39796
|
Addec temp origin to apitest.onlyoffice.io
|
2022-11-15 17:21:45 +03:00 |
|
|
|
4a313d77d6
|
Merge branch 'develop' into feature/api-origin
|
2022-11-15 16:00:39 +03:00 |
|
|
|
60c70fea1d
|
Merge pull request #1037 from ONLYOFFICE/bugfix/fix-rooms-badge-jumping
Bugfix/fix rooms badge jumping
|
2022-11-15 13:43:31 +03:00 |
|
TimofeyBoyko
|
93beb16763
|
Web:Common:ColorTheme: fix pin icon styles
|
2022-11-15 13:28:35 +03:00 |
|
|
|
7c0d97361d
|
Merge branch 'develop' into feature/Add-identifier-for-test
|
2022-11-15 10:38:41 +03:00 |
|
|
|
b3db2e5f3e
|
Update axiosClient.js
|
2022-11-14 19:46:07 +03:00 |
|
|
|
8a909c33d2
|
Merge branch 'develop' into feature/api-origin
|
2022-11-14 17:17:14 +03:00 |
|
|
|
ec49254d56
|
Web:Common:Fix.
|
2022-11-14 17:06:27 +03:00 |
|
|
|
54ccbe0969
|
Web:Common:Fix toggleButton.
|
2022-11-14 17:02:20 +03:00 |
|
|
|
2b3d368a98
|
Web:Common:Fix theme.
|
2022-11-14 16:42:07 +03:00 |
|
|
|
78de751702
|
Web:Common:Fix buttons color theme.
|
2022-11-14 15:52:20 +03:00 |
|
|
|
2636ec0705
|
Web:Common:Fix accent color theme.
|
2022-11-14 15:51:53 +03:00 |
|
Viktor Fomin
|
6b241edca6
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-14 17:13:47 +05:00 |
|
Akmal Isomadinov
|
f96d664904
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:38:32 +05:00 |
|
Akmal Isomadinov
|
c6ac0e417c
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:19:03 +05:00 |
|
Akmal Isomadinov
|
94ea046a68
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:15:51 +05:00 |
|
Akmal Isomadinov
|
8dda8926ee
|
Web:Common:Constants Added FolderNames constant
|
2022-11-14 15:04:50 +05:00 |
|
TimofeyBoyko
|
05de3adde7
|
Web:Common:Utirls: delete accessRights and add actions for rooms, files and accounts
|
2022-11-14 12:03:49 +03:00 |
|
Akmal Isomadinov
|
6dcc9cb541
|
Web:Common:Components:Dialogs:RecoverAccessModalDialog: Updated id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
d81ad1a7fe
|
Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
e37776195a
|
Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
bc942c568c
|
Web:Common:Components:Article:Sub-Components:Article-Profile: Added id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
23faa6f5ee
|
Web:Common:Components:Article:Sub-Components: Added id for test
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
fe47936dfb
|
Web:Common:Components:Dialogs: Added ids to the RecoverAccessModalDialog components for the test
|
2022-11-14 13:04:17 +05:00 |
|
TimofeyBoyko
|
5f9a777c2d
|
Web:Common:AccessRights: rename getAccountsAccessRights to getAccountsRights
|
2022-11-14 10:36:51 +03:00 |
|
TimofeyBoyko
|
678f2f0629
|
Merge branch 'develop' into feature/accerss-rights-matrix
|
2022-11-14 10:30:19 +03:00 |
|
|
|
8da3deaa72
|
Added api_origin
|
2022-11-13 22:38:33 +03:00 |
|
Viktor Fomin
|
8c2fb8f8e8
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-13 03:59:43 +05:00 |
|
|
|
75ca934448
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-11 22:22:40 +03:00 |
|
TimofeyBoyko
|
21a1c0c10d
|
Web:Common:Utils: fix get room rights
|
2022-11-11 17:34:39 +03:00 |
|
TimofeyBoyko
|
5e52c802df
|
Web:Common:Utils: add access rights matrix for accounts
|
2022-11-11 16:26:05 +03:00 |
|
TimofeyBoyko
|
5bbc75f8bf
|
Web:Common:Utils: add access rights matrix
|
2022-11-11 15:58:41 +03:00 |
|
|
|
8e54e59bec
|
Web: Common/Editor: Added a request for requests in advance.
|
2022-11-11 13:52:10 +03:00 |
|
|
|
724de88e94
|
Web: Common: Added skip requests.
|
2022-11-11 13:49:03 +03:00 |
|
Viktor Fomin
|
60852375ca
|
Common: Loaders: ProfileViewLoader: fix
|
2022-11-10 19:53:32 +05:00 |
|
|
|
ddc067f3f0
|
Web:Common:Fix theme.
|
2022-11-10 17:29:55 +03:00 |
|
Viktor Fomin
|
68a4e8cb7c
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-10 18:45:22 +05:00 |
|
Viktor Fomin
|
559d995b2c
|
Common: Loaders: ProfileViewLoader: add mobile view
|
2022-11-10 18:45:09 +05:00 |
|
Viktor Fomin
|
719d0a7a12
|
Common: Loaders: ProfileViewLoader: redesign
|
2022-11-10 18:17:09 +05:00 |
|
|
|
564ec4457f
|
Web:Common:Add textColor in toggle button.
|
2022-11-10 15:33:19 +03:00 |
|
