Alexey Kostenko
|
87d2c42a6b
|
Web: Component: Style fix
|
2020-10-13 17:31:36 +03:00 |
|
Alexey Kostenko
|
f16145ae62
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-13 17:00:18 +03:00 |
|
Alexey Kostenko
|
d99d4f5f99
|
web: components: bump version
|
2020-10-13 16:57:58 +03:00 |
|
Alexey Kostenko
|
e95be64ea6
|
Web: Components/People: Small refactoring
|
2020-10-13 16:57:44 +03:00 |
|
|
49f5a52433
|
Update yarn.lock files
|
2020-10-13 16:52:17 +03:00 |
|
|
2884bd8de3
|
web: common: bump version
|
2020-10-13 16:33:22 +03:00 |
|
|
2fa205cb6f
|
Web: Clients: Fixed catching of initial API errors
|
2020-10-13 16:31:21 +03:00 |
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
|
3dd9f71dda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 15:51:24 +03:00 |
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
|
668cb3e893
|
Merge branch 'master' into feature/files
|
2020-10-13 15:27:31 +03:00 |
|
|
bcbefb8f26
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-13 15:08:22 +03:00 |
|
Alexey Kostenko
|
1bf8b3e886
|
web: components: bump version
|
2020-10-13 14:52:55 +03:00 |
|
Alexey Kostenko
|
9a144cb8c4
|
Web: Components: Style fix
|
2020-10-13 14:52:45 +03:00 |
|
Vladislav Makhov
|
632f83927b
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-13 14:26:31 +03:00 |
|
Artem Tarasov
|
24a0fe17b4
|
web: common: bump version
|
2020-10-13 13:45:40 +03:00 |
|
Artem Tarasov
|
a4a959f972
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 13:43:16 +03:00 |
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +03:00 |
|
|
9968873305
|
Merge branch 'master' into feature/fix_API_return
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-10-13 13:33:24 +03:00 |
|
|
01f00d49ae
|
web: common: bump version
|
2020-10-13 13:32:46 +03:00 |
|
|
1d4b3785bb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-13 13:31:24 +03:00 |
|
|
0712677297
|
Web: Common: fixed MediaViewer close, fixed share dropdown styles
|
2020-10-13 13:30:26 +03:00 |
|
Vladislav Makhov
|
6bcfcc4987
|
Merge branch 'feature/files' into feature/files-recent
|
2020-10-13 13:16:37 +03:00 |
|
|
a504251359
|
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
|
2020-10-13 12:55:37 +03:00 |
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# 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
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
TatianaLopaeva
|
dbdc134ef0
|
web: common: bump version
|
2020-10-13 12:18:48 +03:00 |
|
TatianaLopaeva
|
ac697d28fc
|
Web: Added getLanguage selector
|
2020-10-13 12:17:45 +03:00 |
|
|
b1d50e5702
|
Core: fix DI
|
2020-10-13 11:26:17 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
|
65fd5ee2f3
|
Api: fix DI
|
2020-10-13 11:13:24 +03:00 |
|
|
fb5a6b9926
|
Api: fix DI
|
2020-10-13 11:11:03 +03:00 |
|
|
bead971061
|
Api: fix DI
|
2020-10-13 11:09:22 +03:00 |
|
TatianaLopaeva
|
8d09a45fab
|
web: common: bump version
|
2020-10-13 10:54:49 +03:00 |
|
TatianaLopaeva
|
6a0e34a7a2
|
Web: Common: Added language into array of useEffect
|
2020-10-13 10:52:44 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
383478d3bd
|
fix
|
2020-10-12 19:13:51 +03:00 |
|
TatianaLopaeva
|
df8fbcc050
|
Web: Components: Update icon by layout
|
2020-10-12 16:58:06 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Vladislav Makhov
|
22da8b836d
|
fix after merge
|
2020-10-12 15:31:21 +03:00 |
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Artem Tarasov
|
8453611714
|
Web: Common: added SettingsFiles loader
|
2020-10-12 14:52:49 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
Artem Tarasov
|
679413c7b1
|
Web: Client: wizard: fixed layout
|
2020-10-12 12:01:27 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +03:00 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +03:00 |
|
Alexey Kostenko
|
237f737ba7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-11 20:04:18 +03:00 |
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
|
3afd5dedda
|
web: common: bump version
|
2020-10-09 19:07:10 +03:00 |
|
|
f4ed52d985
|
Web: Added and applied new API method getDocServiceUrl
|
2020-10-09 19:06:50 +03:00 |
|
|
a01fb879a4
|
Web: Common: remove duplicate getIsLoaded selector
|
2020-10-09 18:28:02 +03:00 |
|
|
615f514bfd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-10-09 17:24:50 +03:00 |
|
Ilya Oleshko
|
ef545675d2
|
web: components: bump version
|
2020-10-09 17:08:40 +03:00 |
|
Ilya Oleshko
|
5e8a4727ac
|
Web: Components : Row : Added contentElement
|
2020-10-09 17:07:35 +03:00 |
|
Artem Tarasov
|
128d25ef9b
|
web: common: bump version
|
2020-10-09 16:11:00 +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 |
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
a969f26f05
|
Web: Common: fixed getFoldersTree api
|
2020-10-09 00:23:36 +03:00 |
|
|
cedca7b3c3
|
Web: Common: added rootFolderType to getFoldersTree api
|
2020-10-08 23:56:57 +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 |
|
|
718dc8cc5a
|
Web: Files: fixed dragging
|
2020-10-08 17:54:04 +03:00 |
|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
TatianaLopaeva
|
0b56cae632
|
Web: Added className and color for icon, margin-right moved to styles
|
2020-10-08 16:35:43 +03:00 |
|
Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +03:00 |
|
TatianaLopaeva
|
3fb980fefc
|
Web: Added font-weight and color by layout
|
2020-10-08 14:51:40 +03:00 |
|
TatianaLopaeva
|
51b86b2620
|
Merge branch 'feature/files' into feature/people-filter-empty-screen
|
2020-10-08 14:15:51 +03:00 |
|
Alexey Kostenko
|
1129a00d21
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-08 14:00:50 +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 |
|
TatianaLopaeva
|
a992234355
|
Web: Changed margin-right by layout
|
2020-10-08 12:05:48 +03:00 |
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
Vladislav Makhov
|
c59be4f0dd
|
Fix code after merge
|
2020-10-08 11:08:58 +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
|
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 |
|
|
6cf7358b92
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:25:37 +03:00 |
|
Vladislav Makhov
|
a72c087e2a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:18:06 +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 |
|
|
cbcf6bef85
|
Web: Files: removed auth selectors from files
|
2020-10-07 17:23:02 +03:00 |
|
Vladislav Makhov
|
b24bc1f05a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-07 17:11:40 +03:00 |
|
|
9d87b8de09
|
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
|
2020-10-07 16:52:54 +03:00 |
|
|
3bf8bd5103
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 16:41:24 +03:00 |
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +03:00 |
|
TatianaLopaeva
|
da23f36f09
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 16:02:18 +03:00 |
|
TatianaLopaeva
|
34506827b5
|
Update yarn.lock
|
2020-10-07 15:53:29 +03:00 |
|
TatianaLopaeva
|
5c328f596e
|
web: components: bump version
|
2020-10-07 15:38:27 +03:00 |
|
Alexey Kostenko
|
d5b62f7bb2
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-07 15:30:56 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +03:00 |
|
Ilya Oleshko
|
c0d798c141
|
Web: Client: Confirm : Fixed min password length property, now it get from settings
|
2020-10-07 15:02:56 +03:00 |
|
Vladislav Makhov
|
e7fc2fef13
|
Add Recent to the tree node.
|
2020-10-07 14:26:08 +03:00 |
|
|
42a1b993f1
|
web: common: bump version
|
2020-10-07 14:06:43 +03:00 |
|
|
63f6e26eea
|
Web: Common: added new selectors, added rootFolderName field to getFoldersTree api
|
2020-10-07 14:06:28 +03:00 |
|
Vladislav Makhov
|
df482665d7
|
Add "Recent" icon.
|
2020-10-07 13:59:03 +03:00 |
|
Vladislav Makhov
|
4e6280804e
|
web: components: bump version
|
2020-10-07 13:57:29 +03:00 |
|
|
803041cbda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 13:48:34 +03:00 |
|
|
ed47263adf
|
Merge branch 'master' into feature/files
|
2020-10-07 13:48:11 +03:00 |
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +03:00 |
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
1475af5f28
|
web: common: bump version
|
2020-10-07 12:49:50 +03:00 |
|
|
5738e82451
|
web: components: bump version
|
2020-10-07 12:49:14 +03:00 |
|
|
cbde3120aa
|
Web: Common: Removed Layout and StudioLayout components
|
2020-10-07 12:48:38 +03:00 |
|
TatianaLopaeva
|
ee460787d5
|
Web: Components: Refactoring
|
2020-10-07 10:59:31 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +03:00 |
|
|
7fb3ce6c09
|
Web: People: Added groups for API people loading
|
2020-10-06 19:07:10 +03:00 |
|
|
f9bf1dc7d7
|
Web: Common: Removed useless code
|
2020-10-06 18:18:36 +03:00 |
|
SuhorukovAnton
|
d247223f86
|
ASC.AuditTrail: fix
|
2020-10-06 15:12:57 +03:00 |
|
Vladislav Makhov
|
e265dbf7c5
|
fix index by agreement
|
2020-10-06 15:03:29 +03:00 |
|
SuhorukovAnton
|
8fb13f633c
|
ASC.AuditTrail
|
2020-10-06 14:24:12 +03:00 |
|
|
3ad873f1c8
|
Web: People: Restored fields in filtering data
|
2020-10-06 12:46:10 +03:00 |
|
|
fcc1ca32dd
|
Web: Fixed showing Error404 before user not loaded
|
2020-10-06 11:53:56 +03:00 |
|
Vladislav Makhov
|
1992be53b8
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/yarn.lock
|
2020-10-06 11:40:12 +03:00 |
|
|
af756a1e76
|
Web: Fixed opening @self profile view
|
2020-10-06 11:33:53 +03:00 |
|
Alexey Kostenko
|
39ee2f972c
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-06 11:15:53 +03:00 |
|
|
8f086d1183
|
Web: Fixed NavMenu crash on currentProduct equals null
|
2020-10-06 10:10:42 +03:00 |
|
SuhorukovAnton
|
d145bcf076
|
ASC.AuditTrail: first version
|
2020-10-06 10:06:05 +03:00 |
|
Alexey Kostenko
|
06278e3c64
|
web: components: bump version
|
2020-10-06 07:00:56 +03:00 |
|
Alexey Kostenko
|
5df3850527
|
Web: People/Components: Added handling of the cancel button
|
2020-10-06 07:00:37 +03:00 |
|
TatianaLopaeva
|
d5dbebfe1e
|
Web: Components: Refactoring
|
2020-10-05 21:22:03 +03:00 |
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
TatianaLopaeva
|
2b848be23d
|
Web: Components: Change styles by layout
|
2020-10-05 20:38:13 +03:00 |
|
|
b741d9c7d7
|
Web: Components: Remove debugger
|
2020-10-05 18:25:24 +03:00 |
|
|
a6bc650da6
|
Web: Common: NavMenu refactoring
|
2020-10-05 18:25:01 +03:00 |
|
Alexey Kostenko
|
ea9f691e1a
|
web: components: bump version
|
2020-10-05 17:15:34 +03:00 |
|
Alexey Kostenko
|
b45965a15c
|
Web: Components/People: Added cancel button on avatar editor page
|
2020-10-05 17:15:25 +03:00 |
|
TatianaLopaeva
|
b3d82c1e25
|
Changed font-style and font-weight for EmptyScreenContainer
|
2020-10-05 16:20:33 +03:00 |
|
|
0add76cd16
|
Web: Components: Added fix of error displaying
|
2020-10-05 16:09:35 +03:00 |
|
Alexey Kostenko
|
e6572e9574
|
Web: People/Components: Style fix, added translate keys
|
2020-10-05 15:39:55 +03:00 |
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
|
3de5601671
|
web: common: bump version
|
2020-10-05 14:28:41 +03:00 |
|
|
4629dfd077
|
web: components: bump version
|
2020-10-05 14:28:30 +03:00 |
|
|
8e0dc5dda4
|
Web: Client: Fixed merge error
|
2020-10-05 14:26:31 +03:00 |
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Alexey Kostenko
|
f481376a08
|
web: components: bump version
|
2020-10-04 14:41:51 +03:00 |
|
Alexey Kostenko
|
98d006d825
|
Web: Components: Fix mobile styles on AvatarEditor
|
2020-10-04 14:41:39 +03:00 |
|
Vladislav Makhov
|
3e4cdf4379
|
Add icon
|
2020-10-02 16:49:24 +03:00 |
|
Vladislav Makhov
|
cdc0e92cc1
|
web: components: bump version
|
2020-10-02 16:40:54 +03:00 |
|
Vladislav Makhov
|
e697ae9cff
|
Minor fixes
|
2020-10-02 10:41:24 +03:00 |
|
Alexey Kostenko
|
18f504aaa4
|
web: components: bump version
|
2020-10-02 10:10:47 +03:00 |
|
Alexey Kostenko
|
19a7d88fe1
|
Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page
|
2020-10-02 10:10:40 +03:00 |
|
|
7bbba5f158
|
Web: People: Re-written Home/Body with selectors and reselect + refactoring
|
2020-10-01 22:01:52 +03:00 |
|
Artem Tarasov
|
b4c144df74
|
Web: Common: refactoring createPasswordHash
|
2020-10-01 19:04:10 +03:00 |
|
|
c008acee57
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
|
2020-10-01 17:32:12 +03:00 |
|
|
e936ab4fc0
|
web: common: bump version
|
2020-10-01 13:16:53 +03:00 |
|
|
3b2648b18c
|
Web: Common: fixed main wrapper height
|
2020-10-01 13:16:31 +03:00 |
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
Artem Tarasov
|
053b3c902c
|
refactoring getPortalSettings
|
2020-10-01 11:42:59 +03:00 |
|
Artem Tarasov
|
afedcc603c
|
Web: Client: wizard: deleted unused props
|
2020-10-01 11:06:48 +03:00 |
|
Artem Tarasov
|
db7ac80645
|
refactoring getPortalSettings
|
2020-10-01 09:56:22 +03:00 |
|
TatianaLopaeva
|
01423d1159
|
Merge branch 'feature/files' into featrure/fixe-switching-language
|
2020-10-01 09:38:28 +03:00 |
|
TatianaLopaeva
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
TatianaLopaeva
|
2261880855
|
Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function
|
2020-10-01 09:08:25 +03:00 |
|
TatianaLopaeva
|
2c1adaadde
|
web: common: bump version
|
2020-10-01 09:04:56 +03:00 |
|
TatianaLopaeva
|
015b985755
|
web: common: bump version
|
2020-10-01 09:01:15 +03:00 |
|
|
ccd1aef9f8
|
Web: Re-written NavMenu with selectors and reselect
|
2020-10-01 01:25:08 +03:00 |
|
Artem Tarasov
|
45e70f6d11
|
fixed missing hashSettings after logout
|
2020-10-01 00:46:33 +03:00 |
|
Artem Tarasov
|
17d999f538
|
refactoring
|
2020-10-01 00:44:49 +03:00 |
|
Artem Tarasov
|
f7064f3baa
|
Web: Common: login: added hashPassword
|
2020-09-30 21:20:51 +03:00 |
|
|
2f1d43df7b
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-30 21:11:08 +03:00 |
|
|
140d57d5d4
|
Merge branch 'master' into feature/files
|
2020-09-30 18:28:27 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
Artem Tarasov
|
8db1420cdd
|
Merge branch 'master' into feature/hash-password
|
2020-09-30 17:24:51 +03:00 |
|
|
58126fd98d
|
Auth by passwordHash
|
2020-09-30 17:16:48 +03:00 |
|
SuhorukovAnton
|
f618f8799b
|
fix-messages: IDE0062
|
2020-09-30 15:46:16 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
Artem Tarasov
|
bfdfcbb4b5
|
Web: Client: Wizard: added password hash
|
2020-09-30 14:22:14 +03:00 |
|
Artem Tarasov
|
235193fb6b
|
web: common: bump version
|
2020-09-30 11:45:47 +03:00 |
|
Artem Tarasov
|
b7cda3333e
|
Web: Common: added function createHashPassword
|
2020-09-30 11:43:19 +03:00 |
|
Vladislav Makhov
|
490fb4ee3e
|
Add func's to work with api
|
2020-09-30 11:28:46 +03:00 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
Artem Tarasov
|
5b5018a214
|
web: common: bump version
|
2020-09-30 10:44:06 +03:00 |
|
|
b56df84bce
|
Settings: added password settings
|
2020-09-29 18:08:54 +03:00 |
|
Vladislav Makhov
|
731a8b8504
|
Add working with GET /@favorites
|
2020-09-29 16:52:54 +03:00 |
|
SuhorukovAnton
|
31cc18f568
|
fix-messages: IDE1006
|
2020-09-29 15:27:28 +03:00 |
|
SuhorukovAnton
|
9b6ccc19f0
|
fix-messages: IDE0074
|
2020-09-29 14:51:34 +03:00 |
|
|
86207e27fc
|
Web: Applied prettier styled and removed debugger
|
2020-09-29 14:46:28 +03:00 |
|
SuhorukovAnton
|
a055c71610
|
fix-messages: IDE0070
|
2020-09-29 14:32:30 +03:00 |
|
|
981e7646ca
|
Web: Files: Fixed opening DocEditor
|
2020-09-29 14:21:37 +03:00 |
|
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 |
|
Vladislav Makhov
|
d5d086761e
|
Refactoring
|
2020-09-09 12:42:45 +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 |
|
Vladislav Makhov
|
1ff8b7b3a1
|
Refactoring
|
2020-09-09 10:32:51 +03:00 |
|
Vladislav Makhov
|
657901777f
|
Refactoring
|
2020-09-09 09:00:27 +03:00 |
|
Vladislav Makhov
|
86438647b8
|
Format PropTypes
|
2020-09-08 16:07:07 +03:00 |
|
Vladislav Makhov
|
66a0d9f60d
|
PropTypes
|
2020-09-08 15:54:20 +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 |
|
Vladislav Makhov
|
0b9ed12c85
|
Remove consumers icons
|
2020-09-08 14:37:17 +03:00 |
|
Vladislav Makhov
|
8a9af72f1e
|
Fix url address
|
2020-09-08 14:06:43 +03:00 |
|
Vladislav Makhov
|
24a2df3b16
|
Fix tree settings for t.p.s.
|
2020-09-08 13:38:25 +03:00 |
|
Vladislav Makhov
|
d864984596
|
Refactoring
|
2020-09-08 13:08:56 +03:00 |
|
Vladislav Makhov
|
806e48bd6d
|
Fix translation
|
2020-09-08 12:09:17 +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 |
|
Vladislav Makhov
|
653d60d897
|
Format styles
|
2020-09-08 10:57:26 +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 |
|
Vladislav Makhov
|
eccc420fd1
|
Format styles
|
2020-09-08 10:30:09 +03:00 |
|
Vladislav Makhov
|
31f28acf88
|
Fix logos
|
2020-09-08 10:21:49 +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 |
|
Vladislav Makhov
|
9934a6b06e
|
Refactoring
|
2020-09-08 09:10:55 +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 |
|