Commit Graph

3904 Commits

Author SHA1 Message Date
Daniil Senkiv
37732015b3 web.common: Layout: NavItem: applied Link component 2019-12-24 11:53:34 +03:00
c617590f9f Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 11:49:35 +03:00
20a7b07899 ASC.Web.Components: button: excess icon removed 2019-12-24 11:49:27 +03:00
Nikolay Rechkin
9e0995ac00
Merge pull request #17 from ONLYOFFICE/feature/ef
Feature/ef
2019-12-24 10:54:47 +03:00
be8f2b2136 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 10:11:03 +03:00
f7e7cff729 ASC.Web.Common: PageLayout: hidden article-header on tablets 2019-12-24 10:10:53 +03:00
10e9a07c18 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-24 09:56:14 +03:00
ddf5a606a1 web: Update yarn.lock files 2019-12-24 09:56:03 +03:00
20189f6c4c Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-24 09:53:13 +03:00
6a4e992c70 ASC.People: Home page: user link fontWeight changed 2019-12-24 09:52:54 +03:00
15dfd0cbe3 web: common: bump version 2019-12-24 09:52:38 +03:00
3339475631 web: components: bump version 2019-12-24 09:52:25 +03:00
e076fd3e82 ASC.Web.Components: link: fontWeight prop added 2019-12-24 09:51:46 +03:00
Daniil Senkiv
f2d5bfdc82 web.client: Settings: revert (6ab8348aad) 2019-12-23 18:34:49 +03:00
Daniil Senkiv
7b4c1f6154 web.common: StudioLayout: added translations 2019-12-23 18:30:31 +03:00
a8f8b63414 EF: removed old classes 2019-12-23 17:57:21 +03:00
Daniil Senkiv
6ab8348aad Web.Client: Settings: Article: Body: commented SCU 2019-12-23 17:42:44 +03:00
04be312da4 EF: tenants. Use entity 2019-12-23 17:26:38 +03:00
c293eaa3c0 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-23 16:45:55 +03:00
0133c45840 ASC.Web.Common: Layout, PageLayout : indentation corrected 2019-12-23 16:41:52 +03:00
51a9b78749 EF: feed. AddOrUpdate 2019-12-23 16:36:37 +03:00
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
5e1a9445db ASC.Web.Common: section-toggler: styles fixed 2019-12-23 16:25:29 +03:00
Ilya Oleshko
fa85899213 web: components: bump version 2019-12-23 16:15:18 +03:00
Ilya Oleshko
18ef7738f5 web: Components: Fixed width for DropDown and DropDownItem components 2019-12-23 16:14:46 +03:00
6e1c99883a ASC.Web.Common: ArticlePinPanel: styles and texts fixed 2019-12-23 16:07:38 +03:00
Daniil Senkiv
75f00016cf
Merge pull request #20 from ONLYOFFICE/feature/consumers
Feature/consumers
2019-12-23 15:59:50 +03:00
224e6adc45 Merge branch 'master' into feature/consumers 2019-12-23 15:57:49 +03:00
496854b0d1 Consumer: rename param name to key 2019-12-23 15:57:09 +03:00
79931ef547 ASC.Web.Common: Layout: fix nav-item style 2019-12-23 15:53:10 +03:00
8c1e7933de ASC.Web.Common: Layout: fix header style 2019-12-23 15:52:30 +03:00
a808e803aa ASC.Web.Common: Layout: fix opened logo style 2019-12-23 15:52:04 +03:00
445fd9c1c8 ASC.Web.Common: Layout: hover delay increased 2019-12-23 15:51:08 +03:00
56374f8a72 ASC.Web.Components: Iconts: updated nav.logo.opened.react.svg 2019-12-23 15:47:36 +03:00
2b5dd8b3cf Merge branch 'master' into feature/ef 2019-12-23 15:47:10 +03:00
fc3ead33db ASC.Web.Common: ModuleTile: fix import 2019-12-23 15:46:41 +03:00
7a7436e3c5 ASC.Web.Common: Headline: Added new type 'header', style changes by new design 2019-12-23 15:45:40 +03:00
82cc503636 EF: table renamed 2019-12-23 15:41:43 +03:00
26d02ba215 EF: Mail. QuotaError - bool 2019-12-23 15:38:26 +03:00
7b9d09c380 ASC.Web.Components: Text: Ability to set fontWeight as a string (e.g. bold) 2019-12-23 15:33:58 +03:00
618a98e077 Merge branch 'feature/ef' of github.com:ONLYOFFICE/AppServer into feature/ef 2019-12-23 15:02:07 +03:00
2097fcdb32 EF: removed comment 2019-12-23 15:01:48 +03:00
Ilya Oleshko
dddb098783 web: components: bump version 2019-12-23 14:41:42 +03:00
Ilya Oleshko
56bfbe3ab8 web: Components: Fixed icon display for PasswordInput component 2019-12-23 14:34:56 +03:00
Ilya Oleshko
0c6e6af987 web: components: bump version 2019-12-23 14:22:06 +03:00
Ilya Oleshko
e779b06b1d web: Components: Fixed icon colors for PasswordInput component 2019-12-23 14:22:01 +03:00
Ilya Oleshko
4410b3815d web: components: bump version 2019-12-23 14:21:23 +03:00
Ilya Oleshko
eb50db4b44 web: components: bump version 2019-12-23 14:11:10 +03:00
Ilya Oleshko
cfd1e3e510 web: Components: Fixed styles of PasswordInput component 2019-12-23 14:10:45 +03:00
Ilya Oleshko
122b315a5a Web: People: Fixed Import button visibility at Article component 2019-12-23 14:06:29 +03:00