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

4266 Commits

Author SHA1 Message Date
pavelbannov
7c6bf909a6 Files: fixed query 2021-03-26 12:50:04 +03:00
pavelbannov
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00
Alexey Safronov
f8c2f20fe8
Merge branch 'develop' into feature/workspaces 2021-03-23 14:21:30 +03:00
pavelbannov
a94a87855a People: fix ChangeUserPassword 2021-03-23 14:18:44 +03:00
AlexeySafronov
4c9e366f43 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:43:31 +03:00
TatianaLopaeva
7ef1429cb7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:40:23 +03:00
TatianaLopaeva
cc707204d9 Web: Removed jumps of article when the page is loading. 2021-03-23 10:39:37 +03:00
AlexeySafronov
d9e3e96ab8 Web: Fix: init Files 2021-03-23 10:33:05 +03:00
AlexeySafronov
0d6fcd6f52 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 22:37:34 +03:00
AlexeySafronov
051a69e5b5 Web: People: GroupAction: Fix translation loading 2021-03-22 22:37:21 +03:00
pavelbannov
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +03:00
TatianaLopaeva
6bb12c9524 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 21:10:23 +03:00
TatianaLopaeva
21b6567f7a Web: People: Fix proxy route. 2021-03-22 21:10:15 +03:00
gopienkonikita
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
gopienkonikita
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
Ilya Oleshko
de8dc35fca Web: Files: Apply route proxy 2021-03-22 20:51:52 +03:00
AlexeySafronov
a1eb540d9d Web: Files: Fixed routing from settings and folder 2021-03-22 20:34:02 +03:00
AlexeySafronov
92530da98f Web: Files: Fix proxy 2021-03-22 20:26:35 +03:00
AlexeySafronov
0847693c55 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:02:03 +03:00
AlexeySafronov
577464933b Web: Files: Fixed proxy 2021-03-22 20:00:04 +03:00
gopienkonikita
b0c430b7ba Merge branch 'develop' into feature/workspaces 2021-03-22 19:46:49 +03:00
gopienkonikita
12af2890dc Web: Files: fixed markAsRead 2021-03-22 19:21:36 +03:00
pavelbannov
44c4967f0f Files: indexes renamed 2021-03-22 18:43:51 +03:00
TatianaLopaeva
26ef7bdd65 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:31:41 +03:00
AlexeySafronov
e279ece3c4 Removed commented code 2021-03-22 18:24:19 +03:00
TatianaLopaeva
9baae539d2 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904 Web: Fixed displaying of shared files at aside & Deleted useless code. 2021-03-22 18:11:39 +03:00
AlexeySafronov
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
AlexeySafronov
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
gopienkonikita
78fd4f632c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:46:34 +03:00
gopienkonikita
879259f160 Web: People: fixed getting peopleList 2021-03-22 16:45:24 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
Artem Tarasov
0fcdbd3fd7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:16:03 +03:00
Artem Tarasov
a616d79ccf Web: Files: fixed folder selection when clicking from settings 2021-03-22 16:15:18 +03:00
Ilya Oleshko
c689b59a03 Web: Files: Added missing ErrorBoundary import 2021-03-22 15:57:44 +03:00
Ilya Oleshko
70187ebd96 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:56:05 +03:00
Ilya Oleshko
49e28e53a4 Web: Files: Apply route proxy 2021-03-22 15:55:56 +03:00
gopienkonikita
89f2431e1c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:33:50 +03:00
gopienkonikita
05b417f63d Web: People: hidden the phone field 2021-03-22 15:31:42 +03:00
Viktor Fomin
5a9c782fc5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:08:46 +03:00
Viktor Fomin
12f920047c Web: People: fixed translate 2021-03-22 13:08:40 +03:00
TatianaLopaeva
7dc1b80ab6 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:00:35 +03:00
TatianaLopaeva
7c56caf2a6 Web: People: Fixed returned to the homepage after created group. 2021-03-22 12:59:06 +03:00
AlexeySafronov
f8a2b438a9 Web: People: Add URL proxy 2021-03-22 12:06:30 +03:00
TatianaLopaeva
d0f2d9871f Web: People: Deleted useless code at icon path. 2021-03-22 11:46:31 +03:00
AlexeySafronov
d568693154 Big Fix commit: 
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
 2021-03-22 00:34:21 +03:00
Viktor Fomin
30d7c7bd8f Web: Files: fixed article width 2021-03-20 16:21:18 +03:00
AlexeySafronov
75859212ab Web: People: Fix conversation of Filter to URL and back 2021-03-20 13:16:45 +03:00
AlexeySafronov
deafba32a7 Web: Files: Fix conversation of Filter to URL and back 2021-03-20 12:51:08 +03:00