Vladislav Makhov
|
c92a6d9c1c
|
Add Favorite catalog icon
|
2020-09-29 13:33:52 +03:00 |
|
SuhorukovAnton
|
1da0de1200
|
fix-messages: IDE0065
|
2020-09-29 13:28:03 +03:00 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
Vladislav Makhov
|
218722ad4b
|
Add Favorites icon
|
2020-09-29 09:54:16 +03:00 |
|
Vladislav Makhov
|
b75457b3a8
|
web: components: bump version
|
2020-09-29 09:53:27 +03:00 |
|
TatianaLopaeva
|
09f8b3df6b
|
Deleted unnecessary variable
|
2020-09-29 09:18:43 +03:00 |
|
TatianaLopaeva
|
ea2f5ec097
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-29 09:06:16 +03:00 |
|
TatianaLopaeva
|
463bdc0ec8
|
Refactoring buttonContainer and index
|
2020-09-29 09:05:02 +03:00 |
|
Alexey Kostenko
|
d7ce84f7a2
|
web: components: bump version
|
2020-09-29 08:14:43 +03:00 |
|
Alexey Kostenko
|
d29e743a2b
|
Web: Components: Changed animation of toast notifications, fixed styles for mobile devices
|
2020-09-29 08:14:29 +03:00 |
|
SuhorukovAnton
|
29ec562a78
|
fix-messages: IDE0038
|
2020-09-28 18:21:29 +03:00 |
|
SuhorukovAnton
|
bc98087599
|
fix-messages: IDE0018
|
2020-09-28 17:25:40 +03:00 |
|
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +03:00 |
|
Artem Tarasov
|
bb905602de
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 16:19:47 +03:00 |
|
TatianaLopaeva
|
eaa24436db
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:04:54 +03:00 |
|
TatianaLopaeva
|
a09953ff73
|
Refactoring and added Trans from "react-i18next"
|
2020-09-28 16:03:43 +03:00 |
|
|
|
a4cbb9f386
|
Files: fix openedit
|
2020-09-28 15:45:26 +03:00 |
|
|
|
9f48311b4b
|
Files: fix openedit
|
2020-09-28 15:13:30 +03:00 |
|
Ilya Oleshko
|
dea73cfbad
|
web: common: bump version
|
2020-09-28 14:48:45 +03:00 |
|
Ilya Oleshko
|
be3a505035
|
Web: Common: Api : Files : Fixed request for folder tree, now request only folders
|
2020-09-28 14:47:20 +03:00 |
|
Artem Tarasov
|
6e832d47c2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:10:23 +03:00 |
|
Artem Tarasov
|
5426089bdb
|
Web: Client: refactoring translate Wizard
|
2020-09-28 13:09:34 +03:00 |
|
|
|
2c1d473314
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
TatianaLopaeva
|
8139997ada
|
Refactoring headerContainer
|
2020-09-28 12:07:18 +03:00 |
|
TatianaLopaeva
|
26efa35a32
|
Refactoring translation
|
2020-09-28 11:35:53 +03:00 |
|
|
|
0dbae1adfd
|
Merge branch 'master' into feature/files
|
2020-09-28 11:32:13 +03:00 |
|
|
|
056fefcd40
|
Web: Common: Added ProfileMenu actions to NavMenu
|
2020-09-28 11:26:21 +03:00 |
|
TatianaLopaeva
|
e51c65d0b7
|
Refactoring to variables condition
|
2020-09-28 10:19:08 +03:00 |
|
TatianaLopaeva
|
48854fcb5e
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 10:14:35 +03:00 |
|
Alexey Kostenko
|
10fd501560
|
web: common: bump version
|
2020-09-28 09:13:49 +03:00 |
|
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
TatianaLopaeva
|
3357a2c687
|
Refactoring reducer
|
2020-09-25 16:38:36 +03:00 |
|
Alexey Kostenko
|
d1c926e3cd
|
Web: Common: Added component Toast to common library (for translate titles)
|
2020-09-25 16:13:28 +03:00 |
|
SuhorukovAnton
|
c455419113
|
Telegram: fix Kafka
|
2020-09-25 14:13:43 +03:00 |
|
TatianaLopaeva
|
eac4556983
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-25 10:44:31 +03:00 |
|
TatianaLopaeva
|
c9a8fcbd13
|
Re-write to variables condition
|
2020-09-25 10:39:22 +03:00 |
|
|
|
72cf8e4f2b
|
Web: Moved RowsLoader to ASC.Web.Common
|
2020-09-25 10:36:13 +03:00 |
|
Alexey Kostenko
|
881793cf25
|
web: components: bump version
|
2020-09-25 09:43:03 +03:00 |
|
Alexey Kostenko
|
3a9d6f704d
|
Web: Components: Fix toast styles
|
2020-09-25 09:42:56 +03:00 |
|
Alexey Kostenko
|
aca3543ec1
|
web: components: bump version
|
2020-09-25 09:02:14 +03:00 |
|
Alexey Kostenko
|
ebd67c98e7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-25 09:02:02 +03:00 |
|
Alexey Kostenko
|
a8f987cca8
|
Web: Components: Restyle Toast
|
2020-09-25 09:01:05 +03:00 |
|
SuhorukovAnton
|
693e35ac57
|
add ASC.TelegramService
|
2020-09-24 17:30:27 +03:00 |
|
|
|
0e6f803f0b
|
web: common: bump version
|
2020-09-24 16:54:50 +03:00 |
|
|
|
7b6d320ebe
|
Web: Common: fixed icons
|
2020-09-24 16:54:31 +03:00 |
|
|
|
0a52fb4449
|
web: common: bump version
|
2020-09-24 15:32:11 +03:00 |
|
|
|
a4357170a3
|
Web: Common: fixed image-viewer icons
|
2020-09-24 15:31:53 +03:00 |
|
TatianaLopaeva
|
06b6386489
|
Simplify action type
|
2020-09-24 15:24:58 +03:00 |
|
|
|
12099717ed
|
web: common: bump version
|
2020-09-24 15:07:26 +03:00 |
|
|
|
c6b7a5ac29
|
Web: Files: added hiding aside panel on actions from the main button
|
2020-09-24 15:06:37 +03:00 |
|
TatianaLopaeva
|
555f9b0812
|
Refactoring and deleted className
|
2020-09-24 14:30:19 +03:00 |
|
TatianaLopaeva
|
a99796c122
|
Changed padding by figma layout
|
2020-09-24 14:14:47 +03:00 |
|
TatianaLopaeva
|
89f11d6484
|
Refactoring button/index
|
2020-09-24 14:11:34 +03:00 |
|
|
|
b04f22b6e5
|
Web: Moved TreeFolderLoader to ASC.Web.Common
|
2020-09-24 13:58:18 +03:00 |
|
|
|
f2b0cdf1af
|
Web: Moved HeadlineLoader to ASC.Web.Common
|
2020-09-24 13:37:54 +03:00 |
|
TatianaLopaeva
|
5d01d660a5
|
Return lock.png
|
2020-09-24 13:05:17 +03:00 |
|
|
|
4c214e2ff2
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-24 12:56:52 +03:00 |
|
TatianaLopaeva
|
59716a184b
|
Deleted png images
|
2020-09-24 12:14:56 +03:00 |
|
TatianaLopaeva
|
6021ea4a76
|
Deleted png images
|
2020-09-24 12:01:08 +03:00 |
|
|
|
885eb4a691
|
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
|
2020-09-23 18:42:47 +03:00 |
|
TatianaLopaeva
|
32b76b88f6
|
Hiding the payments module
|
2020-09-23 17:59:01 +03:00 |
|
TatianaLopaeva
|
e5cf2db796
|
Refactoring toast
|
2020-09-23 17:45:02 +03:00 |
|
TatianaLopaeva
|
e515be4271
|
Refactoring styles, actions and reducer
|
2020-09-23 16:58:02 +03:00 |
|
TatianaLopaeva
|
60cc7c1706
|
Added setDocumentTitle
|
2020-09-23 15:41:12 +03:00 |
|
TatianaLopaeva
|
1849e3712d
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-23 15:25:23 +03:00 |
|
TatianaLopaeva
|
1a0881d58a
|
Refactoring styles
|
2020-09-23 14:44:27 +03:00 |
|
Artem Tarasov
|
202b277f3d
|
web: components: bump version
|
2020-09-23 14:13:02 +03:00 |
|
|
|
ec6dc5aa46
|
fix merge
|
2020-09-23 14:11:39 +03:00 |
|
Artem Tarasov
|
b09e770834
|
Web: Components: tree-menu: fixed margin-left of swithcer
|
2020-09-23 14:09:04 +03:00 |
|
|
|
a085e8ef38
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
|
2020-09-23 14:00:24 +03:00 |
|
|
|
6f5cc4a447
|
Api: fix
|
2020-09-23 13:55:39 +03:00 |
|
|
|
4c7983fe7c
|
Settings: fix
|
2020-09-23 13:22:23 +03:00 |
|
TatianaLopaeva
|
ee148a0b23
|
Refactoring styles
|
2020-09-23 11:08:41 +03:00 |
|
|
|
a2be460357
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-09-22 19:11:45 +03:00 |
|
|
|
075798b90c
|
moved from release/11 4414f77b
|
2020-09-22 17:17:17 +03:00 |
|
TatianaLopaeva
|
27774c97bd
|
Refactoring styles for headerContainer and buttonContainer (added grid for desktop)
|
2020-09-22 17:08:18 +03:00 |
|
|
|
e6f39b1092
|
web: components: bump version
|
2020-09-22 17:07:20 +03:00 |
|
|
|
4892f01960
|
Web: Components: fixed context menu clickability
|
2020-09-22 17:06:58 +03:00 |
|
Alexey Kostenko
|
634534afbb
|
Web: Common: Bump version
|
2020-09-22 15:49:42 +03:00 |
|
Alexey Kostenko
|
16ed13b745
|
Web: Common: Fix mobile ArticleBody styles
|
2020-09-22 15:49:09 +03:00 |
|
Artem Tarasov
|
33903723fd
|
web: common: bump version
|
2020-09-22 15:44:05 +03:00 |
|
Artem Tarasov
|
4d90d03407
|
web: components: bump version
|
2020-09-22 15:43:56 +03:00 |
|
Artem Tarasov
|
8748a0fc52
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 15:43:15 +03:00 |
|
TatianaLopaeva
|
41930dcb38
|
Changed min-width for containers
|
2020-09-22 15:36:29 +03:00 |
|
|
|
5e8ae65235
|
web: common: bump version
|
2020-09-22 15:33:31 +03:00 |
|
|
|
6101dc32db
|
Web: Common: fixed main styles
|
2020-09-22 15:33:12 +03:00 |
|
Artem Tarasov
|
0dbbbc3ab6
|
Web: Components: fixed color props passing in row-content
|
2020-09-22 15:14:44 +03:00 |
|
Artem Tarasov
|
9632515ea1
|
Web: Common: fixed color of label in sort-combobox
|
2020-09-22 15:10:55 +03:00 |
|
TatianaLopaeva
|
f9ca91fe51
|
Refactoring styles
|
2020-09-22 14:56:52 +03:00 |
|
|
|
fe0d4a16b5
|
web: common: bump version
|
2020-09-22 14:15:22 +03:00 |
|
|
|
c65fa43050
|
Web: Common: fixed main style
|
2020-09-22 14:14:30 +03:00 |
|
TatianaLopaeva
|
2ae3926d1b
|
Added inserts line breaks when words are exceeding the width of the container, to avoid overflow.
|
2020-09-22 11:43:08 +03:00 |
|
TatianaLopaeva
|
87ee165027
|
Refactoring styles
|
2020-09-22 10:31:33 +03:00 |
|
|
|
2c3a8dfc44
|
web: common: bump version
|
2020-09-22 10:16:38 +03:00 |
|
|
|
6936c060e5
|
Web: Common: fixed MediaViewer styles
|
2020-09-22 10:15:37 +03:00 |
|
|
|
b761e83e22
|
web: components: bump version
|
2020-09-22 09:23:56 +03:00 |
|
|
|
2676c8df5f
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-22 09:23:35 +03:00 |
|
|
|
7a665f229e
|
Web: Components: fixed hiding items on iOS devices
|
2020-09-22 09:23:27 +03:00 |
|
|
|
1b2776aecc
|
Web: Common: Added defaultPage
|
2020-09-21 19:31:24 +03:00 |
|
|
|
04b223d681
|
Web: Common: Show content after userLoaded
|
2020-09-21 19:27:39 +03:00 |
|
|
|
86bcde60b1
|
Web: Common: Extracted Main and NavMenu as separated components from Layout
|
2020-09-21 18:27:22 +03:00 |
|
TatianaLopaeva
|
a6b602851b
|
Added changeDocumentTitle
|
2020-09-21 15:15:38 +03:00 |
|
Artem Tarasov
|
ff84c7cbf1
|
web: common: bump version
|
2020-09-21 14:54:54 +03:00 |
|
TatianaLopaeva
|
ca420104fc
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
|
2020-09-21 14:54:05 +03:00 |
|
Artem Tarasov
|
1bf4a243fd
|
Web: Client: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:53:24 +03:00 |
|
Artem Tarasov
|
b02a06af5e
|
Web: Common: deleted changeDocumentTitle()
|
2020-09-21 14:48:07 +03:00 |
|
TatianaLopaeva
|
24c93d2026
|
Added useTranslation to containers
|
2020-09-21 14:39:06 +03:00 |
|
TatianaLopaeva
|
13a9e3e73b
|
Changed styles and Added flexible length for tablet and mobile
|
2020-09-21 10:17:20 +03:00 |
|
|
|
642472ce22
|
TenantExtra: fix
|
2020-09-20 20:27:51 +03:00 |
|
|
|
0000129b3b
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
|
2020-09-20 20:17:12 +03:00 |
|
Artem Tarasov
|
916eb0439c
|
web: common: bump version
|
2020-09-19 23:28:37 +03:00 |
|
Artem Tarasov
|
405eabd720
|
Web: Components: fixed passing props selectedOprions in PeopleSelector
|
2020-09-19 23:24:18 +03:00 |
|
|
|
7b4441676e
|
Update yarn.lock files
|
2020-09-19 18:35:17 +03:00 |
|
|
|
548b6c428d
|
web: common: bump version
|
2020-09-19 18:27:08 +03:00 |
|
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
|
|
144dde2699
|
Encryption: fix notify
|
2020-09-18 20:57:51 +03:00 |
|
TatianaLopaeva
|
2d684556b6
|
Refactoring
|
2020-09-18 18:15:12 +03:00 |
|
|
|
9a092cb8ec
|
moved from release/11 4414f77b
|
2020-09-18 17:45:59 +03:00 |
|
TatianaLopaeva
|
833b2c8860
|
Refactoring
|
2020-09-18 17:36:56 +03:00 |
|
TatianaLopaeva
|
0945cf05f3
|
Refactoring
|
2020-09-18 17:33:33 +03:00 |
|
|
|
eb3336ad6a
|
web: common: bump version
|
2020-09-18 17:07:17 +03:00 |
|
|
|
dbad9de295
|
Web: Common: fixed progress styles
|
2020-09-18 17:06:58 +03:00 |
|
|
|
4a09b4b5f2
|
Web: fixed body scroll
|
2020-09-18 17:06:35 +03:00 |
|
|
|
5b070d3509
|
web: common: bump version
|
2020-09-18 15:57:36 +03:00 |
|
|
|
52753d7bc3
|
web: components: bump version
|
2020-09-18 15:57:24 +03:00 |
|
|
|
809d167e29
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-18 15:54:55 +03:00 |
|
|
|
17ffb8999d
|
Web: Common: fixed progress styles
|
2020-09-18 15:45:21 +03:00 |
|
|
|
44d63d3642
|
Web: Components: fixed Dnd styles
|
2020-09-18 15:43:08 +03:00 |
|
TatianaLopaeva
|
81583aca4f
|
Changed logic for standaloneMod and refactoring header-container
|
2020-09-18 14:46:54 +03:00 |
|
TatianaLopaeva
|
564b250438
|
Changed margin of header-container
|
2020-09-18 13:23:35 +03:00 |
|
SuhorukovAnton
|
8cbc380241
|
encryption: fix
|
2020-09-18 13:06:32 +03:00 |
|
SuhorukovAnton
|
cb365ba75f
|
encryption: add api-metods getProgress and getSettings
|
2020-09-18 13:02:20 +03:00 |
|
TatianaLopaeva
|
f4e876ccb5
|
Refactoring styles of advantages-container, button-container, contact-container
|
2020-09-18 12:25:49 +03:00 |
|
TatianaLopaeva
|
fa89566f8f
|
Added headline
|
2020-09-18 12:24:14 +03:00 |
|
TatianaLopaeva
|
57d8da2600
|
Changed translation (ru)
|
2020-09-18 12:22:57 +03:00 |
|
Artem Tarasov
|
a04ca81999
|
web: common: bump version
|
2020-09-18 11:19:53 +03:00 |
|
Artem Tarasov
|
c43a476236
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-18 11:19:35 +03:00 |
|
Artem Tarasov
|
f3b8e4880c
|
Web: Files: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:18:48 +03:00 |
|
Artem Tarasov
|
e369f6a9e0
|
Web: Common: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:17:40 +03:00 |
|
Artem Tarasov
|
3492be5ca4
|
Web: Common: added function changeTitleDocument to utils
|
2020-09-18 11:12:09 +03:00 |
|
|
|
a35a79c96a
|
moved from release/11 4414f77b
|
2020-09-18 10:59:23 +03:00 |
|
Alexey Kostenko
|
04bf97ff08
|
Web: Components: Bump version
|
2020-09-18 10:45:02 +03:00 |
|
Alexey Kostenko
|
ab2a7b7fdb
|
Web: Components: Fix DropDown in mainMutton
|
2020-09-18 10:44:30 +03:00 |
|
TatianaLopaeva
|
332b267157
|
Refactoring header-container
|
2020-09-18 10:24:48 +03:00 |
|
TatianaLopaeva
|
b1b07fc5de
|
Changed logic of getSettingsPayment
|
2020-09-18 10:22:35 +03:00 |
|
Alexey Kostenko
|
67137aae94
|
Web: Components: Bump version
|
2020-09-18 10:13:38 +03:00 |
|
Alexey Kostenko
|
c88bca4a4b
|
Web: Components: Fix ContextMenu background in Firefox
|
2020-09-18 10:13:06 +03:00 |
|
TatianaLopaeva
|
fbb0787eff
|
Added AcceptLicense
|
2020-09-17 17:07:32 +03:00 |
|
SuhorukovAnton
|
7d3bb9e9a8
|
encryption: add api start
|
2020-09-17 16:56:12 +03:00 |
|
Alexey Kostenko
|
24a92d7e67
|
Web: Common/Components: Bump version
|
2020-09-17 16:50:37 +03:00 |
|
Alexey Kostenko
|
3b1805f1f9
|
Web: Common: Unpin sidebar if not enough screen width
|
2020-09-17 15:52:07 +03:00 |
|
|
|
d883ef441f
|
Api: moved from release/11 4414f77b
|
2020-09-17 15:04:28 +03:00 |
|
Alexey Kostenko
|
dfd94a854f
|
Web: Components/Common: Added new width constant for pin/unpin, style fix
|
2020-09-17 13:22:47 +03:00 |
|
|
|
f176d99f16
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-17 12:07:44 +03:00 |
|
|
|
2f4a3141d5
|
Web: People: Speeded up loading first page + refactoring
|
2020-09-17 11:28:23 +03:00 |
|
TatianaLopaeva
|
a858a3a846
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-17 11:25:51 +03:00 |
|
|
|
c16659c322
|
Web: Client: Removed useless markup
|
2020-09-17 10:21:15 +03:00 |
|
|
|
fdf4e7564b
|
Web: Client: Speeded up loading first page + refactoring
|
2020-09-17 10:18:44 +03:00 |
|
Vladislav Makhov
|
eb89987872
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-17 09:24:45 +03:00 |
|
Vladislav Makhov
|
26b1a18673
|
Web: Common: fix redirect after success authentication
|
2020-09-17 09:24:28 +03:00 |
|
Alexey Kostenko
|
7474fcf681
|
Web: common: bump version
|
2020-09-17 09:18:54 +03:00 |
|
Alexey Kostenko
|
d60bdedf9b
|
Web: Common: Fix pin/unpin on IOS devices
|
2020-09-17 09:17:47 +03:00 |
|
|
|
a4cb368513
|
Update yarn.lock files
|
2020-09-16 18:39:06 +03:00 |
|
|
|
f2d3336436
|
web: components: bump version
|
2020-09-16 18:32:36 +03:00 |
|
|
|
e66ca03cbb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-16 18:08:41 +03:00 |
|
|
|
ecb2879a77
|
Web: Components: Styled AvatarEditor + applied changes
|
2020-09-16 18:08:32 +03:00 |
|
|
|
94a5079503
|
Encryption: notify fix
|
2020-09-16 13:50:53 +03:00 |
|
Vladislav Makhov
|
0a7bc4d75f
|
Web: Components: fix z-index value
|
2020-09-16 12:34:22 +03:00 |
|
|
|
2209e34779
|
Api: settings. added accept license method
|
2020-09-16 12:11:37 +03:00 |
|
TatianaLopaeva
|
8ecc93a30c
|
Changed logic of upload license
|
2020-09-16 10:33:06 +03:00 |
|
Vladislav Makhov
|
931a1d9365
|
Web: Common: Removed useless commas
|
2020-09-16 09:58:05 +03:00 |
|
|
|
e5525f4e08
|
Web: Components: Removed useless comma
|
2020-09-16 09:50:31 +03:00 |
|
|
|
3b691247b2
|
Update yarn.lock files
|
2020-09-15 23:29:13 +03:00 |
|
|
|
530a2df6a6
|
web: components: bump version
|
2020-09-15 23:23:20 +03:00 |
|
|
|
5607f00069
|
Web: Components: Update storybook packages
|
2020-09-15 23:23:10 +03:00 |
|
|
|
b9b94b1784
|
WebL Components: Fixed tests on AvatarEditor
|
2020-09-15 23:16:16 +03:00 |
|
|
|
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 |
|
SuhorukovAnton
|
13edcd6a1a
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-15 11:26:43 +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 |
|
SuhorukovAnton
|
ae61f59d55
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-09 12:40:01 +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 |
|
SuhorukovAnton
|
3d79f7c484
|
encryption: fix
|
2020-09-08 11:26:05 +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 |
|
SuhorukovAnton
|
bd3c14c7ec
|
encryption: fix
|
2020-09-07 18:04:26 +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 |
|
SuhorukovAnton
|
2d3f183567
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-07 17:00:48 +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 |
|
Diana
|
463a73e22c
|
changed
|
2020-09-06 21:47:52 +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 |
|
SuhorukovAnton
|
d8576a4b0a
|
encryption: fix
|
2020-09-03 14:48:36 +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 |
|
|
|
aa62721e73
|
EF: refactoring
|
2020-09-02 18:23:39 +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 |
|
SuhorukovAnton
|
15b17a0478
|
Encryption: first version
|
2020-09-02 13:54:50 +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 |
|
|
|
6bf251bb8e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:34:23 +03:00 |
|
|
|
0152274029
|
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
|
2020-09-01 18:34:06 +03:00 |
|
Artem Tarasov
|
f28406832b
|
web: common: bump version
|
2020-09-01 18:33:54 +03:00 |
|
Artem Tarasov
|
dfb32288e8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:32:48 +03:00 |
|
|
|
00c6ce5e9b
|
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
|
2020-09-01 18:11:20 +03:00 |
|
|
|
bd6c0d0338
|
Web: Clients: Fixed windows is not defined
|
2020-09-01 18:09:39 +03:00 |
|
|
|
bc8613c4f6
|
Web: Clients: Uncommented self.skipWaiting() on install service-worker
|
2020-09-01 17:53:24 +03:00 |
|
Ilya Oleshko
|
bfee8e1365
|
web: components: bump version
|
2020-09-01 16:56:18 +03:00 |
|
Ilya Oleshko
|
3feccaaca7
|
Web: Components: Fixed ESLint validation
|
2020-09-01 16:55:28 +03:00 |
|
Ilya Oleshko
|
a15e1756d3
|
Web: Components: EmailInput, GroupButtonsMenu : Fixed ESLint validation for props
|
2020-09-01 16:28:35 +03:00 |
|
Ilya Oleshko
|
a2a2e6cda2
|
web: common: bump version
|
2020-09-01 16:07:15 +03:00 |
|
Ilya Oleshko
|
8edef50722
|
Web: Common: PageLayout : Fix ReactResizeDetector options for fast resize
|
2020-09-01 16:07:07 +03:00 |
|
Ilya Oleshko
|
8e04466542
|
web: common: bump version
|
2020-09-01 15:26:59 +03:00 |
|
Ilya Oleshko
|
d4db078349
|
web: components: bump version
|
2020-09-01 15:26:49 +03:00 |
|
Ilya Oleshko
|
4e663b9514
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 15:25:43 +03:00 |
|
Ilya Oleshko
|
f1902e1ec6
|
Web: Common: PageLayout : Added size calculating on first mount for ReactResizeDetector
|
2020-09-01 15:22:49 +03:00 |
|
Ilya Oleshko
|
1652513c73
|
Web: Components: RowContent : Added new property for more adaptive resize, fixed not work (ignore) styles
|
2020-09-01 15:20:55 +03:00 |
|
Ilya Oleshko
|
d8b0f60800
|
Web: Components: Row : Fixed refs, now it create inside constructor, add missing PropType
|
2020-09-01 15:17:59 +03:00 |
|
Ilya Oleshko
|
cdc370b04b
|
Web: Components: Utils : Size constants now imported like object of numbers
|
2020-09-01 15:15:43 +03:00 |
|
Artem Tarasov
|
f61799f1b4
|
added export Error520
|
2020-09-01 14:56:23 +03:00 |
|
TatianaLopaeva
|
6ee4cbc5b4
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-01 11:05:58 +03:00 |
|
TatianaLopaeva
|
319dbc1158
|
Added translation and text for trial period
|
2020-09-01 10:51:19 +03:00 |
|
TatianaLopaeva
|
29d2bfab61
|
Changed logic of trial
|
2020-09-01 10:35:15 +03:00 |
|
TatianaLopaeva
|
35a0cf98c0
|
Added logic of trial at header-container
|
2020-09-01 10:34:20 +03:00 |
|
Artem Tarasov
|
ba42cdcb71
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 10:16:53 +03:00 |
|
Artem Tarasov
|
d560610396
|
web: common: bump version
|
2020-09-01 10:15:27 +03:00 |
|
TatianaLopaeva
|
991cc488d7
|
Added information about trial at reducer
|
2020-09-01 09:11:30 +03:00 |
|
Artem Tarasov
|
461cb53b4e
|
added getFilesSettings
|
2020-09-01 01:05:28 +03:00 |
|
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
|
5f7265931c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-31 17:45:52 +03:00 |
|
|
|
062a3a793f
|
Update yarn.lock files
|
2020-08-31 17:45:37 +03:00 |
|
|
|
fa6144919e
|
web: common: bump version
|
2020-08-31 17:36:05 +03:00 |
|
|
|
d16652f051
|
Web: Common: fixed login page for new PageLayout body
|
2020-08-31 17:35:39 +03:00 |
|
|
|
36e283fc5c
|
web: common: bump version
|
2020-08-31 16:34:56 +03:00 |
|
|
|
a14c7b447c
|
web: components: bump version
|
2020-08-31 16:34:28 +03:00 |
|
|
|
946ed771ac
|
Web: Components: fixed empty-screen-container to new article
|
2020-08-31 16:31:56 +03:00 |
|
TatianaLopaeva
|
e8751d21c0
|
Added information when support is no longer available
|
2020-08-31 15:40:42 +03:00 |
|
TatianaLopaeva
|
af9457df7a
|
Changed logic of date
|
2020-08-31 15:15:33 +03:00 |
|
|
|
2db018dcf6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-31 13:52:34 +03:00 |
|
|
|
44aaf5267e
|
Web: Common: fixed section styles
|
2020-08-31 13:31:39 +03:00 |
|
|
|
d9f70df70a
|
Update yarn.lock files
|
2020-08-31 12:42:36 +03:00 |
|
|
|
67f2e3feb8
|
Web: Client: Added Webpack-bundle-analyzer
|
2020-08-31 11:43:26 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
SuhorukovAnton
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +03:00 |
|
|
|
1fb90663ee
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-31 10:04:45 +03:00 |
|
|
|
927d7619a7
|
web: common: bump version
|
2020-08-31 10:04:24 +03:00 |
|
|
|
a4a9234328
|
Web: Common: added react-resize-detector package, fixed styles
|
2020-08-31 10:03:19 +03:00 |
|
TatianaLopaeva
|
93e4f42e19
|
Rename visible of modal-dialog-container
|
2020-08-28 18:25:09 +03:00 |
|
TatianaLopaeva
|
611a58b7df
|
Added changed language to end data of license
|
2020-08-28 18:19:16 +03:00 |
|
Artem Tarasov
|
b859f35e5e
|
implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods
|
2020-08-28 12:13:53 +03:00 |
|
TatianaLopaeva
|
d3dde62de3
|
Changed max-width for mobile, changed api for UploadLicense, added path into App
|
2020-08-28 11:46:39 +03:00 |
|
TatianaLopaeva
|
2022bd4ac1
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-08-28 10:57:59 +03:00 |
|
TatianaLopaeva
|
54464c3320
|
Changed margin-top at header-container
|
2020-08-28 10:51:22 +03:00 |
|
TatianaLopaeva
|
6816ebc6cb
|
Rename at index and modal-dialog-container
|
2020-08-28 10:50:38 +03:00 |
|
TatianaLopaeva
|
9bac1c0639
|
Added headline for payments and some translations
|
2020-08-28 10:49:18 +03:00 |
|
TatianaLopaeva
|
4fb43397d7
|
Added translation for payments in StudioLayoute
|
2020-08-28 10:48:45 +03:00 |
|
TatianaLopaeva
|
ca776849a1
|
Rename and changed store for payments
|
2020-08-28 10:47:38 +03:00 |
|
TatianaLopaeva
|
8bea385182
|
Added a link and icon for payments in StudioLayout
|
2020-08-28 10:46:37 +03:00 |
|
TatianaLopaeva
|
da91e178d4
|
Added a link to payments and icon to sidebar
|
2020-08-28 10:45:56 +03:00 |
|
TatianaLopaeva
|
a65e06f847
|
Delete commit at index.js
|
2020-08-28 10:44:03 +03:00 |
|
TatianaLopaeva
|
35d35af498
|
Added translation and style for modal-dailog-container
|
2020-08-28 10:43:27 +03:00 |
|
TatianaLopaeva
|
ca90e4b6c2
|
Update index.js as a class, button-container and added modal-dialog container
|
2020-08-28 10:41:48 +03:00 |
|
TatianaLopaeva
|
5561348cdf
|
Rename click events
|
2020-08-28 10:41:00 +03:00 |
|
TatianaLopaeva
|
0e9e39387f
|
Update files with files upload, input was hidden, some changed in reducer
|
2020-08-28 10:39:49 +03:00 |
|
