Browse Source

Merge branch 'dev' into salihozkara/auto-renewal

pull/18729/head
Salih 3 years ago
parent
commit
2646738cfc
  1. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
  2. 9
      abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json
  3. 10
      docs/en/Migration-Guides/Abp-8_0.md
  4. 5
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js

3
abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@ -589,6 +589,7 @@
"Permission:EditWinners": "Edit Winners",
"Permission:ChangeDrawingStatus": "Change Drawing Status",
"Menu:Licenses": "Licenses",
"OrganizationId": "Organization Id"
"OrganizationId": "Organization Id",
"RemoveAllWinnersConfirmationMessage": "Are you sure you want to remove all winners?"
}
}

9
abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@ -193,7 +193,7 @@
"AbpCommunityTitleContent": "ABP Community - Open Source ABP Framework",
"CommunitySlogan": "A unique community platform for <span class=\"{0}\">ABP Lovers</span>",
"RaffleIsNotActive": "Raffle is not active",
"YouAreAlreadyJoinedToThisRaffle": "You are already joined to this raffle",
"YouAreAlreadyJoinedToThisRaffle": "You already joined to this raffle!",
"InvalidSubscriptionCode": "Invalid subscription code",
"Raffle:{0}": "Raffle: {0}",
"Join": "Join",
@ -206,7 +206,7 @@
"min": "min",
"sec": "sec",
"Winners": "Winners",
"To{0}LuckyWinners": "to {0} lucky winner(s)",
"To{0}LuckyWinners": "to {0} lucky winners",
"ActiveRaffles": "Active <span class=\"gradient-community\">Raffles</span>",
"UpcomingRaffles": "Upcoming <span class=\"gradient-community\">Raffles</span>",
"CompletedRaffles": "Completed <span class=\"gradient-community\">Raffles</span>",
@ -216,7 +216,7 @@
"RaffleSubscriptionCodeInputErrorMessage": "The registration code is incorrect. Please try again.",
"GoodJob!": "Good Job!",
"RaffleJoinSuccessMessage": "You are successfully registered for the raffle. You will be informed via email if you win the prize!",
"RaffleLoginAndRegisterMessage": "You should sign in to join a raffle. You can create an account for free if you haven't registered yet.",
"RaffleLoginAndRegisterMessage": "You must sign in to join this raffle! If you haven't registered yet, create an account for free now.",
"Ok": "Ok",
"SeeDetails": "See Details",
"WaitingForTheDraw": "Waiting for the draw",
@ -255,6 +255,7 @@
"LatestArticles": "Latest Articles",
"RaffleHeader": "Hello ABP Community Member!",
"RafflesInfo": "<br>This is the raffle page dedicated to show our appreciation towards you for being an active Community Member. We do <a class=\"fw-6 \" href=\"https://community.abp.io/events\">ABP Community Talks</a> <a target=\"_blank\" class=\"fw-6\" href=\"https://abp.io/conference/2023\">,ABP .NET Conference</a>, attend or sponsor to the .NET-related events in which we give away some gifts. <br><br>You can follow this page to see the upcoming raffles, attend them, or see previous raffles we draw including the winners. <br><br>Thank you for being an active member! See you in the upcoming raffles.",
"RafflesInfoTitle": "ABP Community <span class=\"gradient-community\">Raffles</span>"
"RafflesInfoTitle": "ABP Community <span class=\"gradient-community\">Raffles</span>",
"ToLuckyWinner": "to 1 lucky winner"
}
}

10
docs/en/Migration-Guides/Abp-8_0.md

@ -125,9 +125,17 @@ From this version on, instead of injecting the `DaprClient` directly, using the
The documentation is already updated according to this suggestion and can be found at https://docs.abp.io/en/abp/8.0/Dapr/Index. So, if you want to learn more you can check the documentation or see the PR: https://github.com/abpframework/abp/pull/18117.
## Use Newer Versions of the SQL Server (SQL Server 14+)
Starting with EF Core 8.0, EF now generates SQL that is more efficient, but is unsupported on SQL Server 2014 and below. Therefore, if your database provider is SQL Server, then ensure that it's newer than SQL Server 2014. Otherwise, you may get errors due to database creation or while seeding initial data.
The error is similar to: `Microsoft.Data.SqlClient.SqlException (0x80131904)`.
> Check the [Entity Framework Core's Breaking Changes](https://learn.microsoft.com/en-us/ef/core/what-is-new/ef-core-8.0/breaking-changes#high-impact-changes) documentation for more info.
## Angular UI
# Guards
### Guards
From Angular Documentation;

5
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/index.js

@ -74,7 +74,10 @@
});
function fullSearch(filterText){
window.open($('#fullsearch').data('fullsearch-url') + "?keyword=" + encodeURIComponent(filterText));
var url = $('#fullsearch').data('fullsearch-url');
if(url){
window.open(url + "?keyword=" + encodeURIComponent(filterText));
}
}
$('#fullsearch').keyup(function (e) {

Loading…
Cancel
Save