Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • omadrid/front
  • minds/front
  • joe59/front
  • markharding/front
  • eiennohi/front
  • edgebal/front
  • msantang78/front
  • bhayward93/front
  • xorgy/front
  • duyquoc/front
  • benhayward.ben/front
  • mnurzia/front
  • priestd09/front
  • dknunn/front
  • Yersinia/front
  • literalpie/front
  • maruthi-adithya/front
  • javanick/front
  • juanmsolaro/front
  • ascenderking/front
  • fabiolalombardim/front
  • jim-toth/front
  • Shivathanu/front
  • pestixaba/front
  • project_connection/front
  • mul53/front
  • iamonuwa/front
  • manishoo/front
  • namesty/front
  • AaronTheBruce/front
  • bedriguler/front
  • th2tran/front
  • jun784/front
  • mdstevens044/front
  • CodingNagger/front
  • heenachauhan201/front
  • diazairic/front
  • m994/front
  • webprodev/minds_front
  • chaoukiammar/front
  • benn7/front
  • ung1807/front
  • vinliao/front-patch-1
  • suhailkakar/front
  • theokeist/minds-blog
45 results
Show changes
Commits on Source (2)
Showing
with 128 additions and 56 deletions
export * from './text-input-autocomplete.module';
export {
TextInputAutocompleteMenuComponent,
} from './text-input-autocomplete-menu.component';
export { TextInputAutocompleteMenuComponent } from './text-input-autocomplete-menu.component';
......@@ -43,8 +43,8 @@ export class ChannelBadgesComponent {
return true;
} else if (
!this.user.is_admin &&
(this.session.isAdmin() &&
this.user.guid !== this.session.getLoggedInUser().guid)
this.session.isAdmin() &&
this.user.guid !== this.session.getLoggedInUser().guid
) {
return true;
}
......
......@@ -79,9 +79,7 @@ export class FeaturedContentComponent implements OnInit {
component
);
const componentRef: ComponentRef<
any
> = this.dynamicHost.viewContainerRef.createComponent(
const componentRef: ComponentRef<any> = this.dynamicHost.viewContainerRef.createComponent(
componentFactory,
void 0,
this.injector
......
......@@ -81,9 +81,10 @@ export class UpdateMarkersService {
if (!opts.marker) throw 'marker must be set';
if (!opts.noReply) {
this.http
.post('api/v2/notifications/markers/read', opts)
.subscribe(res => null, err => console.warn(err));
this.http.post('api/v2/notifications/markers/read', opts).subscribe(
res => null,
err => console.warn(err)
);
}
for (let i = 0; i < this.data.length; i++) {
......
......@@ -14,7 +14,8 @@ export let mindsHttpClientMock = new (function() {
}
if (
!res ||
((res.status && res.status === 'error') || res.status === 'failed')
(res.status && res.status === 'error') ||
res.status === 'failed'
)
observer.error(res);
......
......@@ -132,10 +132,9 @@ describe('GroupsMembersModuleComponent', () => {
tick();
expect(membersComponent.load).toHaveBeenCalled();
expect(clientMock.get).toHaveBeenCalledWith(
'api/v1/groups/membership/11111',
{ limit: 21 }
);
expect(
clientMock.get
).toHaveBeenCalledWith('api/v1/groups/membership/11111', { limit: 21 });
expect(membersComponent.members).toEqual(successfulGroupResponse.members);
}));
......
......@@ -4,14 +4,20 @@
class="m-groups--filter-selector-item"
[class.m-groups--filter-selector-active]="filter == 'activity'"
[routerLink]="['/groups/profile', group.guid, 'feed']"
i18n="group activities selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION"
i18n="
group activities
selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION
"
>Feed</a
>
<a
class="m-groups--filter-selector-item"
[class.m-groups--filter-selector-active]="filter == 'image'"
[routerLink]="['/groups/profile', group.guid, 'feed', 'image']"
i18n="group activities selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION"
i18n="
group activities
selector|@@GROUPS__PROFILE__FILTER_SELECTOR__FEED_OPTION
"
>Images</a
>
......
......@@ -17,7 +17,9 @@
</ng-container>
<ng-container
*ngIf="error == 'LoginException::Unknown'"
i18n="@@MINDS__LOGIN__EXCEPTION__THERE_HAS_BEEN_AN_ERROR_PLEASE_TRY_AGAIN"
i18n="
@@MINDS__LOGIN__EXCEPTION__THERE_HAS_BEEN_AN_ERROR_PLEASE_TRY_AGAIN
"
>
There's been an error. Please try again
</ng-container>
......
......@@ -42,7 +42,9 @@
*ngIf="!payoutRequestInProgress && isPayoutInProgress()"
>
<ng-container
i18n="@@MONETIZATION__AD_SHARING__ANALYTICS__PAYOUT_UNDER_REVIEW_LABEL"
i18n="
@@MONETIZATION__AD_SHARING__ANALYTICS__PAYOUT_UNDER_REVIEW_LABEL
"
>Your payment request for
{{ payouts.amount | currency: 'USD':true }} is currently under review
by Minds staff. Once reviewed, it will be transferred to the bank
......
......@@ -171,7 +171,9 @@
formControlName="state"
type="text"
placeholder="State or province"
i18n-placeholder="@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER"
i18n-placeholder="
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
"
/>
</div>
......
......@@ -93,7 +93,9 @@
</p>
<ng-template #editingCaption>
<p
i18n="@@MONETIZATION__REVENUE__OPTIONS__ENTER_BANK_DETAILS_BELOW_LABEL"
i18n="
@@MONETIZATION__REVENUE__OPTIONS__ENTER_BANK_DETAILS_BELOW_LABEL
"
>
Enter your new bank account details below.
</p>
......@@ -125,7 +127,11 @@
<div class="mdl-cell mdl-cell--12-col">
<label
i18n="@@MONETIZATION__REVENUE__OPTIONS__ROUTING_NUMBER_SORT_CODE_LABEL"
i18n="
@@MONETIZATION__REVENUE__OPTIONS__ROUTING_NUMBER_SORT_CODE_LABEL
"
>Routing Number / Sort Code</label
>
<input formControlName="routingNumber" type="text" />
......
......@@ -173,7 +173,9 @@
>
<m-tooltip
icon="help"
i18n="@@MINDS__NEWSFEED__BOOST_ROTATOR__BOOST_VISIBILITY_UPGRADE_TOOLTIP"
i18n="
@@MINDS__NEWSFEED__BOOST_ROTATOR__BOOST_VISIBILITY_UPGRADE_TOOLTIP
"
>
Upgrade to Plus in order to turn off Boost.
</m-tooltip>
......
......@@ -61,9 +61,9 @@ export class NewsfeedEntityComponent {
this.getComponent(this.entity.type)
);
let componentRef: ComponentRef<
any
> = this.host.viewContainerRef.createComponent(componentFactory);
let componentRef: ComponentRef<any> = this.host.viewContainerRef.createComponent(
componentFactory
);
componentRef.instance.entity = this.entity;
componentRef.changeDetectorRef.detectChanges();
}
......
......@@ -266,7 +266,10 @@
session.getLoggedInUser().guid &&
!notification.entityObj.title
"
i18n="object belonging to user@@NOTIFICATIONS__NOTIFICATION__OTHER_OBJECT"
i18n="
object belonging to
user@@NOTIFICATIONS__NOTIFICATION__OTHER_OBJECT
"
>{{ notification.entityObj.ownerObj.name }}'s
{{ notification.entityObj.subtype }}</span
>
......@@ -277,7 +280,10 @@
session.getLoggedInUser().guid &&
!notification.entityObj.title
"
i18n="object belonging to current user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT"
i18n="
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
>
</p>
......@@ -295,7 +301,9 @@
>
<p>
<ng-container
i18n="@@NOTIFICATIONS__NOTIFICATION__REPLIED_TO_GROUP_CONVERSATION"
i18n="
@@NOTIFICATIONS__NOTIFICATION__REPLIED_TO_GROUP_CONVERSATION
"
*ngIf="notification.params?.is_reply"
>
{{ notification.fromObj.name }} replied to your message in
......@@ -347,7 +355,10 @@
<span
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="object belonging to current user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT"
i18n="
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
>
</p>
......@@ -458,7 +469,10 @@
<span
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="object belonging to current user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT"
i18n="
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
>
</p>
......@@ -478,7 +492,9 @@
</p>
<p *ngIf="!notification.entityObj.title">
<ng-container
i18n="@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_OWN_ACTIVITY"
i18n="
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_OWN_ACTIVITY
"
>{{ notification.fromObj.name }} down voted
<span class="pseudo-link mdl-color-text--blue-grey-400"
>your activity</span
......@@ -522,7 +538,9 @@
*ngIf="notification.params?.parent?.type == 'group'"
>
<p
i18n="@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_CONVERSATION"
i18n="
@@NOTIFICATIONS__NOTIFICATION__DOWNVOTE__VOTED_DOWN_CONVERSATION
"
>
<span class="pseudo-link mdl-color-text--blue-grey-400">{{
notification.fromObj.name
......@@ -568,7 +586,10 @@
<span
class="pseudo-link mdl-color-text--blue-grey-400"
*ngIf="!notification.entityObj.title"
i18n="object belonging to current user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT"
i18n="
object belonging to current
user@@NOTIFICATIONS__NOTIFICATION__OWN_OBJECT
"
>your {{ notification.entityObj.subtype }}</span
>
</p>
......@@ -785,7 +806,11 @@
>your channel</span
>
<ng-container
i18n="boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED__AWAITING_APPROVAL"
i18n="
boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED__AWAITING_APPROVAL
"
>
is awaiting approval.</ng-container
>
......@@ -844,7 +869,11 @@
>your channel</span
>
<ng-container
i18n="boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED_P2P__AWAITING_APPROVAL_BY"
i18n="
boost@@NOTIFICATIONS__NOTIFICATION__BOOST_SUBMITTED_P2P__AWAITING_APPROVAL_BY
"
>
is awaiting approval by
<span class="pseudo-link mdl-color-text--blue-grey-400"
......@@ -1279,7 +1308,9 @@
<a [routerLink]="['/boost/console/peer/outbox']">
<p>
<ng-container
i18n="@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_ACCEPTED__ACCEPTED_BID"
i18n="
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_ACCEPTED__ACCEPTED_BID
"
><b>@{{ notification.from.username }}</b> accepted your bid
of</ng-container
>
......@@ -1338,7 +1369,9 @@
<a [routerLink]="['/boost/console/peer/outbox']">
<p>
<ng-container
i18n="@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_REJECTED__DECLINED_BID"
i18n="
@@NOTIFICATIONS__NOTIFICATION__BOOST_PEER_REJECTED__DECLINED_BID
"
><b>@{{ notification.from.username }}</b> declined your bid
of</ng-container
>
......@@ -1675,7 +1708,11 @@
>
<span
class="pseudo-link mdl-color-text--blue-grey-400"
i18n="@@NOTIFICATIONS__NOTIFICATION__REPORT_ACTIONED__ACTIVITY_TITLE_BEEN"
i18n="
@@NOTIFICATIONS__NOTIFICATION__REPORT_ACTIONED__ACTIVITY_TITLE_BEEN
"
>Your post {{ notification.entityObj.title }}</span
>
has been {{ notification.params.action }}
......@@ -1722,7 +1759,11 @@
<ng-template ngSwitchCase="rewards_summary">
<a target="_blank" routerLink="/wallet/tokens/contributions">
<p
i18n="@@NOTIFICATIONS__NOTIFICATION__REWARDS__YOU_HAVE_RECEIVED_X_TOKENS_TODAY"
i18n="
@@NOTIFICATIONS__NOTIFICATION__REWARDS__YOU_HAVE_RECEIVED_X_TOKENS_TODAY
"
>
You earned {{ notification.params.amount }} tokens today.
</p>
......
......@@ -60,9 +60,9 @@ export class ProChannelListComponent implements OnInit, OnDestroy {
const entity = element.getValue();
return (
entity.type === 'group' ||
(!!entity.thumbnail_src ||
!!entity.custom_data ||
(entity.thumbnails && entity.thumbnails.length > 0))
!!entity.thumbnail_src ||
!!entity.custom_data ||
(entity.thumbnails && entity.thumbnails.length > 0)
);
});
})
......
......@@ -153,9 +153,9 @@ export class ProSettingsComponent implements OnInit, OnDestroy {
getPreviewAssetSrc(type: string): string | SafeUrl {
if (this.settings[type]) {
if (!this.settings[type]._mindsBlobUrl) {
this.settings[type]._mindsBlobUrl = URL.createObjectURL(this.settings[
type
] as File);
this.settings[type]._mindsBlobUrl = URL.createObjectURL(
this.settings[type] as File
);
}
return this.sanitizer.bypassSecurityTrustUrl(
......
......@@ -53,7 +53,11 @@
<m-tooltip
icon="help"
*ngIf="address.label == 'OnChain & Receiver'"
i18n="@@WALLET__BALANCES__TOKENS__ADDRESS_LABEL_TOOLTIP_ONCHAIN_AND_RECEIVER"
i18n="
@@WALLET__BALANCES__TOKENS__ADDRESS_LABEL_TOOLTIP_ONCHAIN_AND_RECEIVER
"
>
This is your currently active Web3/Metamask wallet and is also
configured to receive Boost & Wires via the blockchain.
......
......@@ -181,7 +181,9 @@
<ng-container *ngIf="downloadingMetamask">
<b
i18n="@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_NOTE_RELOAD"
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_NOTE_RELOAD
"
>
Note: After installing and setting up MetaMask you might need to
reload Minds.
......@@ -196,7 +198,10 @@
<button
class="m-btn m-btn--slim m-btn--action"
(click)="downloadMetamask()"
i18n="@@WALLET__TOKENS__ONBOARDING__ONCHAIN__DOWNLOAD_METAMASK_ACTION"
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__DOWNLOAD_METAMASK_ACTION
"
>
Download MetaMask
</button>
......@@ -215,7 +220,10 @@
<ng-template
#noProvidedAddress
i18n="@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_LOCKED_LEGEND"
i18n="
@@WALLET__TOKENS__ONBOARDING__ONCHAIN__METAMASK_LOCKED_LEGEND
"
>
MetaMask is either locked or connected to another network.
</ng-template>
......
......@@ -177,7 +177,9 @@
formControlName="state"
type="text"
placeholder="State or province"
i18n-placeholder="@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER"
i18n-placeholder="
@@MONETIZATION__ONBOARDING__STATE_PROVINCE_PLACEHOLDER
"
class="m-input"
/>
</div>
......
......@@ -133,10 +133,10 @@ export class WireChannelComponent {
if (!type) {
return (
isOwner ||
(this.rewards.description ||
(this.rewards.rewards.points && this.rewards.rewards.points.length) ||
(this.rewards.rewards.money && this.rewards.rewards.money.length) ||
(this.rewards.rewards.tokens && this.rewards.rewards.tokens.length))
this.rewards.description ||
(this.rewards.rewards.points && this.rewards.rewards.points.length) ||
(this.rewards.rewards.money && this.rewards.rewards.money.length) ||
(this.rewards.rewards.tokens && this.rewards.rewards.tokens.length)
);
}
......