Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
TatianaLopaeva
|
f121d1a84d
|
Web: Common: Splitting files to fix the error when switching from desktop to tablet
|
2020-11-16 12:29:12 +03:00 |
|
TatianaLopaeva
|
108f575645
|
Web: Common/Components: Fixed after merge
|
2020-11-16 11:00:12 +03:00 |
|
TatianaLopaeva
|
18d792c2c7
|
Web: Common: Changed context of section-body, deleted Box and unnecessary classes
|
2020-11-16 10:51:52 +03:00 |
|
TatianaLopaeva
|
e6fac866fe
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
|
2020-11-16 10:29:35 +03:00 |
|
Alexey Kostenko
|
c58d720db2
|
web: common: bump version
|
2020-11-16 09:05:54 +03:00 |
|
Alexey Kostenko
|
4b2848d639
|
Web: Common: FilterInput: Fixed bug with reset sorting
|
2020-11-16 08:10:07 +03:00 |
|
TatianaLopaeva
|
55e2feb18d
|
Web: Common: Added listener for current window width and changed context, deleted Box and unnecessary classes
|
2020-11-15 19:15:48 +03:00 |
|
TatianaLopaeva
|
19833e45d4
|
Web: Common: Added increase height of article when drop-down is open
|
2020-11-15 16:56:21 +03:00 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Alexey Kostenko
|
bfecfc31d3
|
web: common: bump version
|
2020-11-13 10:58:50 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
Alexey Kostenko
|
969f7e5c4f
|
Web: Common: FilterInput: Refactoring
|
2020-11-13 10:26:14 +03:00 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Viktor Fomin
|
02081905e8
|
web: common: bump version
|
2020-11-12 15:01:46 +03:00 |
|
Viktor Fomin
|
2df7830782
|
Web: Common: fix unauth logo loader
|
2020-11-12 15:01:38 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
f66fc4c7ba
|
Web: Client: fix
|
2020-11-12 14:36:42 +03:00 |
|
Alexey Kostenko
|
9d6ad1538e
|
Web: Common: FilterInput: Fixed warning
|
2020-11-12 14:18:36 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
5ef5ea5d0c
|
web: common: bump version
|
2020-11-12 13:32:37 +03:00 |
|
Viktor Fomin
|
9a7237aea0
|
Web: Client: added header loader
|
2020-11-12 13:31:48 +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 |
|
TatianaLopaeva
|
171c2695d9
|
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
|
2020-11-11 20:31:52 +03:00 |
|
TatianaLopaeva
|
89bb769b92
|
Web: Common: Fix scrolling position when opening or editing a profile, refactoring Layout
|
2020-11-11 20:29:57 +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 |
|
Ilya Oleshko
|
1abe1dbbc9
|
web: components: bump version
|
2020-11-11 17:37:41 +03:00 |
|
Ilya Oleshko
|
20a02e9a8a
|
Web: Components : DropDown : Fixed calculating open direction
|
2020-11-11 17:37:34 +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 |
|
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 |
|
TatianaLopaeva
|
58ee96df1f
|
Web: Common: Fixed display of header
|
2020-11-11 12:09:19 +03:00 |
|
Viktor Fomin
|
e8954feadf
|
Web: Common: delete x, y props, added border radius knobs
|
2020-11-11 11:38:30 +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 |
|
TatianaLopaeva
|
b8cb6f2508
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
|
2020-11-11 10:13:03 +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 |
|
TatianaLopaeva
|
77f0bc0493
|
Web: Common: Added padding for section-header
|
2020-11-10 19:45:29 +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 |
|
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 |
|
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 |
|
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 |
|
TatianaLopaeva
|
67cf0a4364
|
Web: Common: Return position fixed for pin-panel
|
2020-11-10 11:14:36 +03:00 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +03:00 |
|
TatianaLopaeva
|
326d2e50a9
|
Web: Common: Changed height and deleted position fixed for article
|
2020-11-10 10:52:06 +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 |
|
