Commit Graph

5813 Commits

Author SHA1 Message Date
Artem Tarasov
a6b4a8452f Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-11-23 13:58:54 +03:00
Artem Tarasov
4e197b38e8 web: common: bump version 2020-11-23 13:41:28 +03:00
Artem Tarasov
23cbb58c2a web: components: bump version 2020-11-23 13:41:20 +03:00
Artem Tarasov
a82d20767f Web: Comnon: NavMenu: fixed history passing in header-nav 2020-11-23 13:06:09 +03:00
Artem Tarasov
d4c353e80a Web: Components: Avatar: fixed badge position in profile-menu 2020-11-23 13:04:14 +03:00
Artem Tarasov
b6b5d1f027 web: common: bump version 2020-11-20 18:31:30 +03:00
Artem Tarasov
14f0045684 Web: Common: FilterInput: fixed position of combo-button-label when there are hidden blocks 2020-11-20 18:29:55 +03:00
Artem Tarasov
924172d0c7 Web: Common: FilterInput: fixed condition for displaying sort button for tablet 2020-11-20 13:25:11 +03:00
Artem Tarasov
13366e4b7a web: common: bump version 2020-11-20 13:14:05 +03:00
Artem Tarasov
56d2286f63 Merge branch 'develop' into bugfix/filter-fix 2020-11-20 13:09:04 +03:00
Artem Tarasov
9930f25672 Web: Common: FilterInput: fixed max-height for dropdown 2020-11-20 11:13:52 +03:00
Alexey Kostenko
51490b2536 web: components: bump version 2020-11-20 09:55:08 +03:00
Alexey Kostenko
b10458e6d2 web: common: bump version 2020-11-20 09:54:48 +03:00
Alexey Kostenko
3a6cfe80ea Web: Common: FilterInput: Fixed z index in mobile devices 2020-11-19 17:06:50 +03:00
Artem Tarasov
44efee86dd Web: Common: FilterInput: fixed the appearance of the sort button on tablets 2020-11-19 16:03:55 +03:00
Artem Tarasov
fbdb29f751 Web: Common: FilterInput: fixed heigh of filter items 2020-11-19 13:50:26 +03:00
Alexey Kostenko
14f125f6e4 Web: Common: Opening GroupSelector/PeopleSelector in aside panel if section Width small 2020-11-19 12:13:39 +03:00
Alexey Kostenko
8e4a1a4053 Web: Common: FilterInput small refactoring 2020-11-19 11:49:02 +03:00
Alexey Kostenko
f428df1767 Web: Common/Components: Open add filter menu in aside panel if there is not enough width to open dropdown 2020-11-18 17:34:59 +03:00
Alexey Kostenko
7b204da979 Web: Common: Added searchWidth prop to FilterButton 2020-11-18 12:19:51 +03:00
Alexey Kostenko
ea10c332db Web: Components: IconButton: Fixed onClick event (The onClick function was triggered on the onMouseUp event) 2020-11-18 10:10:48 +03:00
Alexey Kostenko
150d98fb89 Web: Common: Fixed warning 2020-11-17 14:55:39 +03:00
Alexey Kostenko
d86304ff48 Web: Components: Added unsubscribe from events when unmounting a component 2020-11-17 14:55:39 +03:00
Alexey Kostenko
c9f7e22fcf Web: Common/Components: Fixed typo 2020-11-17 14:55:39 +03:00
Artem Tarasov
8d5f8b6be9 web: common: bump version 2020-11-17 11:56:45 +03:00
Artem Tarasov
09986bc929 web: components: bump version 2020-11-17 11:56:36 +03:00
Artem Tarasov
efacc50ac4 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-17 11:48:55 +03:00
Alexey Kostenko
a46806ae24 web: common: bump version 2020-11-17 10:32:14 +03:00
Alexey Kostenko
3702bd597d Web: Common: Refactoring HOC withLayoutSize 2020-11-17 10:32:02 +03:00
Alexey Kostenko
c6d4b5bf60 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-17 08:11:35 +03:00
Alexey Kostenko
ee26c7c148 web: common: bump version 2020-11-17 08:11:11 +03:00
Alexey Kostenko
8db2b5b3d0 Web: Common: Code cleaning 2020-11-17 08:05:47 +03:00
Alexey Kostenko
32e633cee9 Web: Common: Added HOC withLayoutSize 2020-11-17 06:29:24 +03:00
Artem Tarasov
06d9d2500a Web: Common: PageLayout: deleted console.log 2020-11-16 17:51:00 +03:00
Artem Tarasov
8d56195705 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-16 17:35:43 +03:00
cd523404f1 Merge branch 'develop' into refactoring/scope 2020-11-16 17:09:19 +03:00
Artem Tarasov
dde9fcf285 Web: Common: Loaders.HistroyRows: fixed styles 2020-11-16 16:39:36 +03:00
Artem Tarasov
24f2603135 Web: Common: Loaders: added Loader for Version History page 2020-11-16 15:24:26 +03:00
Alexey Kostenko
af8ce86d2d Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-16 12:36:55 +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
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
Artem Tarasov
ca4c71f714 Merge branch 'develop' into feature/version-hostory-redesign 2020-11-13 14:00:30 +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