IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,400 Commits 40 Branches 22 Tags 420 MiB
8e5fcfc3c8
Commit Graph

2955 Commits

Author SHA1 Message Date
Nikolay Rechkin
8e5fcfc3c8 Quota: errors 2022-08-29 23:35:25 +03:00
Nikolay Rechkin
933a4129fa Quota: string representation of quota 2022-08-29 20:20:58 +03:00
Nikolay Rechkin
ff8cfa3737 Quota: api 2022-08-29 15:03:36 +03:00
pavelbannov
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
pavelbannov
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
Alexey Safronov
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
Alexey Safronov
53737a06e8 Merge branch 'develop' into refactoring/client 
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
 2022-07-28 10:38:29 +03:00
pavelbannov
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
Alexey Safronov
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
Alexey Safronov
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
af9011620d Web:People: update filter selected items 2022-07-21 10:43:08 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
Viktor Fomin
3123ba7993 Web: People: fix redirect 2022-07-20 00:49:11 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
Alexey Safronov
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
mushka
676934f4d0 commented out print button in BackupCodes dialog 2022-07-19 17:54:15 +03:00
Alexey Safronov
067e105814 Merge branch 'develop' into feature/modal-redesign 2022-07-19 16:58:02 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr 
# Conflicts:
#	.gitignore
 2022-07-18 17:05:53 +03:00
Maria-Sukhova
2da8d83a8a add new keys 2022-07-15 16:34:46 +03:00
Maria-Sukhova
bb51d53cc4 add new keys-17 2022-07-15 15:02:07 +03:00
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
 2022-07-14 11:56:07 +03:00
TimofeyBoyko
bfc1422ba7 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-14 06:01:51 +03:00
Viktor Fomin
dfcc00995a Web: People: fix redirect tfa reset 2022-07-13 21:52:09 +03:00
Viktor Fomin
389ae00068
Merge branch 'develop' into bugfix/tfa 2022-07-13 21:09:12 +03:00
pavelbannov
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
Viktor Fomin
943895e6b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tfa 2022-07-13 19:54:13 +03:00
Viktor Fomin
cccbf540dd Web: People: ResetApplicationDialog: fix redirect and close 2022-07-13 19:48:11 +03:00
mushka
f02c9445c4 removed NotBeUndone translation key 2022-07-13 18:05:57 +03:00
mushka
f63c570349 fixed ConvertDialog translations 2022-07-13 17:55:30 +03:00
mushka
523b974fc5 deleted unused translation keys 2022-07-13 15:26:52 +03:00
pavelbannov
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
TimofeyBoyko
c59ffe797a Web:People: fix filter after refactoring 2022-07-12 17:04:30 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
Artem Tarasov
120f5f7b17 Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0 2022-07-10 12:34:16 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
mushka
3facc47665 removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud 2022-07-08 12:50:44 +03:00
pavelbannov
7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-07-07 17:41:41 +03:00
mushka
2ba523da5f fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs 2022-07-07 17:40:23 +03:00
mushka
a75fdc7690 fixed ChangedStatus and DeleteUsers 2022-07-07 13:36:50 +03:00
pavelbannov
a04ae63a82 MemberModel: CultureName 2022-07-07 12:05:31 +03:00
mushka
3fd65e887d Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-06 18:13:33 +03:00
mushka
b80f1c3237 redesigned SendInviteDialog and fixed VersionHistory 2022-07-06 18:01:38 +03:00
mushka
ce4e9c26fd removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword 2022-07-06 13:02:52 +03:00
SuhorukovAnton
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00