|
|
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 |
|
|
|
79fa7815c4
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-21 14:48:28 +03:00 |
|
|
|
16feeaf988
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-21 14:00:17 +03:00 |
|
|
|
f417db1323
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:57:50 +03:00 |
|
|
|
d9dd4c7139
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 13:52:51 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
|
beb3acc55b
|
Web: Refactoring, added checking of the free portal with the payer's email.
|
2022-09-21 12:42:08 +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 |
|
|
|
ee2cb020ff
|
Web: Common: Api: Added getInvitationLinks, setInvitationLinks, resendEmailInvitations methods
|
2022-09-21 10:41:11 +03:00 |
|
|
|
6372477fea
|
Web:Common:Add tablet, smallTablet in media.
|
2022-09-21 10:25:26 +03:00 |
|
|
|
5953732f20
|
Common: Utils: init data url to file
|
2022-09-21 03:39:38 +03:00 |
|
|
|
6f003a8459
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-20 21:54:33 +03:00 |
|
|
|
55fc747e96
|
Web: Refactoring.
|
2022-09-20 18:15:38 +03:00 |
|
|
|
5d92a00f11
|
Web: Fixed bug.
|
2022-09-20 15:49:51 +03:00 |
|
mushka
|
ca85150a6d
|
fixed InfoPanel appearing in not avialable places
|
2022-09-20 14:54:05 +03:00 |
|
mushka
|
fac0f14608
|
created new getCanDisplay method for InfoPanelStore
|
2022-09-20 14:53:35 +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 |
|
|
|
8f1a8deda9
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 13:48:26 +03:00 |
|
|
|
ce4cacc43c
|
Web: Fixed bugs.
|
2022-09-19 12:18:37 +03:00 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
|
9480cc9d52
|
Web:Common:Delete filter if EmptyFilesList empty.
|
2022-09-19 11:48:53 +03:00 |
|
TimofeyBoyko
|
3c0bc5e500
|
Web:Common:API: fix filterValue at roomsFilter after page reload
|
2022-09-19 11:19:15 +03:00 |
|
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +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 |
|
TimofeyBoyko
|
45675c5dc1
|
Web:Common:Api: add excludeSubject at files filter
|
2022-09-16 18:27:28 +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
|
65e04b76c8
|
Web:Common:Api: change withoutMe to excludeSubject at rooms filter
|
2022-09-16 17:34:17 +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
|
d7006768e6
|
afted-merge fixes
|
2022-09-16 15:35:57 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
b0873da7eb
|
updated on getItemIcon to get room default icon
|
2022-09-16 15:13:40 +03:00 |
|
mushka
|
ea49294f91
|
added getRoomHistory api call to api/rooms
|
2022-09-16 15:12:37 +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 |
|
|
|
ee4a47454f
|
Web: Disabled branding settings.
|
2022-09-16 10:45:10 +03:00 |
|
|
|
9b596d6932
|
Web:Common:Add docSpaceLogo, setDocSpaceLogo.
|
2022-09-15 21:19:38 +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 |
|
|
|
a252a07fd3
|
Web: fixed after merge.
|
2022-09-15 17:43:02 +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 |
|
|
|
eeed96cb32
|
Web: Fixed bugs.
|
2022-09-15 15:58:21 +03:00 |
|
|
|
21fc46b8bc
|
Web: Removed useless translations.
|
2022-09-15 15:07:26 +03:00 |
|
|
|
c20e01e351
|
Web: Added information about storage size, added checks.
|
2022-09-15 14:59:55 +03:00 |
|
|
|
aa195fe76b
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-15 14:40:00 +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 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +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
|
c5b50e5d4a
|
Web:Common:Constants: add new filter types and file types for oform and docx
|
2022-09-15 11:38:59 +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 |
|
|
|
270e8f0326
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 18:38:14 +03:00 |
|
|
|
1154018e52
|
Web:Common:Fixed api request.
|
2022-09-14 18:29:03 +03:00 |
|
|
|
40aee9ff02
|
Web: Files: Settings: Added new loaders
|
2022-09-14 18:25:46 +03:00 |
|
|
|
edd01a2d91
|
Web:Common:Add whiteLabelLogoUrls.
|
2022-09-14 17:25:31 +03:00 |
|
|
|
f4e6828cc8
|
Web:Client:Delete getWhiteLabelLogoText, getWhiteLabelLogoSizes.
|
2022-09-14 17:25:01 +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 |
|
|
|
9b6b55599f
|
Web: Added getting max users count in room.
|
2022-09-14 16:07:22 +03:00 |
|
|
|
d2ce2f4435
|
Web: Added replacement in returned feature objects.
|
2022-09-14 16:01:40 +03:00 |
|
|
|
61fa70c886
|
Web: Components: Navigation: fixed z-index
|
2022-09-14 15:42:38 +03:00 |
|
TimofeyBoyko
|
d0e200437e
|
Web:Client:Home: hide option from sort button when this option hide in table header
|
2022-09-14 15:26:28 +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 |
|
|
|
5131b49b0b
|
Web: Refactoring.
|
2022-09-14 14:13:21 +03:00 |
|
|
|
1f76f8b058
|
Web: Components: fixed settings-icon color
|
2022-09-14 14:05:38 +03:00 |
|
|
|
cdc9102dd8
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:39 +03:00 |
|
|
|
9b15ddf9ac
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:17 +03:00 |
|
|
|
229400b830
|
Web:Common:Removed the removal of extra fields from the object in the methods getAdditionalResources, getCompanyInfoSettings.
|
2022-09-14 12:48:09 +03:00 |
|
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18:22 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
ed18968601
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
# packages/client/public/locales/en/Settings.json
|
2022-09-14 01:45:01 +03:00 |
|
|
|
140631c5de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 20:10:42 +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 |
|
|
|
0f063b7502
|
Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage.
|
2022-09-13 10:38:25 +03:00 |
|
|
|
0bf768efda
|
Web:Common:Add defaultWelcomePageSettings in localStorage.
|
2022-09-13 10:13:10 +03:00 |
|
|
|
5a399eac99
|
Web:Common:Added an entry in the localStorage of the default setting data CompanyInfoSettings.
|
2022-09-12 21:08:50 +03:00 |
|
TimofeyBoyko
|
e6a4637b73
|
Web:Common:FilterInput: add cancel button
|
2022-09-12 18:05:36 +03:00 |
|
|
|
f5256c80d0
|
Web:Common:Add method setGreetingSettings.
|
2022-09-12 17:31:08 +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 |
|
TimofeyBoyko
|
ccf9386c8e
|
Web:Common:Api: fix files filter
|
2022-09-12 12:26:37 +03:00 |
|
TimofeyBoyko
|
492d1bd682
|
Web:Common:Api: add searchInContent for file filter
|
2022-09-12 11:52:55 +03:00 |
|
|
|
d19caa298d
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-12 10:50:43 +03:00 |
|
|
|
478af8492d
|
Web:Common:Add data in methods setAdditionalResources.
|
2022-09-10 20:44:22 +03:00 |
|
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
mushka
|
981c28f21d
|
added new methods for gettting categoryType and isGallery constants in InfoPanelStore
|
2022-09-10 00:28:40 +03:00 |
|
|
|
b8f5438c19
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-09 17:10:04 +03:00 |
|
mushka
|
9e8d5433d4
|
fixed getRoomMethod api call
|
2022-09-09 13:54:36 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
mushka
|
e283ced388
|
added selectionPanelRoom var and set method and removed odd out setVisible and toggleVisible methods
|
2022-09-09 13:15:41 +03:00 |
|
|
|
f0bf37760b
|
Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources.
|
2022-09-09 10:34:45 +03:00 |
|
TimofeyBoyko
|
14052af9b7
|
Web:Common:Article: fix displaying role for profile avatar
|
2022-09-09 09:27:36 +03:00 |
|
|
|
e860c10333
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-09 09:02:56 +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 |
|
|
|
ce419159b9
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-09-08 15:44:30 +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 |
|
|
|
a236948577
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-08 12:27:14 +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 |
|
mushka
|
05fbe1bd7e
|
changed for-dev console.logs
|
2022-09-08 04:33:21 +03:00 |
|
mushka
|
36f233035d
|
added settingsStore to infoPanel store and moved normalizeSelection and getItemIcon as methods
|
2022-09-08 04:25:13 +03:00 |
|
|
|
d8c101f907
|
Web: Common: fixed section-body padding styles for row view
|
2022-09-07 18:16:02 +03:00 |
|
|
|
2abf7ef5d9
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-07 17:38:06 +03:00 |
|
|
|
d0d2313da3
|
Web: Files: fixed section-body styles
|
2022-09-07 17:00:17 +03:00 |
|
TimofeyBoyko
|
ac496bfe9e
|
Merge branch 'develop' into feature/selector
|
2022-09-07 15:06:24 +03:00 |
|
|
|
41c58de5c7
|
Web: Common: FilterInput: Fixed PeopleSelector usage
|
2022-09-07 14:14:09 +03:00 |
|
|
|
85a2983b3d
|
Web: Refactoring.
|
2022-09-07 13:28:28 +03:00 |
|
|
|
8acc4c5418
|
Web:Common:Moved company settings request after authorization.
|
2022-09-07 12:11:39 +03:00 |
|
mushka
|
2520be99cb
|
changed InfoPanelStore view var by slplitting it into two separate for rooms and items
|
2022-09-07 05:43:11 +03:00 |
|
mushka
|
52ed0d5607
|
updated InfoPanelMemberListLoader
|
2022-09-06 23:38:56 +03:00 |
|
mushka
|
b2caacc54b
|
added new api callout for getting room memebers
|
2022-09-06 23:36:59 +03:00 |
|
mushka
|
ff443c7586
|
fixed issue with members reloading on rerender by moving infoPanel selection to store
|
2022-09-06 22:22:18 +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 |
|
|
|
cb1da48faf
|
Web: Profile: fix selected language
|
2022-09-06 12:52:57 +03:00 |
|
TimofeyBoyko
|
adf02df9cf
|
Web:Common:Loaders: add display of user loader for selector row loader
|
2022-09-06 12:17:52 +03:00 |
|
|
|
dfff88986d
|
Web:Common:Add api restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings.
|
2022-09-06 11:03:50 +03:00 |
|
|
|
c41525179c
|
Web:Common:Add methods restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings, setCompanyInfoSettingsData.
|
2022-09-06 11:03:01 +03:00 |
|
|
|
150060faff
|
Web: Refactoring, added downgrade plan button.
|
2022-09-06 10:52:02 +03:00 |
|
|
|
f96784ba5d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
|
2022-09-06 00:22:24 +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 |
|
|
|
055be3cdbe
|
Merge branch 'develop' into feature/accounts-scroll
|
2022-09-05 17:25:28 +03:00 |
|
|
|
c27a8fc0d3
|
Web: People: added infinite-loader to accounts
|
2022-09-05 14:33:55 +03:00 |
|
|
|
d25a3f143d
|
Web: Added sending a request to the sales department.
|
2022-09-05 13:48:32 +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 |
|
|
|
1116843315
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
|
2022-09-02 01:25:30 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
TimofeyBoyko
|
4d74c6d6da
|
Web:Client: add change portal owner dialog
|
2022-09-01 10:44:49 +03:00 |
|
mushka
|
955dce87c5
|
removed unused imports from infoPanelStore
|
2022-09-01 04:39:59 +03:00 |
|
mushka
|
e191023768
|
redo of infoPanelStore calculateIsRoom to setIsRoom
|
2022-09-01 04:38:26 +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 |
|
|
|
849591813d
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 15:53:14 +03:00 |
|
