Commit Graph

27632 Commits

Author SHA1 Message Date
0518c19426
Merge pull request #819 from ONLYOFFICE/feature/remove-waste
Feature/remove waste
2022-11-07 19:32:24 +03:00
d9b02f3f49 removed slnf 2022-11-07 19:23:31 +03:00
Elyor Djalilov
74ef2c3ad2 Merge branch 'develop' into bugfix/border-style 2022-11-07 20:55:14 +05:00
ede75ced63 Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop 2022-11-07 18:53:12 +03:00
0f88170316 Fix yarn deploy on MacOS 2022-11-07 18:52:57 +03:00
87290aa5a1
Merge pull request #986 from ONLYOFFICE/feature/new-ui-button
Feature/new UI button
2022-11-07 18:44:12 +03:00
Elyor Djalilov
f2c6bf7b00 bugfix/fixed bug with border style 2022-11-07 20:43:08 +05:00
Akmal Isomadinov
8195b01ab4 Web:Components:Button Removed letter-spacing and rollback Themes 2022-11-07 18:41:06 +05:00
a70e2339d9
Merge pull request #993 from ONLYOFFICE/bugfix/hide-menu
Bugfix/hide menu
2022-11-07 15:10:01 +03:00
42d11bec95
Merge pull request #991 from ONLYOFFICE/bugfix/info-panel-links
Bugfix/info panel links
2022-11-07 15:05:15 +03:00
Viktor Fomin
f6486d80b0 Merge branch 'develop' into bugfix/hide-menu 2022-11-07 16:59:22 +05:00
Viktor Fomin
657ccbb7c8 Common: Article: add support color scheme 2022-11-07 16:58:53 +05:00
Akmal Isomadinov
4555f023ad Web:Components:Button: Fix: font weight and padding 2022-11-07 16:57:54 +05:00
bc358ae54c build: added scipt for change service start timeout 2022-11-07 14:57:05 +03:00
1b0a46303e Web: Removed the link if the user does not have rights. 2022-11-07 14:22:37 +03:00
59583b798a
Merge pull request #985 from ONLYOFFICE/bugfix/smart-banner
Bugfix/banners
2022-11-07 14:13:10 +03:00
Viktor Fomin
dc5833d328 Client: Layout: delete useless 2022-11-07 16:10:20 +05:00
be6530c8ff Web: Removed the link if the user does not have rights. 2022-11-07 14:03:18 +03:00
c3c19aba39 fix migration 2022-11-07 13:43:49 +03:00
Akmal Isomadinov
1c860d40b2 Web:Components:Loader Fix size loader 2022-11-07 15:37:32 +05:00
Viktor Fomin
d88c619876 Client: SmartBanner: delete useless 2022-11-07 15:36:24 +05:00
Viktor Fomin
1cb56a31fe Merge branch 'develop' into bugfix/smart-banner 2022-11-07 15:09:16 +05:00
Viktor Fomin
a9c07394e4 Client: fix layout vh 2022-11-07 15:09:06 +05:00
bb881b7510 Web: Fixed translation. 2022-11-07 13:02:37 +03:00
ddf5021e3f Web: Fixed translation. 2022-11-07 12:57:24 +03:00
a8b4662317 Web: Fixed the transition to the profile. 2022-11-07 12:54:51 +03:00
786155e660
Merge pull request #990 from ONLYOFFICE/bugfix/fixed-checkbox-styles
Web: Components: fixed checkbox styles
2022-11-07 12:51:02 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
82db9ca04b Web: Components: fixed checkbox styles 2022-11-07 12:44:56 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
Akmal Isomadinov
81f698f305 Merge branch 'feature/new-ui-button' of github.com:ONLYOFFICE/DocSpace into feature/new-ui-button 2022-11-07 13:53:37 +05:00
Akmal Isomadinov
7d510a8026 Web:Components:Button: Removed sizes nomralDescktop and normalTouchScreen from props 2022-11-07 13:50:55 +05:00
Akmal Isomadinov
5d86dca159 Web:components:Loader:Type:Track: Fixed error with colors 2022-11-07 13:43:43 +05:00
Akmal Isomadinov
00ef6a947b Web:Components:Utils: Add hook useId 2022-11-07 13:38:26 +05:00
39311cf724 Merge branch 'develop' into feature/new-ui-button 2022-11-07 11:37:43 +03:00
Akmal Isomadinov
7eee21d74e Web:Components: Refactoring button size, removed normalDesktop and normalTouchScreen 2022-11-07 13:27:00 +05:00
14a64f4ad0 Merge branch 'develop' into feature/remove-waste
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
cb4290ebf6
Merge pull request #989 from ONLYOFFICE/bugfix/payments-page-translation
Bugfix/payments page translation
2022-11-07 11:13:42 +03:00
062b398c26 Web: Fixed the height of benefits container. 2022-11-07 11:08:51 +03:00
fa81d93116 Web: An empty space has been removed in the absence of a container with benefits. 2022-11-07 10:47:18 +03:00
7073fc2fce Web: Changed translation. 2022-11-07 10:43:32 +03:00
dbd34303f1 Web: Fixed translation key. 2022-11-07 10:41:35 +03:00
Akmal Isomadinov
6066c76540 Web:components:Loader:Track: Reduced width of the loader track 2022-11-07 11:58:18 +05:00
Akmal Isomadinov
dd50b03ebf Web:Component:Button: Refactoring button loader 2022-11-07 11:30:10 +05:00
Akmal Isomadinov
4370c38ea7 Web:Components:Loader: Add StyledTrack and refactoring Loader component 2022-11-07 11:29:03 +05:00
Akmal Isomadinov
c4f20530b8 Web:Components:Button: Removed the old loader and added a new track loader 2022-11-04 19:29:42 +05:00
Akmal Isomadinov
bd0ef5d204 Web:Components:Loader: Add new track loader 2022-11-04 19:27:58 +05:00
Elyor Djalilov
0ea27d2ba8 bugfix: badge style 2022-11-04 18:08:01 +05:00
Akmal Isomadinov
c81351fed2 Web:Components:Theme:Fix Changed the background color and border color 2022-11-04 17:36:23 +05:00
Akmal Isomadinov
ac76354f6e Web:Components:Utils Color name changed 2022-11-04 17:28:10 +05:00