Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

manager: smoother planet status (fixes #7609) #7613

Merged
merged 4 commits into from
Oct 18, 2024
+6 −6
Merged

manager: smoother planet status (fixes #7609) #7613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71edb47
Update manager-dashboard.component.html
jessewashburn Oct 17, 2024
a9f88b0
Update manager-dashboard.component.html
jessewashburn Oct 17, 2024
ee90966
Update package.json
dogi Oct 18, 2024
52fdab1
Merge branch 'master' into 7609-update-manager-dashboard-component
dogi Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.14.92",
"version": "0.14.93",
"myplanet": {
"latest": "v0.20.42",
"min": "v0.19.42"
"latest": "v0.20.47",
"min": "v0.19.47"
},
"scripts": {
"ng": "ng",
Expand Down
6 changes: 3 additions & 3 deletions src/app/manager-dashboard/manager-dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ <h3 i18n *ngIf="showParentList">{{ planetType === 'community' ? 'Nation' : 'Cent
<a routerLink="resources" i18n mat-raised-button>List Resources</a>
<a routerLink="courses" i18n mat-raised-button>List Courses</a></span>
</ng-container>
<p *ngSwitchCase="'loading'" i18n>Checking request status...</p>
<p *ngSwitchCase="'deleted'" i18n>Your request has been rejected by { planetType, select, community {nation} nation {center}}. You can retry or contact { planetType, select, community {nation} nation {center}} planet.</p>
<p *ngSwitchDefault i18n>Your request has not been accepted by { planetType, select, community {nation} nation {center}}</p>
<p *ngSwitchCase="'loading'" i18n><b>Checking request status...</b></p>
<p *ngSwitchCase="'deleted'" i18n><b>Your request has been rejected by { planetType, select, community {nation} nation {center}}. You can retry or contact { planetType, select, community {nation} nation {center}} planet.</b></p>
<p *ngSwitchDefault i18n><b>Your request has not yet been accepted by { planetType, select, community {nation} nation {center}}</b></p>
</ng-container>
</div>
<div *ngIf="pin"><span i18n>Your tablet pin number is:</span> <b class="pinClass">{{ ' ' + pin + ' ' }}</b>
Expand Down
Loading