|
a1e1cd17be
|
FileHandler: fix
|
2020-04-15 13:46:24 +03:00 |
|
|
978cf0e34e
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
|
2020-03-19 16:07:16 +03:00 |
|
|
d694819eda
|
web: common: bump version
|
2020-03-16 10:49:47 +03:00 |
|
|
0ed02f88a0
|
web: components: bump version
|
2020-03-16 10:49:34 +03:00 |
|
|
eb21f8a957
|
Update yarn.lock files
|
2020-03-16 10:37:55 +03:00 |
|
|
c6d13463ab
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-03-16 10:25:18 +03:00 |
|
dependabot[bot]
|
2f8f43a03a
|
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-03-16 07:22:50 +00:00 |
|
dependabot[bot]
|
e4e7cce565
|
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Components
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-03-14 00:55:11 +00:00 |
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +03:00 |
|
|
ba13637a97
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-03-03 09:37:46 +03:00 |
|
|
9a1a118f79
|
Merge branch 'master' into feature/elastic
|
2020-02-27 11:24:14 +03:00 |
|
|
97ae3914c5
|
web: common: bump version
|
2020-02-26 16:32:24 +03:00 |
|
|
68395a16aa
|
web: components: bump version
|
2020-02-26 16:32:14 +03:00 |
|
|
d5a4dbc5be
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-26 16:32:10 +03:00 |
|
|
b526b61bdd
|
Update yarn.lock files
|
2020-02-26 13:01:04 +03:00 |
|
|
e57e8ff935
|
web: files: Replaced fake product
|
2020-02-26 11:06:44 +03:00 |
|
|
1bc8f58df4
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-26 10:55:17 +03:00 |
|
|
ac5017da99
|
Merge branch 'master' into feature/elastic
# Conflicts:
# build/build.bat
# build/rebuild.bat
|
2020-02-26 10:46:37 +03:00 |
|
|
e4af4d168f
|
Update yarn.lock files
|
2020-02-26 10:23:38 +03:00 |
|
|
2ccd226940
|
web: clients: Fixed CRA proxy bug;
|
2020-02-26 10:02:37 +03:00 |
|
|
b5bc446cc3
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-25 13:16:02 +03:00 |
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
9db8b26985
|
Replaced NewtonsoftJson with System.Text.Json
|
2020-02-21 16:19:32 +03:00 |
|
Daniil Senkiv
|
1ae795a86b
|
web: common: bump version
|
2020-02-21 14:14:13 +03:00 |
|
Daniil Senkiv
|
b724548e98
|
web.common: fix working web.client, if api people not available
|
2020-02-21 14:13:45 +03:00 |
|
Daniil Senkiv
|
a1d249be68
|
web.common: fix problem with handling idle modules
|
2020-02-21 14:11:33 +03:00 |
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
a9f64e474f
|
Merge branch 'master' into feature/user-actions-changes
|
2020-02-21 10:20:16 +03:00 |
|
|
ed8f6ebc32
|
Web: Components: removed the click close function in the title, fixed tests
|
2020-02-21 10:10:32 +03:00 |
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
7436fd8548
|
web: common: bump version
|
2020-02-18 14:16:22 +03:00 |
|
|
c248db6cf8
|
Web: Common: fixed profile avatar size
|
2020-02-18 14:16:03 +03:00 |
|
|
c7b5d75692
|
web: common: bump version
|
2020-02-18 13:16:16 +03:00 |
|
|
f3731820cb
|
Web: Client: change title of pages, added new translations
|
2020-02-18 13:15:02 +03:00 |
|
|
259cb20de3
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2020-02-18 13:11:27 +03:00 |
|
|
76b9f99623
|
Web: Common: change title of login page, added new translations
|
2020-02-18 13:11:16 +03:00 |
|
Ilya Oleshko
|
b11717e23b
|
web: components: bump version
|
2020-02-18 12:06:41 +03:00 |
|
Ilya Oleshko
|
83a9c6d0b9
|
Web: Components: RowContent: Fixed main element with CSS property
|
2020-02-18 12:04:39 +03:00 |
|
|
7a1e6590d2
|
web: components: bump version
|
2020-02-18 10:08:09 +03:00 |
|
|
4fff8b93e5
|
Web: Components: fixed tooltip error
|
2020-02-18 10:07:10 +03:00 |
|
|
785f002c4d
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2020-02-17 16:50:49 +03:00 |
|
|
0eb0048596
|
Web: Client: change title of pages
|
2020-02-17 16:50:42 +03:00 |
|
Ilya Oleshko
|
a2049f2b1d
|
web: common: bump version
|
2020-02-17 16:38:10 +03:00 |
|
Ilya Oleshko
|
335a612895
|
web: components: bump version
|
2020-02-17 16:37:59 +03:00 |
|
Ilya Oleshko
|
2dad1f9894
|
Web: Components: DropDown: Fixed vertical change direction on mobile
|
2020-02-17 16:37:42 +03:00 |
|
Ilya Oleshko
|
42e9b3a1a2
|
Web: Components: ContextMenu: Fixed open property for DropDown
|
2020-02-17 15:31:02 +03:00 |
|
Ilya Oleshko
|
c0e3e19116
|
Web: Components: ContextMenuButton: Added vertical direction property for DropDown
|
2020-02-17 15:30:15 +03:00 |
|
Ilya Oleshko
|
7d911bbb85
|
Web: Components: FilterInput: Added default direction property for ContextMenuButton
|
2020-02-17 15:27:29 +03:00 |
|
Ilya Oleshko
|
0d3f403c43
|
Web: Components: FilterInput: Added default height css property (IOS fix)
|
2020-02-17 15:26:31 +03:00 |
|
Daniil Senkiv
|
dfe715ab32
|
web: common: bump version
|
2020-02-17 15:07:33 +03:00 |
|
Daniil Senkiv
|
312f342fac
|
web.common: PageLayout: fix pin/unpin article for first render, in addition to (efef0090be )
|
2020-02-17 15:07:25 +03:00 |
|
Daniil Senkiv
|
68c438dd37
|
web: components: bump version
|
2020-02-17 14:04:16 +03:00 |
|
Daniil Senkiv
|
f0999bc883
|
web.components: FilterInput: fix filter-block style
|
2020-02-17 14:04:06 +03:00 |
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
0448b9b678
|
web: common: bump version
|
2020-02-17 08:57:39 +03:00 |
|
|
c69a24f524
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2020-02-17 08:57:28 +03:00 |
|
|
d3344d08c4
|
Web: Common: fixed clicked logo color
|
2020-02-17 08:57:11 +03:00 |
|
Ilya Oleshko
|
b66c5bced5
|
web: components: bump version
|
2020-02-14 17:01:02 +03:00 |
|
Ilya Oleshko
|
2d5117e8b7
|
Web: Components: Row: Added minimum width css property, fixed story
|
2020-02-14 17:00:44 +03:00 |
|
Ilya Oleshko
|
4d0d156551
|
web: common: bump version
|
2020-02-14 16:30:15 +03:00 |
|
Ilya Oleshko
|
4321480ba7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 16:29:33 +03:00 |
|
Ilya Oleshko
|
f061c1bfc6
|
web: common: bump version
|
2020-02-14 16:29:23 +03:00 |
|
Ilya Oleshko
|
c711bd1254
|
Web: Common: Layout: Fixed reload on ProfileMenu items click
|
2020-02-14 16:28:53 +03:00 |
|
|
96cc38d3ca
|
web: common: bump version
|
2020-02-14 16:05:48 +03:00 |
|
|
35ee20c957
|
Web: Client: added logo icons
|
2020-02-14 16:05:32 +03:00 |
|
|
973beff6eb
|
Web: Common: added link to logo icons
|
2020-02-14 16:04:45 +03:00 |
|
Ilya Oleshko
|
400ecea112
|
Web: Components: LinkWithDropDown: Removed useless unmount test
|
2020-02-14 12:26:03 +03:00 |
|
Ilya Oleshko
|
1985a06a5f
|
web: components: bump version
|
2020-02-14 12:23:16 +03:00 |
|
Ilya Oleshko
|
9c97976bbc
|
web: common: bump version
|
2020-02-14 12:23:03 +03:00 |
|
Ilya Oleshko
|
a594a67bab
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 12:22:33 +03:00 |
|
Ilya Oleshko
|
ae73b2696d
|
Web: Common: Layout: Fixed log display
|
2020-02-14 12:22:15 +03:00 |
|
Ilya Oleshko
|
b987c10d10
|
Web: Components: DropDown: Added vertical change direction
|
2020-02-14 12:21:25 +03:00 |
|
Ilya Oleshko
|
dffa17672b
|
Web: Components: LinkWithDropDown: Added max-height for DropDown
|
2020-02-14 12:20:46 +03:00 |
|
Ilya Oleshko
|
c05d992ab4
|
Web: Components: LinkWithDropDown: Fixed onClick actions
|
2020-02-14 11:50:53 +03:00 |
|
|
cfa90eec06
|
web: common: bump version
|
2020-02-14 11:11:51 +03:00 |
|
|
3c0af2f86c
|
Web: Common: added logo click, added display of the full logo in the absence of a title
|
2020-02-14 11:11:34 +03:00 |
|
Ilya Oleshko
|
60f57f1bad
|
web: common: bump version
|
2020-02-14 09:36:35 +03:00 |
|
Ilya Oleshko
|
9b04501b43
|
Web: Common: Layout: Fixed styling icons of modules
|
2020-02-14 09:36:14 +03:00 |
|
|
785cc4c5a3
|
Files: DI
|
2020-02-13 18:12:27 +03:00 |
|
NikolayRechkin
|
649703b498
|
web: components: bump version
|
2020-02-13 16:23:34 +03:00 |
|
NikolayRechkin
|
1113b34e64
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-13 16:23:23 +03:00 |
|
NikolayRechkin
|
8905ac8080
|
web: components: fix tree menu
|
2020-02-13 16:23:12 +03:00 |
|
|
c0cc00bfbe
|
Files:DI
|
2020-02-13 15:19:25 +03:00 |
|
|
fdb258f6b6
|
web: common: bump version
|
2020-02-13 13:59:56 +03:00 |
|
|
2f0339ed7d
|
Web: Common: use utils media size
|
2020-02-13 13:59:26 +03:00 |
|
|
1809c846a3
|
web: components: bump version
|
2020-02-13 12:41:10 +03:00 |
|
|
c4733887e0
|
web: common: bump version
|
2020-02-13 12:41:02 +03:00 |
|
|
b014285203
|
web: Components: Increased margin-left for .rc-tree-switcher
|
2020-02-13 12:40:36 +03:00 |
|
|
e1f0e02f94
|
web: Common: Added hiding ArticleHeader on tablet
|
2020-02-13 12:39:32 +03:00 |
|
|
741dc0edcc
|
web: Common: Fixed Group selection margin
|
2020-02-13 12:38:42 +03:00 |
|
|
9ee1729b78
|
web: Common: Fixed header height
|
2020-02-13 12:37:49 +03:00 |
|
|
6f22e4016c
|
web: common: bump version
|
2020-02-13 11:39:45 +03:00 |
|
|
cca1c70522
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-13 11:39:18 +03:00 |
|
|
db0c592f82
|
Web: Common: fixed module title line-height
|
2020-02-13 11:39:10 +03:00 |
|
|
133ba4f715
|
Merge branch 'feature/redesign' of github.com:ONLYOFFICE/AppServer into feature/redesign
|
2020-02-13 11:12:58 +03:00 |
|
|
507cd94e98
|
Merge branch 'master' into feature/redesign
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-02-13 11:09:37 +03:00 |
|
|
336eaa6742
|
web: components: bump version
|
2020-02-13 10:39:20 +03:00 |
|
|
0538252147
|
web: common: bump version
|
2020-02-13 10:39:09 +03:00 |
|
|
b5510540aa
|
Web: Common: added logo to header
|
2020-02-13 10:38:49 +03:00 |
|
|
efef2f696d
|
Files: DI
|
2020-02-12 16:50:38 +03:00 |
|
|
9cb4e91d4a
|
Web: Components: fixed tree margin
|
2020-02-12 16:44:01 +03:00 |
|
Ilya Oleshko
|
cc4eb46c01
|
web: common: bump version
|
2020-02-12 16:18:41 +03:00 |
|
Ilya Oleshko
|
e99d1acc3c
|
Web: Common: Layout: Added use of icons from module
|
2020-02-12 16:18:23 +03:00 |
|
|
cafece5778
|
web: components: bump version
|
2020-02-12 15:26:57 +03:00 |
|
|
2655813d8c
|
web: common: bump version
|
2020-02-12 15:26:41 +03:00 |
|
|
6d530d2c8e
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-12 15:26:25 +03:00 |
|
|
70598c21c7
|
Web: Common: fixed PageLayout filter position on mobile version
|
2020-02-12 15:26:16 +03:00 |
|
NikolayRechkin
|
143624d535
|
web: components: bump version
|
2020-02-12 14:36:03 +03:00 |
|
NikolayRechkin
|
45cd442c13
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-12 14:35:41 +03:00 |
|
NikolayRechkin
|
f8fec933c3
|
web: components: fix a select in FilterInput
|
2020-02-12 14:35:25 +03:00 |
|
|
52876c8932
|
Web: Components: removed margin from row-container
|
2020-02-12 14:19:41 +03:00 |
|
|
f8eec21893
|
Web: Common: fixed PageLayout section-body padding
|
2020-02-12 14:18:57 +03:00 |
|
|
bc647d9c3d
|
web: common: bump version
|
2020-02-12 13:08:58 +03:00 |
|
|
78e8504d67
|
web: components: bump version
|
2020-02-12 13:08:28 +03:00 |
|
|
43f662acd1
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-12 13:07:45 +03:00 |
|
|
d03c28fe59
|
Web: Components: fixed input user-select, fixed filter colors
|
2020-02-12 13:07:39 +03:00 |
|
|
dfb53cbfea
|
Web: Common: fixed filter position
|
2020-02-12 13:04:37 +03:00 |
|
|
124d243d1c
|
Web: Components: fixed tree-menu margin
|
2020-02-12 13:02:27 +03:00 |
|
|
76f9319d4a
|
web: Components: Added dropDownMaxHeight for ComboBox in FilterItem
|
2020-02-12 10:47:18 +03:00 |
|
|
159bdc1a72
|
Merge branch 'master' into feature/redesign
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-02-12 09:40:56 +03:00 |
|
Ilya Oleshko
|
da37ffcb11
|
web: components: bump version
|
2020-02-12 09:36:37 +03:00 |
|
Ilya Oleshko
|
6701f3cdb7
|
Web: Components: Icon: Fixed svg icons, no more mask
|
2020-02-12 09:36:19 +03:00 |
|
|
965e8df12b
|
Core: Resources
|
2020-02-11 18:41:40 +03:00 |
|
|
e6e38befa8
|
web: common: bump version
|
2020-02-11 16:49:07 +03:00 |
|
|
36d5f594ae
|
web: Common: Fixed invalid iconName mapping
|
2020-02-11 16:48:48 +03:00 |
|
|
3fa9046bec
|
Merge branch 'master' into feature/elastic
|
2020-02-11 14:08:26 +03:00 |
|
Ilya Oleshko
|
9ee88c327d
|
web: common: bump version
|
2020-02-11 11:23:59 +03:00 |
|
Ilya Oleshko
|
3b08321c32
|
web: components: bump version
|
2020-02-11 11:23:49 +03:00 |
|
Ilya Oleshko
|
917fc0ebd1
|
Web: Components: DropDown: Fixed change direction
|
2020-02-11 11:23:30 +03:00 |
|
Ilya Oleshko
|
0e8adf3066
|
Web: Common: PageLayout: Fixed Article pin on mobile
|
2020-02-11 11:11:34 +03:00 |
|
|
a491e752cc
|
web: common: bump version
|
2020-02-10 17:35:18 +03:00 |
|
|
4218090820
|
Web: Common: set a fixed filter menu
|
2020-02-10 17:34:56 +03:00 |
|
|
702b06e786
|
web: components: bump version
|
2020-02-10 16:40:36 +03:00 |
|
|
7dbbf77505
|
web: common: bump version
|
2020-02-10 16:40:26 +03:00 |
|
|
b4b386dd3b
|
Web: Common: added automatic hiding of the scrollbar when hovering over the group tree
|
2020-02-10 16:40:04 +03:00 |
|
|
9020ac2397
|
Web: Components: added scrollbar track class names
|
2020-02-10 16:37:10 +03:00 |
|
|
26b6ef0e2c
|
Files: DI
|
2020-02-10 16:06:03 +03:00 |
|
|
d221d8d066
|
web: common: bump version
|
2020-02-10 14:38:01 +03:00 |
|
|
baa241678b
|
web: Common: Changed stype for ScrollBar in ArticleBody
|
2020-02-10 14:37:27 +03:00 |
|
|
e5d198d8c3
|
ASC.Web.Common: changed header and navigation on desktop view
|
2020-02-10 11:56:27 +03:00 |
|
Daniil Senkiv
|
61fceef6db
|
web: common: bump version
|
2020-02-07 19:49:47 +03:00 |
|
Daniil Senkiv
|
efef0090be
|
Web.Common: PageLayout: unpin article panel on mobile devices in vertical orientation, if it is very wide
|
2020-02-07 19:49:31 +03:00 |
|
Daniil Senkiv
|
207a3867f1
|
web: components: bump version
|
2020-02-07 18:29:13 +03:00 |
|
Daniil Senkiv
|
39a145a2f1
|
Web.Components: MainButton: removed blue border on tap from touch devices
|
2020-02-07 18:29:00 +03:00 |
|
Daniil Senkiv
|
0643b4734f
|
Web.Common: PageLayout: removed blue border on tap from touch devices
|
2020-02-07 18:24:30 +03:00 |
|
|
dd43c3ca47
|
web: components: bump version
|
2020-02-07 16:00:10 +03:00 |
|
|
b551486748
|
web: common: bump version
|
2020-02-07 15:59:48 +03:00 |
|
|
f540ad69f2
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
# Conflicts:
# web/ASC.Web.Common/src/components/PeopleSelector/sub-components/UserTooltip.js
# web/ASC.Web.Components/src/components/help-button/index.js
|
2020-02-07 15:57:31 +03:00 |
|
|
d06af4da03
|
web: Common: Fixed displaying HelpButton and Tooltip in AdvancedSelector
|
2020-02-07 15:41:26 +03:00 |
|
|
d2428981e4
|
web: Components: Improved HelpButton: Removed wrong css rule and added more offset props
|
2020-02-07 15:21:11 +03:00 |
|