|
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 |
|
|
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 |
|
|
58c2b8b392
|
Merge branch 'develop' into bugfix/init-reset-stores
|
2022-08-31 11:42:02 +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 |
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03: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 |
|
|
6b25c3d7af
|
Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons
|
2022-08-30 18:08:58 +03:00 |
|
Artem Tarasov
|
bc0e986707
|
Web: Login/Common: added language cookie setting on the server
|
2022-08-30 17:50:54 +03:00 |
|
|
50659cdeb9
|
Common: ColorTheme: fix
|
2022-08-30 17:03:45 +03:00 |
|
|
e0c1acf111
|
Web: Added features.
|
2022-08-30 16:29:53 +03:00 |
|
|
6da7e16e52
|
Merge branch 'develop' into bugfix/init-reset-stores
|
2022-08-30 14:13:58 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +03:00 |
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
TimofeyBoyko
|
b737830e69
|
Web:Common:Api: delete useless code
|
2022-08-30 11:57:06 +03:00 |
|
|
5829654183
|
Web:Common:Fix.
|
2022-08-30 10:35:24 +03:00 |
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
60086b1a68
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-30 09:04:22 +03:00 |
|
|
38b217d65e
|
Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state
|
2022-08-30 08:55:19 +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 |
|
|
c46fa39060
|
Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
# packages/client/src/store/FilesStore.js
# packages/client/src/store/index.Files.js
|
2022-08-29 18:27:33 +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 |
|
|
aca4d65f2b
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 17:32:48 +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 |
|
|
0359611cf3
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 16:33:05 +03:00 |
|
|
efafaf51d8
|
Web:Common:Fix styles ArticleHeader.
|
2022-08-29 16:15:33 +03:00 |
|
|
45935a2ace
|
Web: Change order of loading stores + added reset People/Files stores on logout
|
2022-08-29 13:58:30 +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 |
|
mushka
|
18b56dbc3e
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 12:36:47 +03:00 |
|
|
3413367480
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-29 12:21:19 +03:00 |
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
|
24ece95419
|
Web: Fix invalid plugins check on login
|
2022-08-29 11:29:08 +03:00 |
|
|
9dfe51c614
|
Web: Common: added oforms filter
|
2022-08-29 11:28:05 +03:00 |
|
|
1078c7f138
|
Web: Common: fixed getOforms
|
2022-08-29 11:27:13 +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 |
|
|
bbca780d4c
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-29 09:04:37 +03:00 |
|
|
4092aa546a
|
Web: Client: Added base invite panel
|
2022-08-29 08:50:37 +03:00 |
|
|
eaa4bf40b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-28 00:18:48 +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 |
|
Artem Tarasov
|
106152a2a4
|
Web: Login/Common: fixed types
|
2022-08-27 00:49:06 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
mushka
|
b4a23f95b7
|
added isRoom property and calculateIsRoom method to infoPanelStore
|
2022-08-26 19:10:00 +03:00 |
|
|
ed5f62a877
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-26 18:48:20 +03:00 |
|
|
a5e0f98c66
|
Web: Common: update api for login/audit history
|
2022-08-26 19:21:03 +05:00 |
|
|
082614ef85
|
Web:Common:Fix ColorTheme IconButton.
|
2022-08-26 11:30:33 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
mushka
|
8d3a731e60
|
removed for-dev console.log
|
2022-08-25 18:16:03 +03:00 |
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
04fb7ade63
|
Web: People: fixed row styles
|
2022-08-25 10:54:04 +03:00 |
|
TimofeyBoyko
|
674073825e
|
Web:Common:Api: add 'request' func to plugins api
|
2022-08-24 19:53:33 +03:00 |
|
mushka
|
8ddbc66c6f
|
created new RoomsTypeTranslations constant
|
2022-08-24 19:38:03 +03:00 |
|
mushka
|
b8637a31c1
|
added new isRoomsStorage param to saveThirdparty api call
|
2022-08-24 19:35:34 +03:00 |
|
|
61ff3cfd15
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-08-24 18:00:33 +03:00 |
|
|
e7f3976dbb
|
Web: Fixed login page.
|
2022-08-24 17:59:50 +03:00 |
|
mushka
|
55faeac29e
|
created new loaders for CreateEditRoomDialog
|
2022-08-24 17:57:05 +03:00 |
|
TimofeyBoyko
|
6ac0fe0546
|
Web:Delete useless code
|
2022-08-24 12:57:11 +03:00 |
|
TimofeyBoyko
|
2a2cf185e5
|
Web:Common:SettingsStore: add enablePlugins and pluginOptions
|
2022-08-24 12:33:37 +03:00 |
|
TimofeyBoyko
|
051c9e207a
|
Web:Common:API: move api for plugins from client to common
|
2022-08-24 12:32:26 +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 |
|
mushka
|
23a5faa0a4
|
cleaned up api/rooms
|
2022-08-23 14:30:16 +03:00 |
|
mushka
|
afc24f98cc
|
added removeLogo api call to api/rooms
|
2022-08-23 14:29:47 +03:00 |
|
|
a75f794d3f
|
Web:Components:Change padding for settingsStudio.
|
2022-08-23 13:50:46 +03:00 |
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
6b592bdd0a
|
Web: The initial value of the number of managers has been changed, the api request has been updated.
|
2022-08-23 11:51:50 +03:00 |
|
TimofeyBoyko
|
4a7be88e5a
|
Web:Common:API: update filter for accounts
|
2022-08-23 11:36:14 +03:00 |
|
Artem Tarasov
|
eba3f4ebe5
|
Web: Common: utils: added types for login func
|
2022-08-22 15:07:11 +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 |
|
|
c24c66ecec
|
Web: Added receiving a link for payment if the user has stopped his choice.
|
2022-08-19 18:11:54 +03:00 |
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +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 |
|
|
9ea79e41a1
|
Web: Added payer container.
|
2022-08-18 18:44:56 +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 |
|
|
457200198a
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-18 15:29:50 +03:00 |
|
|
a47c4c09fb
|
Web: Added due date, added date conversion according to page language.
|
2022-08-18 13:47:33 +03:00 |
|
|
e78b02cd0b
|
Web: Added portal quota, added translations.
|
2022-08-18 12:28:17 +03:00 |
|
|
4e30b65fe4
|
Web: Added getting payment price from api.
|
2022-08-18 11:29:49 +03:00 |
|
|
3d93f45ded
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/pages/Confirm/index.js
|
2022-08-18 11:26:04 +03:00 |
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|