IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,972 Commits 38 Branches 22 Tags 359 MiB
9ce72036ec
Commit Graph

22972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TimofeyBoyko
95e03a49d2 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-11 14:55:50 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
Viktor Fomin
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
Viktor Fomin
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
TimofeyBoyko
5f41dc12ed Web:Files:Store: delete useless selectedRoomsStore 2022-07-11 14:21:47 +03:00
TimofeyBoyko
50620640eb Web:Files:SelectedFolderStore: add isPinned and roomType 2022-07-11 14:21:21 +03:00
TimofeyBoyko
4e63873bc4 Web:Files:FilesStore: add isRoom and isRootRoom for navigationPath at fetchFiles 2022-07-11 14:20:47 +03:00
Alexey Safronov
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
Viktor Fomin
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
mushka
44fc6509f3 Merge branch 'develop' into feature/modal-redesign 2022-07-11 13:54:06 +03:00
MaksimChegulov
45ae2510ab Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api 2022-07-11 13:41:43 +03:00
Vashchuk Nikita
ab5279ae4c fix Backup Context 2022-07-11 13:37:20 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +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
Viktor Fomin
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
Vashchuk Nikita
dcd6faf781 fix for merge 2022-07-11 12:29:45 +03:00
Alexey Safronov
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
Viktor Fomin
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
Alexey Safronov
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2 
Release/v1.2
 2022-07-11 10:47:33 +03:00
pavelbannov
7dfaf60592 Files: refactoring 2022-07-10 22:21:09 +03:00
Artem Tarasov
05cf3b7d18 Web: Doceditor: fixed deletion of initial state 2022-07-10 13:01:18 +03:00
Artem Tarasov
a9c9649197 Web: Doceditor: refactoring server, deleted unnecessary code 2022-07-10 12:57:07 +03:00
Artem Tarasov
a1d599ee43 Web: Doceditor: modified webpack dev config 2022-07-10 12:53:58 +03:00
Artem Tarasov
2a74e0e8cd Web: Doceditor: deleted unnecessary files 2022-07-10 12:47:15 +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
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr 
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
 2022-07-10 11:23:44 +03:00
TimofeyBoyko
ca099daffb Web:Common: fixed export and import decodeDisplayName 2022-07-08 18:30:50 +03:00
TimofeyBoyko
2e72e298e6 Web:Common: fixed export and import decodeDisplayName 2022-07-08 18:29:50 +03:00
TimofeyBoyko
43b9b6183c Web:Common:Api: add decodeDisplayName to getRooms and getRoom api rooms methods 2022-07-08 18:22:11 +03:00
TimofeyBoyko
2155df63fe Web:Common:Api: move decodeDisplayName function from files api to utils 2022-07-08 18:20:25 +03:00
TimofeyBoyko
42cc6dc5a5 Web:Files:Home: remove useless sorting from section body of tile view 2022-07-08 18:06:52 +03:00
MaksimChegulov
70c1476686 Files: added sorting by room type/tags 2022-07-08 17:31:37 +03:00
Alexey Safronov
4987f53335 Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-08 17:26:55 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
Viktor Fomin
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00
Viktor Fomin
f69194b034 Web: Client: TfaActivation: fix error 2022-07-08 16:22:30 +03:00
Viktor Fomin
6a690fc175 Web: Client: fix confirmLinkData 2022-07-08 16:22:08 +03:00
SuhorukovAnton
63c2c34d44 refactoring tests 2022-07-08 15:31:07 +03:00
Alexey Safronov
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files 
Files: update docstore submodule
 2022-07-08 15:11:18 +03:00
TimofeyBoyko
fffe60a1c7 Web:Files:VirtualRooms:TileView/TableView: add select tag to filter function 2022-07-08 15:00:30 +03:00
TimofeyBoyko
54435e755e Web:Common:Api: fix equals rooms filter method 2022-07-08 14:50:42 +03:00
TimofeyBoyko
ee572da527 Web:Files:RoomsActionsStore: add onSelectTag action 2022-07-08 14:41:55 +03:00
TimofeyBoyko
a6a0bb9cc2 Web:Files:Store: init roomsActionsStore 2022-07-08 14:41:32 +03:00
TimofeyBoyko
b9e8ae7edc Web:Components:Tag: fix onClick function 2022-07-08 14:41:06 +03:00
TimofeyBoyko
e5c46f62b6 Web:Common:Tags: add onSelectTag function 2022-07-08 14:40:49 +03:00
TimofeyBoyko
f9fa940fb2 Web:Common:Api: fix clone rooms filter 2022-07-08 14:40:30 +03:00
Vashchuk Nikita
4628769136 fix Contexts, 
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
 2022-07-08 14:24:18 +03:00
Vashchuk Nikita
841dd52eac fix AutoMigrationCreator 2022-07-08 14:19:13 +03:00
pavelbannov
b294b557b0 removed ConfigureAwait 2022-07-08 13:39:07 +03:00
pavelbannov
e80613e8db Files: fix 2022-07-08 13:28:27 +03:00