|
|
368a23fd4e
|
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:11:43 +03:00 |
|
TimofeyBoyko
|
b6cf14f62e
|
Merge branch 'develop' into bugfix/accounts-filter
|
2022-10-10 14:57:56 +05:00 |
|
TimofeyBoyko
|
fe310ee9d4
|
Web:Common:FilterInput: fix combo-item styles
|
2022-10-10 14:29:16 +05:00 |
|
TimofeyBoyko
|
763d8ff860
|
Web:Common:Loaders: add support dark-theme for filter block loader
|
2022-10-10 14:11:05 +05:00 |
|
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
|
|
1ea1cedb3b
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 09:32:13 +03:00 |
|
TimofeyBoyko
|
68fc4fb2d4
|
Web:Common:FilterInput: delete useless code
|
2022-10-07 19:24:56 +05:00 |
|
mushka
|
7de3650533
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 16:21:59 +03:00 |
|
mushka
|
9131dfa55f
|
deleted isRoom prop from SubInfoPanelHeader component
|
2022-10-06 18:25:11 +03:00 |
|
mushka
|
f139b34b74
|
cleaned up InfoPanelHeaderLoader component code
|
2022-10-06 18:24:00 +03:00 |
|
|
|
ba6b92c7c2
|
Web: Added the ability to see alert in the article for administrators only.
|
2022-10-06 14:26:36 +03:00 |
|
TimofeyBoyko
|
5cfc7cf8d0
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-06 13:41:14 +03:00 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
|
2b001f56d6
|
Web: Added transparency when a component is unavailable.
|
2022-10-05 12:18:25 +03:00 |
|
|
|
c3c64d847c
|
Web: removed useless translations.
|
2022-10-05 11:55:15 +03:00 |
|
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
TimofeyBoyko
|
019745b090
|
Web:Common:Article: open profile on avatar click
|
2022-10-04 07:31:06 +03:00 |
|
TimofeyBoyko
|
ae584739e8
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-04 06:58:16 +03:00 |
|
mushka
|
5c004293d4
|
removed InfoPanelBodyLoader from loaders/index.js
|
2022-10-03 14:18:25 +03:00 |
|
mushka
|
0b8708be93
|
fixed styling of historyView loader in darkTheme
|
2022-10-03 14:17:24 +03:00 |
|
mushka
|
e09c25d9ca
|
deleted infoPanelBodyLoader
|
2022-10-03 14:15:36 +03:00 |
|
Elyor Djalilov
|
41261e64b9
|
Merge branch 'develop' into feature/phone-input
# Conflicts:
# packages/components/index.js
|
2022-10-03 12:20:33 +05:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
mushka
|
419646f8fc
|
complete overhaul for InfoPanelHeaderLoader
|
2022-10-02 02:44:09 +03:00 |
|
mushka
|
d32a2179cb
|
complete overhaul of old styles for InfoPanelHeaderLoader
|
2022-10-02 02:43:55 +03:00 |
|
mushka
|
c056383862
|
added all new loaders to InfoPanelViewLoader
|
2022-10-02 02:43:29 +03:00 |
|
mushka
|
10d698b0d1
|
created new NoItemLoader
|
2022-10-02 02:39:56 +03:00 |
|
mushka
|
2f810c9528
|
created new SeveralItemsLoader
|
2022-10-02 02:39:41 +03:00 |
|
mushka
|
27ca7d62df
|
created new GalleryLoader
|
2022-10-02 02:39:28 +03:00 |
|
mushka
|
f9cc615f0b
|
updated MembersLoader
|
2022-10-02 02:39:18 +03:00 |
|
mushka
|
03b18ef110
|
created new DetailsLoader
|
2022-10-02 02:39:06 +03:00 |
|
mushka
|
94aa2fa3e9
|
created new accounts loader file
|
2022-10-02 02:38:48 +03:00 |
|
|
|
955a9379de
|
Web: Ipad: fixed Safari styles
|
2022-09-29 17:29:09 +03:00 |
|
|
|
26af985bd4
|
Web: Common: fixed floating button display for safari browser
|
2022-09-29 14:09:35 +03:00 |
|
|
|
7164d4b25c
|
Merge pull request #861 from ONLYOFFICE/bugfix/restore-portal
Bugfix/restore portal
|
2022-09-27 10:41:55 +03:00 |
|
|
|
58def6cbb2
|
Web: Common: HideArticleMenuButton: fixed z-index
|
2022-09-26 16:11:22 +03:00 |
|
|
|
d59bd852d2
|
Web: Common: fixed HideArticleMenuButton styles for table view
|
2022-09-26 14:57:27 +03:00 |
|
|
|
0b66a94bbb
|
Merge branch 'develop' into bugfix/restore-portal
|
2022-09-26 14:50:40 +03:00 |
|
|
|
56c4c35ca0
|
Merge pull request #858 from ONLYOFFICE/feature/added-show-article-button
Feature/added show article button
|
2022-09-26 12:52:14 +03:00 |
|
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +03:00 |
|
|
|
db047d72a9
|
Web: Common: removed log
|
2022-09-26 11:24:28 +03:00 |
|
|
|
0c8703a58c
|
Web: Common: added show/hide article button
|
2022-09-26 11:22:46 +03:00 |
|
|
|
46370b588c
|
Web: Fixed bugs.
|
2022-09-26 11:19:10 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
e9ae801528
|
removed unused files
|
2022-09-26 10:43:37 +03:00 |
|
mushka
|
598d11c5c7
|
exported new viewLoader
|
2022-09-26 10:37:17 +03:00 |
|
mushka
|
62ecdace05
|
created single viewLoader component for easier access
|
2022-09-26 10:37:05 +03:00 |
|
mushka
|
7f0cadfb98
|
created and finished history loader
|
2022-09-26 10:36:31 +03:00 |
|
mushka
|
3c56e8fe6d
|
changed members loader
|
2022-09-26 10:36:11 +03:00 |
|
|
|
80be6fafec
|
Web:Common:Add isEmptyPage, delete isPageWithoutFiles.
|
2022-09-25 12:32:06 +03:00 |
|
|
|
94c945718c
|
Web: Common: Access to the portal recovery page is denied when the portal is not being restored.
|
2022-09-24 10:46:02 +03:00 |
|
|
|
b97d4d8148
|
Web:Common:Add isPageWithoutFiles props.
|
2022-09-23 19:47:40 +03:00 |
|
|
|
f1150f6748
|
Merge branch 'bugfix/section-header' of github.com:ONLYOFFICE/AppServer into bugfix/section-header
|
2022-09-23 17:14:16 +03:00 |
|
|
|
5f00094d1a
|
Web: Common: Changed padding style of section header.
|
2022-09-23 17:14:06 +03:00 |
|
|
|
9afa3de331
|
Merge branch 'develop' into bugfix/section-header
|
2022-09-23 16:48:30 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
d804bf848a
|
Web: Common: Fixed section header for iOS.
|
2022-09-23 16:10:55 +03:00 |
|
|
|
c2ab59c2ff
|
Merge branch 'develop' into feature/new-profile
|
2022-09-23 15:17:22 +03:00 |
|
|
|
389298dfd6
|
Web: Client: added theme to logo
|
2022-09-23 13:32:43 +03:00 |
|
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
|
3d02e64934
|
Web: Common: ColorTheme: Added hoverColor property to rest
|
2022-09-22 18:11:51 +03:00 |
|
TimofeyBoyko
|
7a2e3fea01
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-09-22 16:24:57 +03:00 |
|
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
|
|
4189c9d912
|
Web: Added that access to the page of an inaccessible portal is denied if the portal is still paid.
|
2022-09-22 10:32:47 +03:00 |
|
|
|
ee42f4be3a
|
Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2022-09-21 17:18:42 +03:00 |
|
|
|
723a5709a6
|
Web: Common: fixed logo loader
|
2022-09-21 16:24:57 +03:00 |
|
TimofeyBoyko
|
94c7e24a94
|
Web:Common:Navigation: add context menu for trash folder
|
2022-09-21 15:58:52 +03:00 |
|
|
|
d9dd4c7139
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 13:52:51 +03:00 |
|
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
|
31458b11e5
|
Merge branch 'develop' into bugfix/fixed-settings-loaders
|
2022-09-21 12:32:57 +03:00 |
|
|
|
c9f3dd8970
|
Merge branch 'feature/archived-redesign-empty-screen' of github.com:ONLYOFFICE/AppServer into feature/archived-redesign-empty-screen
|
2022-09-21 12:14:50 +03:00 |
|
|
|
e38bc40de6
|
Web:Common:Fix StyledHeading for isMobile.
|
2022-09-21 12:14:44 +03:00 |
|
|
|
f49e714bf0
|
Web: Common: Moved isEmptyPage out of Section
|
2022-09-21 12:05:42 +03:00 |
|
|
|
ffabcea9d6
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-21 11:07:04 +03:00 |
|
|
|
6372477fea
|
Web:Common:Add tablet, smallTablet in media.
|
2022-09-21 10:25:26 +03:00 |
|
|
|
6f003a8459
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-20 21:54:33 +03:00 |
|
mushka
|
ca85150a6d
|
fixed InfoPanel appearing in not avialable places
|
2022-09-20 14:54:05 +03:00 |
|
|
|
f49d98d21d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-20 14:27:39 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
TimofeyBoyko
|
e48371ba7f
|
Merge branch 'develop' into bugfix/tags
|
2022-09-20 14:13:33 +03:00 |
|
TimofeyBoyko
|
72f7b984f2
|
Web:Common:Tags: fix truncate for 1 tag
|
2022-09-20 14:11:36 +03:00 |
|
|
|
3ff711225a
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-20 14:07:27 +03:00 |
|
|
|
6c1d1981a3
|
Web: Files: fixed plus icon click for shared folder
|
2022-09-20 14:00:34 +03:00 |
|
|
|
9fc617c652
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-20 13:52:31 +03:00 |
|
|
|
c61d11024c
|
Web: Common: fixed burger loader
|
2022-09-20 11:26:14 +03:00 |
|
|
|
f36b38cbe5
|
Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders
|
2022-09-20 10:59:41 +03:00 |
|
|
|
f607382b3a
|
Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader.
|
2022-09-20 10:59:31 +03:00 |
|
|
|
ead5485288
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-19 23:30:28 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
TimofeyBoyko
|
412c897240
|
Web:Common:Section: delete main bar
|
2022-09-19 18:05:55 +03:00 |
|
TimofeyBoyko
|
853fa338ce
|
Web:Client: move MainBar from section to global Layout and fix styles after this
|
2022-09-19 18:00:08 +03:00 |
|
|
|
7c06bc8e8e
|
Web: Common: Article: fixed loader width
|
2022-09-19 17:42:34 +03:00 |
|
|
|
7844c5bd23
|
Web: Common: added ArticleHeader loader
|
2022-09-19 17:31:22 +03:00 |
|
|
|
fa01783cdb
|
Web: Client: fixed Article loader
|
2022-09-19 16:41:11 +03:00 |
|
|
|
bc20d9fe8f
|
Web: Fixed bugs.
|
2022-09-19 16:31:32 +03:00 |
|
|
|
2d26c5dc08
|
Web:Common:Fix isSectionFilterAvailable.
|
2022-09-19 15:24:13 +03:00 |
|
|
|
9799e003ee
|
Web:Common:Add infoPanelIsVisible.
|
2022-09-19 15:23:26 +03:00 |
|
|
|
22381f8f44
|
Web: Moved dialog to common folder.
|
2022-09-19 15:12:49 +03:00 |
|
|
|
ee70590b78
|
Web:Common:Add props isEmptyFilesList in flag isSectionFilterAvailable.
|
2022-09-19 14:38:16 +03:00 |
|
|
|
ce4cacc43c
|
Web: Fixed bugs.
|
2022-09-19 12:18:37 +03:00 |
|
|
|
9480cc9d52
|
Web:Common:Delete filter if EmptyFilesList empty.
|
2022-09-19 11:48:53 +03:00 |
|
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
|
b1f0135749
|
Web:Common:Fix StyledHeading.
|
2022-09-18 17:29:02 +03:00 |
|
|
|
2d9b7606d8
|
Common: Section: fix profile padding
|
2022-09-18 02:28:38 +03:00 |
|
TimofeyBoyko
|
6f2269f9af
|
Merge branch 'develop' into feature/update-filters
|
2022-09-16 18:30:09 +03:00 |
|
TimofeyBoyko
|
2d01924ea6
|
Web:Common:FilterInput: fix select option
|
2022-09-16 18:28:23 +03:00 |
|
|
|
0f045311db
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 18:27:33 +03:00 |
|
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
|
|
9b60a73c21
|
Web: Common: fixed logo click
|
2022-09-16 18:17:28 +03:00 |
|
TimofeyBoyko
|
cfeb72fd9c
|
Web:Common:Article: add new prop 'withMainButton'
|
2022-09-16 16:36:29 +03:00 |
|
|
|
150072b885
|
Web: Common: fixed logo click, fixed burger styles
|
2022-09-16 15:53:19 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
15ea8b4785
|
fixed imports for infoPanelToggle Color theme
|
2022-09-16 15:07:54 +03:00 |
|
|
|
fce913a209
|
Web:Common:Fix disableStyles in StyledMainButton.
|
2022-09-16 12:46:59 +03:00 |
|
|
|
37142b7712
|
Web:Common:
Added hiding InfoPanelButton when isEmptyFilesList is empty.
|
2022-09-16 11:51:53 +03:00 |
|
|
|
c957f0eecb
|
Web:Common:Add check if isEmptyFilesList is empty then don't show the filter.
|
2022-09-16 11:17:57 +03:00 |
|
TimofeyBoyko
|
ca485bc41d
|
Web:Client:Home: fix clearAll
|
2022-09-15 18:18:36 +03:00 |
|
TimofeyBoyko
|
25188c57b8
|
Web:Client:Home: fix clear search
|
2022-09-15 18:06:00 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
TimofeyBoyko
|
72af5e7549
|
Web: mode global events constants from client to common
|
2022-09-15 13:24:18 +03:00 |
|
|
|
94f6cc8682
|
Web: Files: Settings: fix padding on tablet
|
2022-09-15 12:06:22 +03:00 |
|
|
|
b85484a731
|
Web: Files: Settings: Fix sticky submenu
|
2022-09-15 11:59:38 +03:00 |
|
TimofeyBoyko
|
75bf22918e
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 10:10:03 +03:00 |
|
|
|
e911a9f478
|
Merge branch 'develop' into feature/redisign-files-settings
|
2022-09-14 18:40:09 +03:00 |
|
|
|
40aee9ff02
|
Web: Files: Settings: Added new loaders
|
2022-09-14 18:25:46 +03:00 |
|
|
|
c0244b5400
|
Web: Added plan title from the store.
|
2022-09-14 17:17:40 +03:00 |
|
TimofeyBoyko
|
3558845932
|
Web:Common:Loaders: fix
|
2022-09-14 17:13:15 +03:00 |
|
TimofeyBoyko
|
ee7db82c3a
|
Web:Client:AccountsHome: fix filter loader
|
2022-09-14 16:55:23 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
TimofeyBoyko
|
8f92a90ab6
|
Web:Common:Loaders: fix styles for filter block loader
|
2022-09-14 16:30:48 +03:00 |
|
TimofeyBoyko
|
9d49a1f753
|
Web:Common:FilterInput: fix item styles
|
2022-09-14 16:30:26 +03:00 |
|
|
|
61fa70c886
|
Web: Components: Navigation: fixed z-index
|
2022-09-14 15:42:38 +03:00 |
|
|
|
b5e08fddf4
|
Web: Components: Navigation fixed text clipping
|
2022-09-14 14:48:19 +03:00 |
|
|
|
ff1a18eb0f
|
Web: Components: fixed Navigation component for IOS devices
|
2022-09-14 14:41:24 +03:00 |
|
|
|
1f76f8b058
|
Web: Components: fixed settings-icon color
|
2022-09-14 14:05:38 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
32c5c9907d
|
Web: Files: fixed header-container styles
|
2022-09-13 18:19:23 +03:00 |
|
|
|
820cc5a9b8
|
Web: Common: fixed header styles
|
2022-09-13 18:09:40 +03:00 |
|
TimofeyBoyko
|
7c47679796
|
Web:Common:FilterInput: fix ClearAll translation key
|
2022-09-13 18:06:55 +03:00 |
|
|
|
45bcf68af3
|
Web: Common: fixed section-header styles
|
2022-09-13 17:53:45 +03:00 |
|
TimofeyBoyko
|
fff60dcdd6
|
Web:Common:Loaders: fix styles for filter block loader
|
2022-09-13 13:59:44 +03:00 |
|
|
|
281ec9ec57
|
Web: Files: fixed skeleton-loaders styles, fixed header styles, removed useless code
|
2022-09-13 13:01:31 +03:00 |
|
TimofeyBoyko
|
ebe79b5cdf
|
Web:Common:FilterInput: fix styles and hide clear filter button
|
2022-09-13 12:56:47 +03:00 |
|
TimofeyBoyko
|
e6a4637b73
|
Web:Common:FilterInput: add cancel button
|
2022-09-12 18:05:36 +03:00 |
|
TimofeyBoyko
|
5ddcfe6c3a
|
Web:Common:Loaders: delete useless code
|
2022-09-12 17:06:48 +03:00 |
|
TimofeyBoyko
|
fc59f340d8
|
Web:Common:FilterInput: fix combobox open
|
2022-09-12 17:00:26 +03:00 |
|
TimofeyBoyko
|
e914151fcf
|
Web:Common:FilterInput: update logic for combobox and fix bugs
|
2022-09-12 16:21:01 +03:00 |
|
TimofeyBoyko
|
9311ec1133
|
Web:Common:Loaders: fix filter loader
|
2022-09-12 14:33:36 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
TimofeyBoyko
|
14052af9b7
|
Web:Common:Article: fix displaying role for profile avatar
|
2022-09-09 09:27:36 +03:00 |
|
|
|
97bd153ec5
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 16:29:09 +03:00 |
|
|
|
b5ce007715
|
Web: Common: fixed SortButton render
|
2022-09-08 16:05:06 +03:00 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +03:00 |
|
TimofeyBoyko
|
3a3ae4b2c9
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 15:16:51 +03:00 |
|
|
|
d7bd44cfb1
|
Web: Files: fixed hover for row
|
2022-09-08 11:48:06 +03:00 |
|
TimofeyBoyko
|
5f0f71a2bf
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 11:27:49 +03:00 |
|
|
|
a94fc40294
|
Merge branch 'develop' into bugfix/fixed-section-body-padding
|
2022-09-08 10:57:54 +03:00 |
|
TimofeyBoyko
|
9d0c6c0a97
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 10:49:30 +03:00 |
|
|
|
6977534102
|
Merge branch 'develop' into feature/selector
|
2022-09-08 10:35:53 +03:00 |
|
|
|
d8c101f907
|
Web: Common: fixed section-body padding styles for row view
|
2022-09-07 18:16:02 +03:00 |
|
|
|
d0d2313da3
|
Web: Files: fixed section-body styles
|
2022-09-07 17:00:17 +03:00 |
|
|
|
41c58de5c7
|
Web: Common: FilterInput: Fixed PeopleSelector usage
|
2022-09-07 14:14:09 +03:00 |
|
mushka
|
52ed0d5607
|
updated InfoPanelMemberListLoader
|
2022-09-06 23:38:56 +03:00 |
|
mushka
|
f2686de9a2
|
created InfoPanelMemberListLoader
|
2022-09-06 22:21:14 +03:00 |
|
TimofeyBoyko
|
3923d6faec
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-06 17:43:00 +03:00 |
|
|
|
55d9bb7b71
|
Web: Client: ColorTheme: Fixed storybook init
|
2022-09-06 17:19:35 +03:00 |
|
TimofeyBoyko
|
adf02df9cf
|
Web:Common:Loaders: add display of user loader for selector row loader
|
2022-09-06 12:17:52 +03:00 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
TimofeyBoyko
|
6c632497f9
|
Merge branch 'develop' into feature/selector
|
2022-09-05 20:33:29 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +03:00 |
|
|
|
476ed95664
|
Web: Information from the new api was used.
|
2022-09-05 13:17:44 +03:00 |
|
TimofeyBoyko
|
a3f37b0362
|
Web:Common:Loaders: add loaders for selector search and row
|
2022-09-05 12:00:48 +03:00 |
|
Artem Tarasov
|
44b8ecd6b5
|
Web: Login/Common: fixed crash app after logout.
|
2022-09-05 10:48:46 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
TimofeyBoyko
|
4d74c6d6da
|
Web:Client: add change portal owner dialog
|
2022-09-01 10:44:49 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
Artem Tarasov
|
8c28fda299
|
Web: Login/ColorTheme: fixed ssr
|
2022-08-31 18:32:13 +03:00 |
|
Artem Tarasov
|
04122f64fa
|
Web: Components/Common: added LoginStore support
|
2022-08-31 17:33:58 +03:00 |
|
TimofeyBoyko
|
34557b2e40
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 16:31:29 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
|
|
370696aba0
|
Web: Fixed property name for ColorTheme component, changed type => themeId
|
2022-08-31 15:38:39 +03:00 |
|
TimofeyBoyko
|
073b37aa86
|
Web:Common:Filter: fix after merge
|
2022-08-31 11:48:40 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
TimofeyBoyko
|
52629d16df
|
Web:Common:Filter: add support dark theme
|
2022-08-31 11:28:17 +03:00 |
|
Artem Tarasov
|
dc30ee143a
|
Web: Client/Common/Components: changed prop name type to elementType in ColorTheme component
|
2022-08-31 02:20:25 +03:00 |
|
Artem Tarasov
|
9abb4081f3
|
Web: Common: linkForgotPassword: fix after merge (login-ssr - file hierarchy changed)
|
2022-08-30 18:51:02 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
|
|
50659cdeb9
|
Common: ColorTheme: fix
|
2022-08-30 17:03:45 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
|
|
5829654183
|
Web:Common:Fix.
|
2022-08-30 10:35:24 +03:00 |
|
|
|
e6e45ce2d7
|
Web:Common:Fix.
|
2022-08-29 22:43:29 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
|
|
d8d40b1ae1
|
Web:Common:Add SliderTheme, IndicatorLoaderTheme.
|
2022-08-29 21:42:47 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
bc14356351
|
Web: Added currencies.
|
2022-08-29 17:46:43 +03:00 |
|
|
|
dc235a5bc9
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 17:15:20 +03:00 |
|
|
|
69ecaa8df4
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-29 16:37:58 +03:00 |
|
|
|
efafaf51d8
|
Web:Common:Fix styles ArticleHeader.
|
2022-08-29 16:15:33 +03:00 |
|
|
|
1c660c75e8
|
Web:Client:Fix loader ArticleHeader.
|
2022-08-29 13:49:15 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
TimofeyBoyko
|
8c9db6685c
|
Web:Common:Section: fix section width
|
2022-08-29 10:42:19 +03:00 |
|
|
|
8abc7f4095
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-29 09:51:34 +03:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
Artem Tarasov
|
c7d70c5263
|
Web: Common: ErrorContainer: removed unnecessary init store (fix ssr crash)
|
2022-08-27 01:52:33 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
082614ef85
|
Web:Common:Fix ColorTheme IconButton.
|
2022-08-26 11:30:33 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
|
|
04fb7ade63
|
Web: People: fixed row styles
|
2022-08-25 10:54:04 +03:00 |
|
mushka
|
55faeac29e
|
created new loaders for CreateEditRoomDialog
|
2022-08-24 17:57:05 +03:00 |
|
|
|
6c331a3074
|
Web: Added functionality for the grace period.
|
2022-08-24 10:25:08 +03:00 |
|
Artem Tarasov
|
6f9120ee03
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/store/TargetUserStore.js
# packages/common/store/AuthStore.js
# packages/common/store/SettingsStore.js
# packages/common/utils/index.ts
# packages/login/src/Login.jsx
# packages/login/src/RoomsLogin.jsx
|
2022-08-24 10:17:39 +03:00 |
|
|
|
a75f794d3f
|
Web:Components:Change padding for settingsStudio.
|
2022-08-23 13:50:46 +03:00 |
|
|
|
1f2cceda94
|
Web: Common: hidden Selecto for infinite scroll
|
2022-08-22 14:38:00 +03:00 |
|
|
|
8e9d2c6d93
|
Web: Common: upgraded react-selecto
|
2022-08-22 14:30:42 +03:00 |
|
|
|
4b35f02578
|
Web: Common: Added that if the sidebar is removed, then remove the alert, the loader is added.
|
2022-08-22 13:19:54 +03:00 |
|
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
|
|
d9c991a88c
|
Web: Added loaders.
|
2022-08-22 09:02:46 +03:00 |
|
|
|
2925eb27aa
|
Web:Common:Fix.
|
2022-08-19 14:38:36 +03:00 |
|
|
|
e5e1d966d1
|
Web: Files: restored paging, added withPaging parameter
|
2022-08-19 12:37:30 +03:00 |
|
|
|
40f2ef1fc2
|
Web:Common:Fix.
|
2022-08-19 10:00:34 +03:00 |
|
|
|
b7eec9fa1d
|
Web:Common:Fix isVersion error.
|
2022-08-19 10:00:18 +03:00 |
|
|
|
d293be6d57
|
Web:Common:Add LinkTheme.
|
2022-08-19 09:27:04 +03:00 |
|
|
|
fa01d5bd18
|
Web:Common: Fix currentColorScheme.
|
2022-08-18 17:56:17 +03:00 |
|
|
|
7a83e1d713
|
Web:Common:Changing badge styles.
|
2022-08-18 17:53:35 +03:00 |
|
TimofeyBoyko
|
246839378e
|
Web:Common:Navigation: fix styles after changing section header height
|
2022-08-18 10:12:41 +03:00 |
|
TimofeyBoyko
|
ebcc8bc1da
|
Web:Common:Article: increase height of portal logo container
|
2022-08-18 10:11:10 +03:00 |
|
|
|
97796c2941
|
Web:Common:Fix.
|
2022-08-17 18:14:21 +03:00 |
|
|
|
b5c8b1f953
|
Web:Common:Fix MainButton theme.
|
2022-08-17 15:52:16 +03:00 |
|
|
|
166d47c359
|
Web:Common:Fix SubmenuItemLabel theme.
|
2022-08-17 15:51:14 +03:00 |
|
|
|
1ab5666dd1
|
Web:Common:Fix button theme.
|
2022-08-17 15:50:47 +03:00 |
|
|
|
0b1a8bf368
|
Web: Files: fixed infinite-scroll styles
|
2022-08-17 15:11:48 +03:00 |
|
|
|
25355382ed
|
Web:Common:Fix buttonTheme.
|
2022-08-17 14:55:24 +03:00 |
|
|
|
14d743181e
|
Web:Common:Fix InfoPanelToggle, LinkForgotPassword, LoadingButton.
|
2022-08-17 12:20:52 +03:00 |
|
|
|
8f8cb84d9c
|
Web:Common:Fix TextareaTheme, InputBlockTheme, TextInputTheme, ComboButtonTheme.
|
2022-08-17 12:04:58 +03:00 |
|
|
|
168adb4999
|
Web:Common: Fix VersionBadge.
|
2022-08-17 11:53:45 +03:00 |
|
|
|
eead02f968
|
Web:Common: Fix calendar.
|
2022-08-17 11:14:30 +03:00 |
|
|
|
4fb553f589
|
Web:Common: Fix IconWrapper.
|
2022-08-17 11:10:06 +03:00 |
|
|
|
5be3de19dc
|
Web:Common: Fix FilterBlockItemTag.
|
2022-08-17 11:00:41 +03:00 |
|
|
|
15a57d61ae
|
Web:Common:Fix IndicatorTheme.
|
2022-08-17 10:26:40 +03:00 |
|
|
|
bd5b875d25
|
Web:Components:Fix StyledFloatingButton styles.
|
2022-08-17 10:25:12 +03:00 |
|
|
|
dd751ef7f6
|
Web:Common: Fix floatingButton styles.
|
2022-08-17 10:24:41 +03:00 |
|
|
|
e9ee5b118b
|
Web:Common: Delete MainButtonMobileTheme.
|
2022-08-17 10:23:51 +03:00 |
|
|
|
414f3d980a
|
Web:Common:Fix button styles.
|
2022-08-16 13:53:45 +03:00 |
|
|
|
ba260e18a2
|
Web:Common:Fix submenu styles.
|
2022-08-16 13:52:41 +03:00 |
|
|
|
60f15d8a1d
|
Web:Common:Fix IconButtonTheme styles.
|
2022-08-16 13:51:41 +03:00 |
|
|
|
b1d21b4c52
|
Web:Common:Fix CatalogItemTheme styles.
|
2022-08-16 13:49:50 +03:00 |
|
