Vladislav Makhov
|
c483acfde3
|
this.state decompose
|
2020-11-05 18:14:59 +03:00 |
|
|
abc89c0e11
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-05 18:12:32 +03:00 |
|
Vladislav Makhov
|
49acf0168c
|
Moved declarations out from render
|
2020-11-05 18:11:32 +03:00 |
|
|
e22de56363
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-05 17:45:54 +03:00 |
|
Artem Tarasov
|
30adb42aaa
|
Web: Files: added new icons for folder 24x24
|
2020-11-05 17:22:45 +03:00 |
|
Artem Tarasov
|
c2ea1cc19e
|
Web: Files: settings: fixed gap between toggle button
|
2020-11-05 16:58:29 +03:00 |
|
Artem Tarasov
|
1fce8d0c03
|
Web: Components: toggle-button: fixed size icon
|
2020-11-05 16:56:15 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Viktor Fomin
|
ed84e89b94
|
web: common: bump version
|
2020-11-05 12:24:33 +03:00 |
|
Viktor Fomin
|
71bf070324
|
Web: Client: fix loader
|
2020-11-05 12:24:15 +03:00 |
|
Viktor Fomin
|
63015ca2bd
|
Web: Common: fix color
|
2020-11-05 12:23:50 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Artem Tarasov
|
91019b19bd
|
web: common: bump version
|
2020-11-05 11:50:08 +03:00 |
|
Artem Tarasov
|
29b6e1d213
|
web: components: bump version
|
2020-11-05 11:50:01 +03:00 |
|
Artem Tarasov
|
c44990418e
|
Web: Components: fix bugs related to adding prop size="min"
|
2020-11-05 11:49:00 +03:00 |
|
Artem Tarasov
|
ace2111197
|
Web: People: applied prop size for Avatar Component
|
2020-11-05 11:40:19 +03:00 |
|
Artem Tarasov
|
b077f450b5
|
Web: Client: applied prop size for Avatar Component
|
2020-11-05 11:39:56 +03:00 |
|
Artem Tarasov
|
481abf40f8
|
Web: Common: applied prop size for Avatar Component
|
2020-11-05 11:39:09 +03:00 |
|
Artem Tarasov
|
c310545a83
|
Web: Components: applied props size="min"
|
2020-11-05 11:35:44 +03:00 |
|
Artem Tarasov
|
39d00f3dc4
|
Web: Components: Avatar: add props size='min'
|
2020-11-05 11:34:14 +03:00 |
|
Viktor Fomin
|
e2a32c10d6
|
Web: Common: added one row
|
2020-11-05 11:16:55 +03:00 |
|
Viktor Fomin
|
3bdff517f9
|
Web: People: rename headers components
|
2020-11-05 11:16:33 +03:00 |
|
Viktor Fomin
|
081fe180bb
|
Web: Files: rename headers components
|
2020-11-05 11:15:46 +03:00 |
|
Viktor Fomin
|
e4f6dd255e
|
Web: Common: rename headers components
|
2020-11-05 11:15:15 +03:00 |
|
Artem Tarasov
|
df9a1658e9
|
Web: People: refactoring
|
2020-11-05 09:44:20 +03:00 |
|
Artem Tarasov
|
6a4cabcedf
|
Web: Components/Files/People: fix styles
|
2020-11-05 09:22:14 +03:00 |
|
Diana
|
cc1774c121
|
fix tests/shared documents
|
2020-11-05 03:05:08 +03:00 |
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
|
aea74a82e8
|
Mobile: fix
|
2020-11-04 14:15:14 +03:00 |
|
Viktor Fomin
|
1c2e8e5c67
|
Web: Common: create headline loader
|
2020-11-04 12:27:56 +03:00 |
|
Viktor Fomin
|
37fc3fff7c
|
Web: Common: added x, y props
|
2020-11-04 12:24:52 +03:00 |
|
Viktor Fomin
|
72467a70c2
|
Web: People: fix header loader
|
2020-11-04 12:24:02 +03:00 |
|
Viktor Fomin
|
1fc0d91182
|
Web: Files: fix header loader
|
2020-11-04 12:23:35 +03:00 |
|
Viktor Fomin
|
46a9fe2e45
|
Web: Common: Create head loader
|
2020-11-04 12:21:13 +03:00 |
|
Viktor Fomin
|
0efd774bba
|
Web: Common: Create rows loader
|
2020-11-04 01:54:44 +03:00 |
|
Viktor Fomin
|
a591a48e13
|
Web: Common: create tree folder loader
|
2020-11-03 23:00:43 +03:00 |
|
Viktor Fomin
|
234b323633
|
Web: Common: fix coordinate x
|
2020-11-03 22:59:36 +03:00 |
|
|
5a959892ae
|
Merge pull request #114 from ONLYOFFICE/feature/connect-controlPanel
Feature/connect control panel
|
2020-11-03 21:14:44 +03:00 |
|
Viktor Fomin
|
c58a22748c
|
Web: Common: Create circle loader
|
2020-11-03 20:22:32 +03:00 |
|
Viktor Fomin
|
f02e32894b
|
Web: Common: added rectangle loader
|
2020-11-03 18:37:08 +03:00 |
|
Viktor Fomin
|
91c254c638
|
Web: Common: fix main button loader
|
2020-11-03 18:36:19 +03:00 |
|
Viktor Fomin
|
e99cdff1ad
|
Web: Common: fix column size
|
2020-11-03 18:35:44 +03:00 |
|
Viktor Fomin
|
e9d3fe1775
|
Web: Common: added props for rectangle loader
|
2020-11-03 18:34:39 +03:00 |
|
Viktor Fomin
|
6ffd937480
|
Web: Common: fix loader style constant
|
2020-11-03 18:33:32 +03:00 |
|
|
8cfbf8cc7f
|
Api: fix attachments
|
2020-11-03 18:16:23 +03:00 |
|
Vladislav Makhov
|
550d08dc51
|
Fix modal
|
2020-11-03 17:48:05 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +03:00 |
|
Artem Tarasov
|
c09df3bec8
|
Web: Components: tree-menu: fixed draggable
|
2020-11-03 17:35:56 +03:00 |
|
|
04003a0fa4
|
Web: Common: update lock file
|
2020-11-03 17:26:47 +03:00 |
|
|
7da4a806ff
|
Web: Components: added new icons
|
2020-11-03 17:26:21 +03:00 |
|