Commit Graph

5875 Commits

Author SHA1 Message Date
Vladislav Makhov
0c549c5e0c Add getEncryptionKeys callback 2020-11-12 11:49:44 +03:00
Vladislav Makhov
ce42fb6106 Add key "encryptionKeys" to reducer 2020-11-12 11:49:09 +03:00
Alexey Kostenko
baa81cc6d0 Web: Common: FilterInput: Fixed bug when selecting an option 2020-11-12 11:47:34 +03:00
Alexey Kostenko
2779c12db9 Web: Common: Fixed hiding/adding filter items 2020-11-12 11:13:12 +03:00
Viktor Fomin
4d34d8c964 Web: Common: fix header loader in nav menu 2020-11-12 02:26:21 +03:00
Viktor Fomin
9303703685 Web: Common: fix header loader 2020-11-12 02:25:34 +03:00
Viktor Fomin
80cdbe643e Web: Common: delete loader box 2020-11-12 00:42:14 +03:00
Viktor Fomin
a801fcb603 Web: Common: fix logo loading 2020-11-12 00:32:40 +03:00
Viktor Fomin
e52c7d45b2 Web: Common: export group loader 2020-11-12 00:12:12 +03:00
Viktor Fomin
e7e8c6cb88 Web: Common: created group loader 2020-11-12 00:10:41 +03:00
Viktor Fomin
45e9ab5aea Merge branch 'develop' into feature/filter-loader 2020-11-11 23:26:03 +03:00
d8bd2b7d21 Update yarn.lock files 2020-11-11 22:03:47 +03:00
8c7d0746cd web: common: bump version 2020-11-11 21:55:43 +03:00
c4411f7b00
Merge branch 'develop' into hotfix/section-loader 2020-11-11 21:54:02 +03:00
Viktor Fomin
d2a30544d6 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-11 17:38:10 +03:00
Viktor Fomin
91bc88ad28 Update yarn.lock files 2020-11-11 17:37:48 +03:00
Viktor Fomin
0b4d99c6ae web: common: bump version 2020-11-11 17:33:02 +03:00
Viktor Fomin
a7b7fa4e75 Web: Common: fix 2020-11-11 17:32:38 +03:00
Viktor Fomin
2cc252c2ae
Merge branch 'develop' into feature/filter-loader 2020-11-11 16:42:22 +03:00
Artem Tarasov
006ac1bb19 Update yarn.lock files 2020-11-11 16:16:30 +03:00
Artem Tarasov
bcd4744798 web: components: bump version 2020-11-11 16:05:34 +03:00
Vladislav Makhov
fd93f234d0 Refactoring 2020-11-11 15:47:37 +03:00
Artem Tarasov
252f0d9bde Web: Components: aside: fixed transform: translateX 2020-11-11 15:42:45 +03:00
Viktor Fomin
b44c638bd2
Merge branch 'develop' into feature/filter-loader 2020-11-11 13:45:50 +03:00
Alexey Kostenko
28dec136a7 Web: Common: Added new loader state to redux 2020-11-11 13:43:30 +03:00
Viktor Fomin
40e2d85dbd Update yarn.lock files 2020-11-11 13:27:17 +03:00
Viktor Fomin
742ee7d9b5 web: common: bump version 2020-11-11 13:22:56 +03:00
Viktor Fomin
eb18518bbf Web: Common: fix NavMenu header loader 2020-11-11 13:22:40 +03:00
Alexey Kostenko
3cad7a62ad Web: Common: FilterInput: Changed the width calculated method 2020-11-11 12:36:07 +03:00
6c5728a1cb Merge branch 'develop' into feature/oauth 2020-11-11 12:14:05 +03:00
09c07e5060 Api: ThirdPartyController 2020-11-11 12:11:44 +03:00
Viktor Fomin
e8954feadf Web: Common: delete x, y props, added border radius knobs 2020-11-11 11:38:30 +03:00
Vladislav Makhov
a3d2ead825 Merge branch 'develop' into feature/desktop-view 2020-11-11 11:22:11 +03:00
Viktor Fomin
fea69360b7 Web: Common: fix ProfileAction loader opacity 2020-11-11 11:19:29 +03:00
Alexey Kostenko
eb58b76024 Web: Common: FilterInput: Fixed filter when change orientation on mobile devices 2020-11-11 10:42:28 +03:00
Alexey Kostenko
71e4989f5a Web: Common: FilterInput: fixed sort comboBox 2020-11-11 10:02:00 +03:00
Alexey Kostenko
b81dc68ef7 Web: Common: FilterInput: Fixed sort comboBox 2020-11-11 09:48:33 +03:00
Alexey Kostenko
b6d0ebad21 Web: Common: FilterInput: Small refactoring 2020-11-11 09:36:19 +03:00
Alexey Kostenko
4ee688427f Web: Common: FilterInput: Page resize is tracked through a prop 2020-11-11 07:42:38 +03:00
Alexey Kostenko
e29eeb2f4b Web: Common/Client: FilterInput: Added sectionWidth prop 2020-11-11 07:27:42 +03:00
Viktor Fomin
0852dd0814 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-10 18:25:25 +03:00
Viktor Fomin
d6b92a59be Web: Client: fix first loader 2020-11-10 18:21:11 +03:00
Viktor Fomin
df4c89cb91
Merge branch 'develop' into feature/filter-loader 2020-11-10 18:09:58 +03:00
Viktor Fomin
0490c8c3f0 Update yarn.lock files 2020-11-10 18:08:51 +03:00
Viktor Fomin
c16074a861 web: common: bump version 2020-11-10 18:02:18 +03:00
Viktor Fomin
cfa08f5f25 Web: Common: fix circular dependency 2020-11-10 18:02:03 +03:00
Viktor Fomin
deb1168683 Web: Common: divided RowLoader and RowsLoader into two components 2020-11-10 17:58:19 +03:00
Viktor Fomin
81ca31c1b8 Web: Common: take styles out of components 2020-11-10 17:54:38 +03:00
Vladislav Makhov
73359b5049 Add several callbacks 2020-11-10 17:37:44 +03:00
Viktor Fomin
ba420d2ad6 Web: Common: fix props 2020-11-10 17:31:25 +03:00
Viktor Fomin
710c169bf0 Web: Common: destructuring props 2020-11-10 17:29:11 +03:00
Vladislav Makhov
cc828a69bd Add actions 2020-11-10 17:05:59 +03:00
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
Alexey Kostenko
a52f07e4e0 Web: Common: FilterInput: Decreased the minimum size of the search field 2020-11-10 14:28:49 +03:00
Alexey Kostenko
8825610fb5 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-10 13:59:55 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
Artem Tarasov
4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
Vladislav Makhov
c45466bfe5 Add working with privacyroom/access/{fileId} 2020-11-10 12:57:05 +03:00
Vladislav Makhov
4a55bd9b81 Add working with privacyroom/keys 2020-11-10 12:54:05 +03:00
Alexey Kostenko
8d43d5efaa Web: Common: FilterInput: Fixed transition between mobile and desktop state, and change direction bug 2020-11-10 12:44:04 +03:00
1490332568 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader 2020-11-10 11:02:29 +03:00
Vladislav Makhov
3415cc046c Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-11-10 11:02:14 +03:00
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
706d0e65c7 web: common: bump version 2020-11-10 10:42:02 +03:00
Viktor Fomin
0a59504ccc Web: Common: fix opacity const 2020-11-10 10:41:21 +03:00
Viktor Fomin
022f28c676 Web: Client: delete first header preloader 2020-11-10 10:41:00 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Vladislav Makhov
633a5415c0 Fix url 2020-11-10 08:14:56 +03:00
Viktor Fomin
d34beb7caf Web: Common: created profile view loader 2020-11-10 02:56:30 +03:00
Viktor Fomin
796059bbfa Web: Common: added propTypes 2020-11-10 01:03:19 +03:00
Viktor Fomin
515bd0d05f Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-09 23:02:18 +03:00
Viktor Fomin
a7dee56194 Update yarn.lock files 2020-11-09 23:01:57 +03:00
Viktor Fomin
4962b0e996 web: common: bump version 2020-11-09 22:57:09 +03:00
Viktor Fomin
f553257760 Web: Common: fix colors 2020-11-09 22:56:21 +03:00
4dd9c6f554 Update yarn.lock files 2020-11-09 22:35:39 +03:00
b1c8fd8b67 web: common: bump version 2020-11-09 22:15:31 +03:00
d012aa6071 Merge branch 'develop' into feature/filter-loader
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-11-09 22:15:04 +03:00
Artem Tarasov
2f19e504aa Web: Components: refactoring css rule, deleted incorrect description 2020-11-09 19:02:40 +03:00
Artem Tarasov
066140f388 Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal 2020-11-09 18:59:06 +03:00
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
Alexey Kostenko
56bdfb9826 Web: Common: FilterInput: Fixed reset filter 2020-11-09 17:52:24 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Viktor Fomin
372db7f819 Web: Common: added isRectangle props in readme 2020-11-09 16:49:37 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Viktor Fomin
b857e98a79 web: common: bump version 2020-11-09 16:39:41 +03:00
Viktor Fomin
8b72b19401 Web: Common: fix column gap 2020-11-09 16:38:13 +03:00
Viktor Fomin
3d5b3a9784 Web: Common: added rectangle or circle props in rows loader 2020-11-09 16:25:59 +03:00
Vladislav Makhov
21234d6a39 Remove unused data 2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
Alexey Kostenko
c19be92b35 Web: Common: FilterInput: Fixed component initialization 2020-11-09 16:05:53 +03:00
Viktor Fomin
a6352c87ee Web: Common: added title props for loaders 2020-11-09 16:02:08 +03:00
Alexey Kostenko
6bfaae5d2f Web: Common: FilterInput: Fixed filter when selected new item filter items, fixed infinite rendering in small mobile devices 2020-11-09 16:01:29 +03:00
Vladislav Makhov
7c6d5a9e54 Add translation 2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6 Fix title 2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36 Fix Help center link 2020-11-09 15:27:07 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Viktor Fomin
b3f4bd3f64 Update yarn.lock files 2020-11-09 15:16:44 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
Viktor Fomin
f053f78e47 web: common: bump version 2020-11-09 15:11:44 +03:00
Viktor Fomin
835b6a2b62 Web: Client: fix first loader 2020-11-09 15:11:17 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Viktor Fomin
86c5962621 Web: Common: added readme for stories 2020-11-09 14:45:57 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
c427dbd03d web: common: bump version 2020-11-09 13:12:07 +03:00
Viktor Fomin
d12dbd797c Web: Common: fix loaders if not auth 2020-11-09 13:08:51 +03:00
Viktor Fomin
96276d23af Web: Client: delete logo 2020-11-09 13:07:58 +03:00
Vladislav Makhov
eeced56986 Refactoring 2020-11-09 13:03:18 +03:00
Artem Tarasov
c2dfeb591c web: common: bump version 2020-11-09 12:43:27 +03:00
Artem Tarasov
9aedb02748 web: components: bump version 2020-11-09 12:43:20 +03:00
Artem Tarasov
3c557194df Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows 2020-11-09 12:38:35 +03:00
Viktor Fomin
adc6347d21 Web: Common: fix story for header loader 2020-11-09 12:35:48 +03:00
Viktor Fomin
a7da70bb8b Web: Common: fix loader style opacity constant 2020-11-09 12:35:06 +03:00
Viktor Fomin
950dca9a2a Web: Common: added prop types 2020-11-09 12:34:25 +03:00
Viktor Fomin
55143dfbd0 Web: Common: fix props 2020-11-09 12:33:59 +03:00
Viktor Fomin
ac7b6bf362 Web: Common: fix header loader opacity 2020-11-09 12:33:13 +03:00
Viktor Fomin
7c5e683be2 Web: Common: added decorator section in storybook 2020-11-09 12:32:11 +03:00
Artem Tarasov
9805c086fe Web: Components: groups-button-menu: fixed position when viewed from desktop 2020-11-09 12:24:40 +03:00
Alexey Kostenko
433d0d399f Web: Common: FilterInput: Fixed filter when added/removed filter items 2020-11-09 12:12:26 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Vladislav Makhov
430c7ae73d Remove unused code 2020-11-09 12:05:17 +03:00
Vladislav Makhov
d569e8dd74 Refactoring 2020-11-09 12:02:03 +03:00
Artem Tarasov
f9ea759a26 Web: Components: Row: fixed position share btn 2020-11-09 11:19:21 +03:00
Alexey Kostenko
20f92245f4 Web: Common: FilterInput: Fixed adding elements when screen zooms in 2020-11-09 09:26:03 +03:00
Vladislav Makhov
102837ed04 Add selector 2020-11-09 09:16:44 +03:00
Vladislav Makhov
d4f2c16140 Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-11-06 19:18:42 +03:00
Vladislav Makhov
6f38b66255 Add react-string-format lib 2020-11-06 19:18:32 +03:00
Viktor Fomin
f6b82ac707 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-06 18:46:03 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Viktor Fomin
291869e830 web: common: bump version 2020-11-06 18:39:02 +03:00
Viktor Fomin
d8e541498c Web: Common: add header loader 2020-11-06 18:26:32 +03:00
Viktor Fomin
24bdcdf04d Web: Common: create header loader stories 2020-11-06 18:25:40 +03:00
Artem Tarasov
f7257af395 Web: Components: input-block/password-input: fixed padding for .prepend > div in password-input 2020-11-06 18:05:00 +03:00
Viktor Fomin
0134d7a2d8 Web: Common: fix logo 2020-11-06 17:45:54 +03:00
Viktor Fomin
eaa7e270bb Web: Common: add logoUrl setting 2020-11-06 17:44:51 +03:00
Viktor Fomin
916d8f9b0c Web: Common: create header loader 2020-11-06 17:43:59 +03:00
9d696b73f6 Revert "Fix resources"
This reverts commit ec0ace1f59.
2020-11-06 16:59:50 +03:00
Artem Tarasov
fdcf5ccf96 Web: Components: Row: fixed margin StyledElement 2020-11-06 16:58:08 +03:00
Artem Tarasov
612661a22b Web: Files/Common: MainButton: fixed line-height 2020-11-06 16:43:14 +03:00
ec0ace1f59 Fix resources 2020-11-06 16:32:37 +03:00
Vladislav Makhov
c9eeeed26e Add separator 2020-11-06 16:20:27 +03:00
Viktor Fomin
4dc0e0d13d Web: Client: fix color 2020-11-06 16:17:20 +03:00
Artem Tarasov
c791fa29aa Web: Files/Common: PageLayout: fixed margin-top in Header 2020-11-06 16:15:03 +03:00
Viktor Fomin
98dabb19ab Web: Common: use ternary operator 2020-11-06 15:58:30 +03:00
Viktor Fomin
2d78e10011 Web: Common: hide AddonPanel 2020-11-06 15:51:31 +03:00
Viktor Fomin
ffd23c59b4 Web: Common: create stories 2020-11-06 15:39:31 +03:00