Commit Graph

3139 Commits

Author SHA1 Message Date
b0617ac111
Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:35:51 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
TatianaLopaeva
8e455a134f web: components: bump version 2020-12-10 11:49:00 +03:00
TatianaLopaeva
4cc62d8fe5 Merge branch 'develop' into bugfix/toast 2020-12-09 15:36:05 +03:00
TatianaLopaeva
eee2808ed4 Web: Components: Removed unnecessary comparison that prevented correct display of toasters when changing the screen width & refactoring 2020-12-09 15:34:10 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
3c6639c9c9 web: components: bump version 2020-12-08 18:26:47 +03:00
Alexey Kostenko
3a94023ba7 Web: Components: Added custom filter icon 2020-12-08 18:24:04 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
Alexey Kostenko
bc5b17367c Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 17:45:40 +03:00
Alexey Kostenko
74fb9dc052 web: components: bump version 2020-12-08 17:45:19 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b Web: Added fast-deep-equal 2020-12-08 14:08:26 +03:00
TatianaLopaeva
34583dde7f Web: Common: Added logic for toasts that stack on top of each other and line up one after the other when clicked 2020-12-08 13:15:22 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Viktor Fomin
982ce4e12c
Merge branch 'develop' into feature/floating-button 2020-12-07 14:50:49 +03:00
Viktor Fomin
2be2085655 Update yarn.lock files 2020-12-07 14:48:09 +03:00
Alexey Kostenko
b1373ddef7 web: components: bump version 2020-12-07 14:13:21 +03:00
Alexey Kostenko
149adcc372 Merge branch 'develop' into bugfix/sharing-settings 2020-12-07 13:44:42 +03:00
Viktor Fomin
b693cbdd4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 13:19:32 +03:00
Alexey Kostenko
3c2c0140c4 Web: Components: Added prop "color" to TextArea component 2020-12-07 10:40:18 +03:00
Ilya Oleshko
049f7971f1 web: components: bump version 2020-12-07 09:52:29 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
4574c6172a web: components: bump version 2020-12-03 18:10:05 +03:00
d4e5208115 Web: Components: removed margin-top from row-container 2020-12-03 18:00:16 +03:00
Alexey Kostenko
d63a012929 Web: Components: Fixed warning 2020-12-02 11:05:06 +03:00
Alexey Kostenko
23b209b85c Merge branch 'develop' into bugfix/sharing-settings 2020-12-02 09:14:36 +03:00
Viktor Fomin
0d1f1a4599 Update yarn.lock files 2020-12-01 16:26:13 +03:00
Ilya Oleshko
2ee49e80d9 Merge branch 'develop' into bugfix/login-fix 2020-11-30 15:56:30 +03:00
Viktor Fomin
2c8b384ef1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-30 15:17:48 +03:00
f10f6b8d3b Update yarn.lock files 2020-11-30 15:11:23 +03:00
Ilya Oleshko
3c0381c03f web: components: bump version 2020-11-30 15:03:08 +03:00
Ilya Oleshko
292dc42d52 Web: Components : Input, Textarea : Fixed placeholder color 2020-11-30 15:02:56 +03:00
30b5c5781f Web: Components: fixed avatar background color 2020-11-30 15:02:15 +03:00
5e10d983f3 Web: Components: fixed display of tooltip in password input 2020-11-28 15:36:33 +03:00
d280c474ac Web: Components: fixed date-picker styled, refactoring 2020-11-28 13:25:01 +03:00
b65ef058e1 Web: Components: fixed alignment of icons 2020-11-28 13:21:02 +03:00
f1b4176527 Web: Components: fixed alignment of icons 2020-11-28 13:16:25 +03:00
bc1e8e80a8 Web: Components: Grid: fixed gridColumnGap prop, added export 2020-11-28 13:13:28 +03:00
a6174d184c Web: Components: added default color prop to help-button 2020-11-28 13:10:58 +03:00
a22742671d Web: Components: fixed input-block icons size 2020-11-28 13:09:56 +03:00
165001aad8 Web: Components: fixed tree-menu catalog color 2020-11-28 13:09:08 +03:00
97e033ac68 Web: Components: fixed text alignment in the buttons 2020-11-28 13:06:57 +03:00
13757f9dae Web: Components: updated icons 2020-11-28 13:01:18 +03:00
d2a3382b17 web: components: bump version 2020-11-27 10:59:15 +03:00
2210f0f6ba Web: Components: fixed row icons alignment 2020-11-27 10:58:30 +03:00
3272910d8e web: components: bump version 2020-11-26 16:46:58 +03:00
dc5e2ff4a2 Web: Components: fixed icons in row-content 2020-11-26 16:43:31 +03:00