|
|
986e53608d
|
Update yarn.lock files
|
2020-09-15 22:55:11 +03:00 |
|
|
|
e855650551
|
web: components: bump version
|
2020-09-15 22:44:27 +03:00 |
|
|
|
e989bc0b75
|
web: components: bump version
|
2020-09-15 22:43:55 +03:00 |
|
|
|
d750335924
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-09-15 22:43:37 +03:00 |
|
|
|
2bad04c058
|
Update yarn.lock files
|
2020-09-15 22:42:42 +03:00 |
|
|
|
c4b686daa3
|
web: components: bump version
|
2020-09-15 22:33:53 +03:00 |
|
|
|
0f704b7f5e
|
Web: Components: Replaced package react-avatar-editor to with local code
|
2020-09-15 22:33:19 +03:00 |
|
|
|
4d3bc676ce
|
Web: Components: Styled AvatarEditor
|
2020-09-15 22:31:52 +03:00 |
|
|
|
a9ce44a563
|
Web: Components: Changed svg icons
|
2020-09-15 22:30:19 +03:00 |
|
|
|
7c5a7dcbb8
|
Web: Components: Added contentHeight/contentWidth to ModalDialog
|
2020-09-15 22:29:14 +03:00 |
|
|
|
57f2025cd9
|
Web: Components: Renamed isContainsFile to existImage
|
2020-09-15 22:27:58 +03:00 |
|
TatianaLopaeva
|
3eeb24a5b5
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-15 17:52:45 +03:00 |
|
TatianaLopaeva
|
96d0d94535
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 17:40:31 +03:00 |
|
TatianaLopaeva
|
a3adea3c27
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-09-15 17:39:34 +03:00 |
|
Vladislav Makhov
|
8da994f92c
|
Web: Common: fix login error handling
|
2020-09-15 17:35:57 +03:00 |
|
TatianaLopaeva
|
d8abe20133
|
Refactoring
|
2020-09-15 17:23:57 +03:00 |
|
|
|
68d43001c3
|
web: common: bump version
|
2020-09-15 15:48:55 +03:00 |
|
|
|
4e34836e4e
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-15 15:47:47 +03:00 |
|
|
|
3c0d0c0523
|
Web: Common: fixed filter styles
|
2020-09-15 15:10:12 +03:00 |
|
Artem Tarasov
|
fcf878dd6b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 15:06:00 +03:00 |
|
Artem Tarasov
|
2c831475f1
|
web: components: bump version
|
2020-09-15 14:51:44 +03:00 |
|
Artem Tarasov
|
1c3d96ee95
|
Web:Components: TreeMenu: added props isEmptyRootNode
|
2020-09-15 14:50:14 +03:00 |
|
|
|
01a8aa22b4
|
web: common: bump version
|
2020-09-15 14:47:53 +03:00 |
|
|
|
584bee8198
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-15 14:47:03 +03:00 |
|
|
|
01d6e7d3ad
|
Web: Commpon: fixed the display of the filter selector element
|
2020-09-15 14:46:53 +03:00 |
|
TatianaLopaeva
|
ce32451441
|
Changed reducer and actions: added setLicenseUpload and resetUploadedLicense
|
2020-09-15 14:16:12 +03:00 |
|
Artem Tarasov
|
7b33aeb6da
|
web: components: bump version
|
2020-09-15 13:15:18 +03:00 |
|
Artem Tarasov
|
2e3f2075c1
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 13:15:10 +03:00 |
|
Artem Tarasov
|
dea62a40f7
|
Web:Components: added props isFullFillSelection, gapBetweenNodes, gapBetweenNodesTablest
|
2020-09-15 13:14:11 +03:00 |
|
TatianaLopaeva
|
ed85445dcc
|
Changed format
|
2020-09-15 11:10:19 +03:00 |
|
TatianaLopaeva
|
7da745b96c
|
Refactoring actions and reducer
|
2020-09-15 11:01:54 +03:00 |
|
|
|
2800aa92fe
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 10:39:05 +03:00 |
|
Alexey Kostenko
|
33cce1d47e
|
web: components: bump version
|
2020-09-15 09:02:44 +03:00 |
|
Alexey Kostenko
|
72ac3e9b15
|
Web: Client/Components: Fix dropDown styles on wizard
|
2020-09-15 09:02:24 +03:00 |
|
|
|
c760b61f92
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-14 22:04:48 +03:00 |
|
|
|
90b73fa631
|
Web: Componnets: Styling AvatarEditor on desktop
|
2020-09-14 22:04:40 +03:00 |
|
Artem Tarasov
|
d731e2cafa
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-14 14:35:36 +03:00 |
|
Artem Tarasov
|
2bcf9ca3bb
|
web: components: bump version
|
2020-09-14 14:32:56 +03:00 |
|
Vladislav Makhov
|
7cc130bdc9
|
Web: Common: sorting dropdown is now hiding, when option clicked
|
2020-09-14 14:02:11 +03:00 |
|
TatianaLopaeva
|
1f887f4b5b
|
Refactoring
|
2020-09-14 12:31:56 +03:00 |
|
Alexey
|
525412c98c
|
web: components: bump version
|
2020-09-14 08:52:06 +03:00 |
|
Alexey
|
69b8d0ec7d
|
Web: Files/People/Components: Content rendered without columns on mobile devices
|
2020-09-14 08:51:54 +03:00 |
|
|
|
65fbf2247e
|
Update yarn.lock files
|
2020-09-11 22:51:28 +03:00 |
|
|
|
df1cfafb45
|
web: components: bump version
|
2020-09-11 22:41:33 +03:00 |
|
|
|
8045eecf1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2020-09-11 22:30:09 +03:00 |
|
|
|
99a6fd523e
|
Web: Client: Moved organizationName into authReducer
|
2020-09-11 18:03:40 +03:00 |
|
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
Alexey
|
d457266fbc
|
web: components: bump version
|
2020-09-11 12:55:47 +03:00 |
|
Alexey
|
564f1828ca
|
Web: Components: Fixed icons in dropDownItem in mainButton
|
2020-09-11 12:55:30 +03:00 |
|
Alexey
|
2917b302c8
|
web: components: bump version
|
2020-09-11 10:27:58 +03:00 |
|
Alexey
|
b56605468c
|
Web: Components: Fixed incorrect display when rendering long text
|
2020-09-11 10:27:41 +03:00 |
|
Alexey
|
ae4323ec64
|
web: components: bump version
|
2020-09-11 08:57:25 +03:00 |
|
Alexey
|
ae4bb0d01c
|
Web: Components: Fix context menu (incorrect width when first opened)
|
2020-09-11 08:57:03 +03:00 |
|
TatianaLopaeva
|
18147c3248
|
Added color for text when support is not available
|
2020-09-11 08:31:44 +03:00 |
|
TatianaLopaeva
|
e4034a8724
|
Added information when support is not available by layout, changed logic for data comparison
|
2020-09-10 17:17:23 +03:00 |
|
|
|
ab75c4ba88
|
web: components: bump version
|
2020-09-10 16:34:43 +03:00 |
|
|
|
e4c359617f
|
Web: Components: fixed link-with-dropdown maxHeight prop
|
2020-09-10 16:34:01 +03:00 |
|
TatianaLopaeva
|
3968d09123
|
Refactoring styles for header-container
|
2020-09-10 16:24:11 +03:00 |
|
Artem Tarasov
|
6a219488e9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-10 16:01:30 +03:00 |
|
TatianaLopaeva
|
c4cdfe3191
|
Deleted nav-thumb-horizontal
|
2020-09-10 15:54:02 +03:00 |
|
TatianaLopaeva
|
fae1522c01
|
Refactoring styles for advantages-container
|
2020-09-10 15:04:13 +03:00 |
|
TatianaLopaeva
|
2b24c97d9e
|
Refactoring styles of advantages-container
|
2020-09-10 14:57:29 +03:00 |
|
Vladislav Makhov
|
0496705714
|
Login Page: fix styles
|
2020-09-10 14:49:57 +03:00 |
|
Vladislav Makhov
|
11a94363de
|
Update README.md
|
2020-09-10 14:14:46 +03:00 |
|
Vladislav Makhov
|
7e6fc0b600
|
Added new prop: saveButtonLoading
|
2020-09-10 14:12:05 +03:00 |
|
|
|
7433eea815
|
Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh
|
2020-09-10 13:19:06 +03:00 |
|
Artem Tarasov
|
11844629d9
|
added Icons.DepartmensGroupIcon
|
2020-09-10 12:49:24 +03:00 |
|
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +03:00 |
|
|
|
3f37da9891
|
fix notify
|
2020-09-10 12:02:26 +03:00 |
|
TatianaLopaeva
|
8a465e838d
|
Refactoring
|
2020-09-10 09:08:23 +03:00 |
|
TatianaLopaeva
|
305bb8ac7b
|
Refactoring
|
2020-09-10 09:05:55 +03:00 |
|
|
|
323823981a
|
Update yarn.lock files
|
2020-09-09 22:25:31 +03:00 |
|
|
|
718a6e2ebb
|
web: common: bump version
|
2020-09-09 22:03:33 +03:00 |
|
|
|
e8f1d01aae
|
Web: Common: PeopleSelector: hidden user tooltip (issue: too slow work)
|
2020-09-09 22:03:12 +03:00 |
|
|
|
aa2632a3a0
|
web: common: bump version
|
2020-09-09 21:50:17 +03:00 |
|
|
|
f0871880e7
|
web: components: bump version
|
2020-09-09 21:50:07 +03:00 |
|
|
|
99db325520
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-09 21:49:34 +03:00 |
|
|
|
b3b6fd0938
|
Web: Components: Re-written ModalDialog component with SLOT pattern
|
2020-09-09 21:49:25 +03:00 |
|
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
Artem Tarasov
|
d7237f43ba
|
web: common: bump version
|
2020-09-09 18:06:58 +03:00 |
|
Artem Tarasov
|
25834a705c
|
fixed warning selectedOption of type string
|
2020-09-09 18:06:09 +03:00 |
|
TatianaLopaeva
|
dc4199a6c8
|
Changed componentDidMount and componentDidUpdate at index, changed reducer and actions
|
2020-09-09 17:06:42 +03:00 |
|
Artem Tarasov
|
1fd0f3c010
|
fixed redirect edit/view profile in people
|
2020-09-09 15:35:50 +03:00 |
|
Alexey
|
ddd3a70b67
|
web: common: bump version
|
2020-09-09 14:46:24 +03:00 |
|
Alexey
|
7ba59aae1e
|
Web: Common: Temporarily hiding the settings module from left menu
|
2020-09-09 14:45:53 +03:00 |
|
TatianaLopaeva
|
957c7cd741
|
Changed style for header-container
|
2020-09-09 11:22:44 +03:00 |
|
TatianaLopaeva
|
46e9124f81
|
Added api methods for payments
|
2020-09-08 15:39:45 +03:00 |
|
|
|
d30026b82f
|
Merge branch 'master' into feature/files
|
2020-09-08 15:20:05 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
|
|
56ea45d492
|
web: components: bump version
|
2020-09-08 10:37:52 +03:00 |
|
|
|
72f5e6161d
|
Web: Components: fix empty screen container
|
2020-09-08 10:37:40 +03:00 |
|
|
|
33b2f60c45
|
web: components: bump version
|
2020-09-08 09:58:07 +03:00 |
|
|
|
a2ea415cd6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-08 09:57:25 +03:00 |
|
|
|
64dd0e2bd6
|
Web: Components: fixed empty-screen-container
|
2020-09-08 09:57:04 +03:00 |
|
|
|
72ebd235ec
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-07 18:42:57 +03:00 |
|
|
|
b357a52f7f
|
Merge branch 'feature/payments-enterprise' of github.com:ONLYOFFICE/AppServer into feature/payments-enterprise
|
2020-09-07 18:42:46 +03:00 |
|
|
|
9778b258d7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:41:51 +03:00 |
|
|
|
efbebc05b5
|
Update yarn.lock files
|
2020-09-07 18:41:42 +03:00 |
|
|
|
3729d92a5a
|
web: common: bump version
|
2020-09-07 18:35:03 +03:00 |
|
|
|
1dff214c06
|
Web: Common: Remove error routing on 500 error
|
2020-09-07 18:34:47 +03:00 |
|
Artem Tarasov
|
797dd6c249
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:27:39 +03:00 |
|
Artem Tarasov
|
6d68dfd0c6
|
added redirect from / to homepage(settings in state.auth.settings.homepage)
|
2020-09-07 18:26:44 +03:00 |
|
|
|
886c7d6464
|
Merge branch 'master' into feature/files
|
2020-09-07 18:16:33 +03:00 |
|
|
|
98c20197fd
|
web: components: bump version
|
2020-09-07 18:12:13 +03:00 |
|
|
|
58d2db1d97
|
Web: Components: fixed text-input disable color
|
2020-09-07 18:10:40 +03:00 |
|
|
|
9899880bff
|
web: common: bump version
|
2020-09-07 17:32:02 +03:00 |
|
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
|
96df0ab8ca
|
Api: added payment settings
|
2020-09-07 16:53:39 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
TatianaLopaeva
|
e802727b1b
|
Changed style for buttons
|
2020-09-07 14:46:58 +03:00 |
|
TatianaLopaeva
|
ca16bff3d0
|
Deleted text about Created Portals
|
2020-09-07 14:34:51 +03:00 |
|
TatianaLopaeva
|
5be50ebef9
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
|
2020-09-06 13:10:24 +03:00 |
|
TatianaLopaeva
|
71fee5aab4
|
Added id for FileInput
|
2020-09-06 13:04:33 +03:00 |
|
TatianaLopaeva
|
23666db461
|
Changed style for buttons, added logic for loading file when clicking a file, hidden FileInput
|
2020-09-06 12:49:37 +03:00 |
|
|
|
52104fafd6
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
|
2020-09-04 21:36:25 +03:00 |
|
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
|
cf53c32ff4
|
web: common: bump version
|
2020-09-04 20:54:50 +03:00 |
|
|
|
31f19a0f96
|
Web: Client: Refactoring of initial requests calling
|
2020-09-04 20:37:53 +03:00 |
|
|
|
de41a366f6
|
Web: Client: Fixed layout in Wizard and removed useless constant
|
2020-09-04 20:34:00 +03:00 |
|
|
|
8907f8b315
|
Web: Common: API client: Added support of 402 and +500 statuses
|
2020-09-04 20:32:34 +03:00 |
|
|
|
ac8fa40c01
|
Web: Common: Added body text to Error520
|
2020-09-04 20:30:34 +03:00 |
|
|
|
22b7b8ff52
|
web: common: bump version
|
2020-09-04 15:57:06 +03:00 |
|
|
|
4fd7cffa63
|
Web: Common: fixed sort button
|
2020-09-04 15:56:49 +03:00 |
|
Ilya Oleshko
|
728b00ab93
|
web: common: bump version
|
2020-09-04 13:56:49 +03:00 |
|
Ilya Oleshko
|
4794084ef1
|
Web: Common: FilterInput : Fix default height for items
|
2020-09-04 13:56:37 +03:00 |
|
|
|
f9e1c7bc02
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-04 12:25:57 +03:00 |
|
TatianaLopaeva
|
eb8b6fce38
|
Changed the license upload notification: Added toastr and Deleted modal-dialog-container, Changed text of notification
|
2020-09-04 12:05:55 +03:00 |
|
Artem Tarasov
|
f4329a6ef9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-04 11:36:41 +03:00 |
|
Artem Tarasov
|
a017814a62
|
fixed wizard render
|
2020-09-04 11:36:16 +03:00 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +03:00 |
|
|
|
4686122183
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-04 10:15:48 +03:00 |
|
TatianaLopaeva
|
c104ed287c
|
Delete debugger
|
2020-09-04 08:41:47 +03:00 |
|
|
|
cbace5e1b4
|
Merge branch 'master' into feature/files
|
2020-09-03 18:32:51 +03:00 |
|
|
|
82dd4a8828
|
Settings: fix timeZones for unix
|
2020-09-03 18:30:14 +03:00 |
|
|
|
db97b65727
|
Merge branch 'master' into feature/files
|
2020-09-03 17:40:26 +03:00 |
|
TatianaLopaeva
|
9b240a3539
|
Changed appsettings added window.location.href for 402
|
2020-09-03 17:01:59 +03:00 |
|
|
|
0f4877b541
|
AuthService: selectel instruction fix
|
2020-09-03 12:12:03 +03:00 |
|
|
|
4fc7427aed
|
AuthService: added description
|
2020-09-03 11:43:13 +03:00 |
|
|
|
db0539a8fa
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:02:59 +03:00 |
|
Artem Tarasov
|
bad94255f7
|
web: components: bump version
|
2020-09-02 18:05:25 +03:00 |
|
Artem Tarasov
|
72476521cd
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:03:27 +03:00 |
|
|
|
4ed48f06b4
|
Web: Client: Added forceBackend in createI18N
|
2020-09-02 18:02:42 +03:00 |
|
Artem Tarasov
|
70ea5261db
|
Changed layout of ToggleButton (fixed indent for caption)
|
2020-09-02 18:02:36 +03:00 |
|
|
|
3c11d95772
|
Web: Settings: Fixed crash on language undefined
|
2020-09-02 18:02:15 +03:00 |
|
TatianaLopaeva
|
2a56b6dda4
|
Changed text by figma
|
2020-09-02 16:52:13 +03:00 |
|
|
|
dc0940cca0
|
Web: Settings: Fixed TypeError: Cannot read property 'label' of undefined
|
2020-09-02 13:01:24 +03:00 |
|
|
|
0eb3b2b4d3
|
Update yarn.lock files
|
2020-09-02 12:30:53 +03:00 |
|
|
|
0b208d2fa2
|
web: common: bump version
|
2020-09-02 12:19:46 +03:00 |
|
|
|
da50146545
|
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render)
|
2020-09-02 12:19:21 +03:00 |
|
|
|
4babaa5e67
|
Web: People: Fixed work with customNames
|
2020-09-02 11:59:36 +03:00 |
|
