Commit Graph

5875 Commits

Author SHA1 Message Date
Viktor Fomin
710c169bf0 Web: Common: destructuring props 2020-11-10 17:29:11 +03:00
Vladislav Makhov
cc828a69bd Add actions 2020-11-10 17:05:59 +03:00
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
Alexey Kostenko
a52f07e4e0 Web: Common: FilterInput: Decreased the minimum size of the search field 2020-11-10 14:28:49 +03:00
Alexey Kostenko
8825610fb5 Merge branch 'develop' into hotfix/filter-input-hotfix 2020-11-10 13:59:55 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
Artem Tarasov
4031a609b8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
Vladislav Makhov
c45466bfe5 Add working with privacyroom/access/{fileId} 2020-11-10 12:57:05 +03:00
Vladislav Makhov
4a55bd9b81 Add working with privacyroom/keys 2020-11-10 12:54:05 +03:00
Alexey Kostenko
8d43d5efaa Web: Common: FilterInput: Fixed transition between mobile and desktop state, and change direction bug 2020-11-10 12:44:04 +03:00
1490332568 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader 2020-11-10 11:02:29 +03:00
Vladislav Makhov
3415cc046c Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-11-10 11:02:14 +03:00
Viktor Fomin
834e8e6516 Update yarn.lock files 2020-11-10 10:46:26 +03:00
Viktor Fomin
706d0e65c7 web: common: bump version 2020-11-10 10:42:02 +03:00
Viktor Fomin
0a59504ccc Web: Common: fix opacity const 2020-11-10 10:41:21 +03:00
Viktor Fomin
022f28c676 Web: Client: delete first header preloader 2020-11-10 10:41:00 +03:00
Vladislav Makhov
9cc469a51c Merge branch 'develop' into feature/third-party-settings 2020-11-10 08:39:33 +03:00
Vladislav Makhov
633a5415c0 Fix url 2020-11-10 08:14:56 +03:00
Viktor Fomin
d34beb7caf Web: Common: created profile view loader 2020-11-10 02:56:30 +03:00
Viktor Fomin
796059bbfa Web: Common: added propTypes 2020-11-10 01:03:19 +03:00
Viktor Fomin
515bd0d05f Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-09 23:02:18 +03:00
Viktor Fomin
a7dee56194 Update yarn.lock files 2020-11-09 23:01:57 +03:00
Viktor Fomin
4962b0e996 web: common: bump version 2020-11-09 22:57:09 +03:00
Viktor Fomin
f553257760 Web: Common: fix colors 2020-11-09 22:56:21 +03:00
4dd9c6f554 Update yarn.lock files 2020-11-09 22:35:39 +03:00
b1c8fd8b67 web: common: bump version 2020-11-09 22:15:31 +03:00
d012aa6071 Merge branch 'develop' into feature/filter-loader
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-11-09 22:15:04 +03:00
Artem Tarasov
2f19e504aa Web: Components: refactoring css rule, deleted incorrect description 2020-11-09 19:02:40 +03:00
Artem Tarasov
066140f388 Web: Files\Components: VersionHistory: removed tags from css rule, added className for header and body in modal 2020-11-09 18:59:06 +03:00
Vladislav Makhov
0df2b1e956 web: common: bump version 2020-11-09 18:48:08 +03:00
Artem Tarasov
57ca2d2603 Web: Files/Components: fixed viewBox for folder.svg, fixed margin between checkbox and icon of file 2020-11-09 18:33:45 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
Alexey Kostenko
56bdfb9826 Web: Common: FilterInput: Fixed reset filter 2020-11-09 17:52:24 +03:00
Viktor Fomin
6e8685d8d6 Update yarn.lock files 2020-11-09 16:54:13 +03:00
Viktor Fomin
372db7f819 Web: Common: added isRectangle props in readme 2020-11-09 16:49:37 +03:00
Vladislav Makhov
982fbdd593 Merge branch 'develop' into feature/third-party-settings 2020-11-09 16:44:18 +03:00
Viktor Fomin
b857e98a79 web: common: bump version 2020-11-09 16:39:41 +03:00
Viktor Fomin
8b72b19401 Web: Common: fix column gap 2020-11-09 16:38:13 +03:00
Viktor Fomin
3d5b3a9784 Web: Common: added rectangle or circle props in rows loader 2020-11-09 16:25:59 +03:00
Vladislav Makhov
21234d6a39 Remove unused data 2020-11-09 16:24:32 +03:00
Vladislav Makhov
078bb238fd Add url to store 2020-11-09 16:15:36 +03:00
Alexey Kostenko
c19be92b35 Web: Common: FilterInput: Fixed component initialization 2020-11-09 16:05:53 +03:00
Viktor Fomin
a6352c87ee Web: Common: added title props for loaders 2020-11-09 16:02:08 +03:00
Alexey Kostenko
6bfaae5d2f Web: Common: FilterInput: Fixed filter when selected new item filter items, fixed infinite rendering in small mobile devices 2020-11-09 16:01:29 +03:00
Vladislav Makhov
7c6d5a9e54 Add translation 2020-11-09 15:58:58 +03:00
Vladislav Makhov
8ac2ad73d6 Fix title 2020-11-09 15:31:24 +03:00
Vladislav Makhov
cdaa816b36 Fix Help center link 2020-11-09 15:27:07 +03:00
Artem Tarasov
46ed4741a6 Web: Files/Components: deleted console.log, unusing code, refactoring 2020-11-09 15:23:20 +03:00
Viktor Fomin
b3f4bd3f64 Update yarn.lock files 2020-11-09 15:16:44 +03:00
Artem Tarasov
11d91fe21f Web: Files/Components: tree-menu: fixed selection 2020-11-09 15:16:15 +03:00
Vladislav Makhov
fee439b390 Refactoring 2020-11-09 15:11:46 +03:00
Viktor Fomin
f053f78e47 web: common: bump version 2020-11-09 15:11:44 +03:00
Viktor Fomin
835b6a2b62 Web: Client: fix first loader 2020-11-09 15:11:17 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
Viktor Fomin
86c5962621 Web: Common: added readme for stories 2020-11-09 14:45:57 +03:00
Viktor Fomin
b0d202f7c9 Update yarn.lock files 2020-11-09 13:17:06 +03:00
Viktor Fomin
c427dbd03d web: common: bump version 2020-11-09 13:12:07 +03:00
Viktor Fomin
d12dbd797c Web: Common: fix loaders if not auth 2020-11-09 13:08:51 +03:00
Viktor Fomin
96276d23af Web: Client: delete logo 2020-11-09 13:07:58 +03:00
Vladislav Makhov
eeced56986 Refactoring 2020-11-09 13:03:18 +03:00
Artem Tarasov
c2dfeb591c web: common: bump version 2020-11-09 12:43:27 +03:00
Artem Tarasov
9aedb02748 web: components: bump version 2020-11-09 12:43:20 +03:00
Artem Tarasov
3c557194df Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows 2020-11-09 12:38:35 +03:00
Viktor Fomin
adc6347d21 Web: Common: fix story for header loader 2020-11-09 12:35:48 +03:00
Viktor Fomin
a7da70bb8b Web: Common: fix loader style opacity constant 2020-11-09 12:35:06 +03:00
Viktor Fomin
950dca9a2a Web: Common: added prop types 2020-11-09 12:34:25 +03:00
Viktor Fomin
55143dfbd0 Web: Common: fix props 2020-11-09 12:33:59 +03:00
Viktor Fomin
ac7b6bf362 Web: Common: fix header loader opacity 2020-11-09 12:33:13 +03:00
Viktor Fomin
7c5e683be2 Web: Common: added decorator section in storybook 2020-11-09 12:32:11 +03:00
Artem Tarasov
9805c086fe Web: Components: groups-button-menu: fixed position when viewed from desktop 2020-11-09 12:24:40 +03:00
Alexey Kostenko
433d0d399f Web: Common: FilterInput: Fixed filter when added/removed filter items 2020-11-09 12:12:26 +03:00
Artem Tarasov
fa8e8341e2 Web: Components/Files: fixed warrnings 2020-11-09 12:11:08 +03:00
Vladislav Makhov
430c7ae73d Remove unused code 2020-11-09 12:05:17 +03:00
Vladislav Makhov
d569e8dd74 Refactoring 2020-11-09 12:02:03 +03:00
Artem Tarasov
f9ea759a26 Web: Components: Row: fixed position share btn 2020-11-09 11:19:21 +03:00
Alexey Kostenko
20f92245f4 Web: Common: FilterInput: Fixed adding elements when screen zooms in 2020-11-09 09:26:03 +03:00
Vladislav Makhov
102837ed04 Add selector 2020-11-09 09:16:44 +03:00
Vladislav Makhov
d4f2c16140 Merge branch 'feature/third-party-settings' of github.com:ONLYOFFICE/AppServer into feature/third-party-settings 2020-11-06 19:18:42 +03:00
Vladislav Makhov
6f38b66255 Add react-string-format lib 2020-11-06 19:18:32 +03:00
Viktor Fomin
f6b82ac707 Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader 2020-11-06 18:46:03 +03:00
Viktor Fomin
c2e74d3756 Update yarn.lock files 2020-11-06 18:43:16 +03:00
Viktor Fomin
291869e830 web: common: bump version 2020-11-06 18:39:02 +03:00
Viktor Fomin
d8e541498c Web: Common: add header loader 2020-11-06 18:26:32 +03:00
Viktor Fomin
24bdcdf04d Web: Common: create header loader stories 2020-11-06 18:25:40 +03:00
Artem Tarasov
f7257af395 Web: Components: input-block/password-input: fixed padding for .prepend > div in password-input 2020-11-06 18:05:00 +03:00
Viktor Fomin
0134d7a2d8 Web: Common: fix logo 2020-11-06 17:45:54 +03:00
Viktor Fomin
eaa7e270bb Web: Common: add logoUrl setting 2020-11-06 17:44:51 +03:00
Viktor Fomin
916d8f9b0c Web: Common: create header loader 2020-11-06 17:43:59 +03:00
9d696b73f6 Revert "Fix resources"
This reverts commit ec0ace1f59.
2020-11-06 16:59:50 +03:00
Artem Tarasov
fdcf5ccf96 Web: Components: Row: fixed margin StyledElement 2020-11-06 16:58:08 +03:00
Artem Tarasov
612661a22b Web: Files/Common: MainButton: fixed line-height 2020-11-06 16:43:14 +03:00
ec0ace1f59 Fix resources 2020-11-06 16:32:37 +03:00
Vladislav Makhov
c9eeeed26e Add separator 2020-11-06 16:20:27 +03:00
Viktor Fomin
4dc0e0d13d Web: Client: fix color 2020-11-06 16:17:20 +03:00
Artem Tarasov
c791fa29aa Web: Files/Common: PageLayout: fixed margin-top in Header 2020-11-06 16:15:03 +03:00
Viktor Fomin
98dabb19ab Web: Common: use ternary operator 2020-11-06 15:58:30 +03:00
Viktor Fomin
2d78e10011 Web: Common: hide AddonPanel 2020-11-06 15:51:31 +03:00
Viktor Fomin
ffd23c59b4 Web: Common: create stories 2020-11-06 15:39:31 +03:00
Viktor Fomin
2f8ecce840 Web: Common: add props 2020-11-06 15:38:53 +03:00
Viktor Fomin
b9a0c235b3 Web: Common: add props 2020-11-06 15:38:36 +03:00
Viktor Fomin
1a384ae0cd Web: Common: add props 2020-11-06 15:38:20 +03:00
Viktor Fomin
b5fb1e583e Web: Common: add props 2020-11-06 15:38:05 +03:00
Viktor Fomin
a7be2b8ab7 Web: Common: fix and add new loader style constants 2020-11-06 15:21:01 +03:00
Viktor Fomin
8f5490d1c3 Web: Common: refactoring loaders 2020-11-06 15:20:06 +03:00
Viktor Fomin
c298711379 Web: Common: fix props circle 2020-11-06 15:00:11 +03:00
Viktor Fomin
3c52b86599 Web: Common: fix props rectangle 2020-11-06 14:59:37 +03:00
Vladislav Makhov
25c812937d Rename sendConsumerNewProps to updateConsumerProps 2020-11-06 14:29:55 +03:00
Artem Tarasov
d8a384adba web: common: bump version 2020-11-06 14:23:37 +03:00
Artem Tarasov
18f58200e3 web: components: bump version 2020-11-06 14:23:29 +03:00
Artem Tarasov
59832685d3 Web: Components: Avatar: fixed props 2020-11-06 14:12:29 +03:00
SuhorukovAnton
24d28d2d5c x-www-form-urlencoded: fix 2020-11-06 13:43:31 +03:00
Alexey Kostenko
3f77abc3c9 Web: Common: FilterInput: Refactoring, removed unused methods 2020-11-06 13:28:31 +03:00
SuhorukovAnton
f8703576be application/x-www-form-urlencoded: fix 2020-11-06 13:25:56 +03:00
Alexey Kostenko
8d10326c44 Web: Common: FilterInput: Fixed hidden elements when screen zooms out 2020-11-06 13:07:08 +03:00
Artem Tarasov
173017ddbb Web: Common: AdvancedSelector: fixed layout 2020-11-06 12:48:08 +03:00
Artem Tarasov
7b3e103c1b Web: Components: ComboButton/TextInput: fixed padding placegolder 2020-11-06 12:47:31 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
Artem Tarasov
678d31cc32 Web: Common: GroupSelector: fixed placeholder 2020-11-05 23:59:44 +03:00
Artem Tarasov
cff89239b5 Web: Components: Icons: added icon MoveToIcon, vhanged icon Copy 2020-11-05 22:40:48 +03:00
Artem Tarasov
321d24af79 Web: Components: drop-down/drop-down-items: fixed height of separator and margin 2020-11-05 20:34:35 +03:00
Vladislav Makhov
462c7578fb Moved declaration out from render 2020-11-05 18:56:45 +03:00
Vladislav Makhov
b777439f09 Change to decomposed prop consumer 2020-11-05 18:43:21 +03:00
Vladislav Makhov
79d2940514 Rename prop NewProps to newProps 2020-11-05 18:41:01 +03:00
Vladislav Makhov
9220ab7d4f Fix name 2020-11-05 18:38:31 +03:00
Vladislav Makhov
fc534aca67 Fix name 2020-11-05 18:38:00 +03:00
Vladislav Makhov
2108c2fba9 Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports 2020-11-05 18:20:15 +03:00
Vladislav Makhov
baa90d1a84 remove console warnings 2020-11-05 18:17:10 +03:00
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
Vladislav Makhov
cc252ecac2 Add window.cloudCryptoCommand 2020-11-05 17:54:55 +03:00
e22de56363
Merge branch 'develop' into feature/third-party-settings 2020-11-05 17:45:54 +03:00
Artem Tarasov
1fce8d0c03 Web: Components: toggle-button: fixed size icon 2020-11-05 16:56:15 +03:00
Vladislav Makhov
94b42d7637 Merge branch 'develop' into feature/desktop-view 2020-11-05 14:14:01 +03:00
Vladislav Makhov
9a3bc3b655 Add desktop commands 2020-11-05 14:13:06 +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
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
e4f6dd255e Web: Common: rename headers components 2020-11-05 11:15:15 +03:00
Artem Tarasov
6a4cabcedf Web: Components/Files/People: fix styles 2020-11-05 09:22:14 +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
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
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
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
Vladislav Makhov
bbc708192d yarn.lock update 2020-11-03 17:29:50 +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
Artem Tarasov
75939cffad Web: Files/Components: fixed group-menu-button in Header 2020-11-03 16:58:02 +03:00
Viktor Fomin
8ec67a1c03 Web: Common: Create FilterLoader stories 2020-11-03 15:56:33 +03:00
Viktor Fomin
f1d5b08521 Web: Common: Fix filter loader 2020-11-03 15:55:51 +03:00
Viktor Fomin
1e4558a646 Web: Common: Create rectangle loader 2020-11-03 15:55:14 +03:00
Viktor Fomin
354fbe6038 Web: Common: added loader style constant 2020-11-03 15:54:21 +03:00
Vladislav Makhov
1e483de4ba Merge branch 'develop' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
Artem Tarasov
8507650485 Web: Common: PageLayout: fixed selection items 2020-11-03 12:23:46 +03:00
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
Vladislav Makhov
6e5c425d6b Add method 2020-11-03 11:07:00 +03:00
Vladislav Makhov
63b706714b Merge branch 'develop' into feature/desktop-view 2020-11-03 10:07:21 +03:00
Artem Tarasov
920bd224cf Web: Components: tree-node: fixed selection 2020-11-03 10:01:01 +03:00
Vladislav Makhov
2afb10a135 Refactoring 2020-11-03 09:52:05 +03:00
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-11-02 13:56:52 +03:00
Artem Tarasov
5f6e0e60e8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2020-11-02 13:36:03 +03:00
b0b4f91eac CustomNamingPeople: fix 2020-11-02 13:35:08 +03:00
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
Artem Tarasov
a3b2475405 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-02 09:23:36 +03:00
52f1ea68a1 /api/2.0/authentication: application/x-www-form-urlencoded 2020-11-01 17:14:20 +03:00
ab8c6c6a81 Added · api/2.0/portal/mobile/registration 2020-11-01 14:58:43 +03:00
e01182be70 Added /api/2.0/capabilities.json 2020-10-31 17:11:45 +03:00
6cdab3daca Notify: fix 2020-10-30 18:42:56 +03:00
49dd924dc4 Notify: fix 2020-10-30 18:17:11 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
Artem Tarasov
79b15bacf1 web: components: bump version 2020-10-30 17:56:40 +03:00
Artem Tarasov
6f5fe3b9df Web: Components: tree-menu: fixed style of node selection when dragging 2020-10-30 17:56:24 +03:00
08b9db919e Merge branch 'feature/article-resize' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/article-resize 2020-10-30 17:23:06 +03:00