Commit Graph

2886 Commits

Author SHA1 Message Date
615f514bfd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-10-09 17:24:50 +03:00
Ilya Oleshko
ef545675d2 web: components: bump version 2020-10-09 17:08:40 +03:00
Ilya Oleshko
5e8a4727ac Web: Components : Row : Added contentElement 2020-10-09 17:07:35 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
718dc8cc5a Web: Files: fixed dragging 2020-10-08 17:54:04 +03:00
TatianaLopaeva
5c328f596e web: components: bump version 2020-10-07 15:38:27 +03:00
TatianaLopaeva
de7e4fe062 Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-10-07 15:14:54 +03:00
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
5738e82451 web: components: bump version 2020-10-07 12:49:14 +03:00
TatianaLopaeva
ee460787d5 Web: Components: Refactoring 2020-10-07 10:59:31 +03:00
TatianaLopaeva
da9611bd4b Merge branch 'feature/files' into feature/empty-screen 2020-10-07 10:58:27 +03:00
TatianaLopaeva
d5dbebfe1e Web: Components: Refactoring 2020-10-05 21:22:03 +03:00
TatianaLopaeva
2b848be23d Web: Components: Change styles by layout 2020-10-05 20:38:13 +03:00
b741d9c7d7 Web: Components: Remove debugger 2020-10-05 18:25:24 +03:00
TatianaLopaeva
b3d82c1e25 Changed font-style and font-weight for EmptyScreenContainer 2020-10-05 16:20:33 +03:00
0add76cd16 Web: Components: Added fix of error displaying 2020-10-05 16:09:35 +03:00
4629dfd077 web: components: bump version 2020-10-05 14:28:30 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
TatianaLopaeva
ea2f5ec097 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-29 09:06:16 +03:00
Alexey Kostenko
d7ce84f7a2 web: components: bump version 2020-09-29 08:14:43 +03:00
Alexey Kostenko
d29e743a2b Web: Components: Changed animation of toast notifications, fixed styles for mobile devices 2020-09-29 08:14:29 +03:00
TatianaLopaeva
48854fcb5e Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 10:14:35 +03:00
TatianaLopaeva
eac4556983 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-25 10:44:31 +03:00
Alexey Kostenko
881793cf25 web: components: bump version 2020-09-25 09:43:03 +03:00
Alexey Kostenko
3a9d6f704d Web: Components: Fix toast styles 2020-09-25 09:42:56 +03:00
Alexey Kostenko
aca3543ec1 web: components: bump version 2020-09-25 09:02:14 +03:00
Alexey Kostenko
a8f987cca8 Web: Components: Restyle Toast 2020-09-25 09:01:05 +03:00
TatianaLopaeva
a99796c122 Changed padding by figma layout 2020-09-24 14:14:47 +03:00
TatianaLopaeva
89f11d6484 Refactoring button/index 2020-09-24 14:11:34 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
Artem Tarasov
202b277f3d web: components: bump version 2020-09-23 14:13:02 +03:00
Artem Tarasov
b09e770834 Web: Components: tree-menu: fixed margin-left of swithcer 2020-09-23 14:09:04 +03:00
e6f39b1092 web: components: bump version 2020-09-22 17:07:20 +03:00
4892f01960 Web: Components: fixed context menu clickability 2020-09-22 17:06:58 +03:00
Artem Tarasov
4d90d03407 web: components: bump version 2020-09-22 15:43:56 +03:00
Artem Tarasov
0dbbbc3ab6 Web: Components: fixed color props passing in row-content 2020-09-22 15:14:44 +03:00
b761e83e22 web: components: bump version 2020-09-22 09:23:56 +03:00
7a665f229e Web: Components: fixed hiding items on iOS devices 2020-09-22 09:23:27 +03:00
TatianaLopaeva
ca420104fc Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
52753d7bc3 web: components: bump version 2020-09-18 15:57:24 +03:00
809d167e29 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-18 15:54:55 +03:00
44d63d3642 Web: Components: fixed Dnd styles 2020-09-18 15:43:08 +03:00
Alexey Kostenko
04bf97ff08 Web: Components: Bump version 2020-09-18 10:45:02 +03:00
Alexey Kostenko
ab2a7b7fdb Web: Components: Fix DropDown in mainMutton 2020-09-18 10:44:30 +03:00
Alexey Kostenko
67137aae94 Web: Components: Bump version 2020-09-18 10:13:38 +03:00
Alexey Kostenko
c88bca4a4b Web: Components: Fix ContextMenu background in Firefox 2020-09-18 10:13:06 +03:00
TatianaLopaeva
fbb0787eff Added AcceptLicense 2020-09-17 17:07:32 +03:00
Alexey Kostenko
24a92d7e67 Web: Common/Components: Bump version 2020-09-17 16:50:37 +03:00