|
e25c59fb09
|
Web: Files: Changed initialization of DocsAPI
|
2020-10-09 18:11:02 +03:00 |
|
Ilya Oleshko
|
ef545675d2
|
web: components: bump version
|
2020-10-09 17:08:40 +03:00 |
|
Ilya Oleshko
|
a129bda5ee
|
Web: Files : Home : Added share button at row
|
2020-10-09 17:08:29 +03:00 |
|
Ilya Oleshko
|
5e8a4727ac
|
Web: Components : Row : Added contentElement
|
2020-10-09 17:07:35 +03:00 |
|
Artem Tarasov
|
d7d9a55e50
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 16:23:41 +03:00 |
|
TatianaLopaeva
|
5f0c974629
|
Web: People: Added console.log
|
2020-10-09 16:16:28 +03:00 |
|
Artem Tarasov
|
128d25ef9b
|
web: common: bump version
|
2020-10-09 16:11:00 +03:00 |
|
Artem Tarasov
|
24c799ed76
|
Web: People: applied ProfileView loader
|
2020-10-09 16:10:29 +03:00 |
|
Artem Tarasov
|
421d71c4fe
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Common/src/components/Loaders/index.js
|
2020-10-09 15:58:50 +03:00 |
|
Artem Tarasov
|
5a5fb5b036
|
Web: Common: added ProfileViewLoader
|
2020-10-09 15:57:04 +03:00 |
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
1dfd7afe1c
|
Update yarn.lock files
|
2020-10-09 15:07:41 +03:00 |
|
|
4a57d0d646
|
web: common: bump version
|
2020-10-09 14:58:32 +03:00 |
|
|
a5c77baae0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 14:57:52 +03:00 |
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
TatianaLopaeva
|
77426da7fe
|
Web: People: Added console.log
|
2020-10-09 14:45:15 +03:00 |
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
|
215e33d053
|
Web: Files: Replaced hard-coded link for DocsAPI
|
2020-10-09 13:39:22 +03:00 |
|
|
e01f577f39
|
Web: People: Fixed show loading process
|
2020-10-09 13:37:41 +03:00 |
|
Ilya Oleshko
|
05041a5a77
|
Config: Fixed database name
|
2020-10-09 13:26:17 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
Alexey Kostenko
|
1f91802257
|
Web: People: Fixed opening avatar editor (Create user)
|
2020-10-08 15:17:44 +03:00 |
|
Alexey Kostenko
|
1129a00d21
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 14:00:50 +03:00 |
|
|
43a085eb18
|
Merge pull request #88 from ONLYOFFICE/feature/schema
Feature/schema
|
2020-10-08 13:51:06 +03:00 |
|
|
4059c94e34
|
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
|
2020-10-08 13:20:31 +03:00 |
|
|
798170e402
|
web: common: bump version
|
2020-10-08 12:43:21 +03:00 |
|
|
34575dab83
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-08 12:43:07 +03:00 |
|
|
e3fde6fd77
|
Web: Common: fixed main height
|
2020-10-08 12:42:59 +03:00 |
|
|
42e723ea49
|
Kafka: fix
|
2020-10-08 12:15:16 +03:00 |
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
|
b9e74c0e4d
|
DbContextManager: fix
|
2020-10-08 11:56:46 +03:00 |
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
e8061d10bd
|
DI: refactoring
|
2020-10-08 11:36:47 +03:00 |
|
Artem Tarasov
|
3d60e9ac63
|
Web: People: fixed isEdit flag
|
2020-10-08 11:10:55 +03:00 |
|
Alexey Kostenko
|
95c3a379f7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 11:03:59 +03:00 |
|
Alexey Kostenko
|
28ae6d6d6f
|
web: components: bump version
|
2020-10-08 11:02:02 +03:00 |
|
Alexey Kostenko
|
1f1dbdee36
|
Web: People: Desktop avatarEditor - Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving
|
2020-10-08 10:55:30 +03:00 |
|
Alexey Kostenko
|
a1e1915085
|
Web: Components: Hidden buttons for symmetrical reflection of the avatar
|
2020-10-08 10:47:49 +03:00 |
|
Artem Tarasov
|
608109f4a0
|
web: common: bump version
|
2020-10-08 10:29:06 +03:00 |
|
Artem Tarasov
|
e1fd3f211a
|
Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword
|
2020-10-08 10:28:36 +03:00 |
|
Alexey Kostenko
|
6d154a6019
|
web: components: bump version
|
2020-10-08 09:55:38 +03:00 |
|
Alexey Kostenko
|
f5592333c8
|
Web: People/Client: Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving, refactoring (remove callback using)
|
2020-10-08 09:55:20 +03:00 |
|
Artem Tarasov
|
e2f3daacec
|
Web: Client: confirm: added passwordHash to co createUser, activateUser
|
2020-10-07 19:52:25 +03:00 |
|
Artem Tarasov
|
2547a70498
|
Web: Client: confirm: fixed the name of the passed parameter in /people
|
2020-10-07 19:10:35 +03:00 |
|
Artem Tarasov
|
5806daa594
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 18:23:34 +03:00 |
|
Artem Tarasov
|
5e0e8e9b3b
|
Web: Client: confirm: added transfer of hash instead of password
|
2020-10-07 18:23:14 +03:00 |
|
Ilya Oleshko
|
be48e703b9
|
Web: Files : Home : Fixed context menu separator key
|
2020-10-07 17:31:59 +03:00 |
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
Artem Tarasov
|
17daf4e847
|
Web: Files: settings: fix warning
|
2020-10-07 17:15:40 +03:00 |
|