|
|
23945aeb24
|
Api: backup removed
|
2020-06-25 16:25:03 +03:00 |
|
|
|
b01b3d85f8
|
Backup: fix
|
2020-06-25 16:10:28 +03:00 |
|
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
|
1871959768
|
fix
|
2020-06-25 15:17:22 +03:00 |
|
|
|
2fe2c2167b
|
Merge branch 'master' into feature/thumbnails
# Conflicts:
# ASC.Web.sln
|
2020-06-25 15:01:38 +03:00 |
|
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
SuhorukovAnton
|
e21d99e361
|
Thumbnails: fix
|
2020-06-23 14:19:12 +03:00 |
|
SuhorukovAnton
|
cce4d5fa7a
|
Thumbnails: delete unnecessary
|
2020-06-23 14:14:13 +03:00 |
|
SuhorukovAnton
|
4e839c9b11
|
Backup: transfer to ASC.Data.Backup
|
2020-06-23 13:48:36 +03:00 |
|
|
|
f43816738b
|
Files: fix
|
2020-06-22 21:58:16 +03:00 |
|
SuhorukovAnton
|
6f4bd59c6d
|
Thumbnails: refactoring
|
2020-06-21 14:45:31 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
SuhorukovAnton
|
5fbe80d32a
|
Thumbnails: first version
|
2020-06-16 14:55:46 +03:00 |
|
|
|
38c40eec05
|
Merge branch 'master' into feature/backup
|
2020-06-15 18:40:26 +03:00 |
|
|
|
9276bfd384
|
Backup: fix
|
2020-06-15 18:33:53 +03:00 |
|
Ilya Oleshko
|
e2cef60f0f
|
web: components: bump version
|
2020-06-11 15:55:13 +03:00 |
|
Ilya Oleshko
|
9ab3b7557b
|
web: common: bump version
|
2020-06-11 15:55:03 +03:00 |
|
Ilya Oleshko
|
a1f3b4bde0
|
Web: Removed faker package, updated yarn lock and fixed stories
|
2020-06-11 15:54:53 +03:00 |
|
|
|
7ee4237af4
|
Update storybook packages (Fix ReDoS vulnerability in websocket-extensions)
|
2020-06-11 15:13:43 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
|
3c66bbb607
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:48:07 +03:00 |
|
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
|
f59be0f44b
|
Merge branch 'master' into feature/backup
|
2020-06-04 17:12:34 +03:00 |
|
|
|
b569245076
|
rever logger
|
2020-06-04 16:47:27 +03:00 |
|
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
|
|
a14049e88f
|
Settings: fixed GetSupportedCultures
|
2020-06-03 18:51:01 +03:00 |
|
SuhorukovAnton
|
89368aed8b
|
Backup: refactoring
|
2020-06-03 12:15:05 +03:00 |
|
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
SuhorukovAnton
|
9655101d2b
|
Backup: add DIHelper's methods and fix startup
|
2020-05-28 16:28:51 +03:00 |
|
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
|
|
22ae4383b6
|
UrlShortener: fix
|
2020-05-22 13:58:12 +03:00 |
|
|
|
1700ba1965
|
UrlShortener: config
|
2020-05-22 12:41:14 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
91d287a2d5
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
|
2020-05-14 17:14:59 +03:00 |
|
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +03:00 |
|
|
|
7bf739fe09
|
Optimization
|
2020-05-07 14:02:29 +03:00 |
|
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
|
44f84c8056
|
Files: Service. first version
|
2020-04-23 12:38:50 +03:00 |
|
|
|
c5ff09ac09
|
Added DI for Voip
|
2020-04-17 17:07:44 +03:00 |
|
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|
|
|
1dbdb1aedd
|
Files: configuration
|
2020-04-15 18:39:59 +03:00 |
|
|
|
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 |
|
