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
Select Git revision
  • chrome-manifest-v3
  • develop
  • feat/force-migration-check
  • feat/improve-network-scan
  • feature/android_api_19
  • feature/encrypted_comment
  • feature/migrate-cordova-13
  • gitlab_migration_1
  • master
  • rml8
  • 0.0.1.ES.alpha1
  • 0.0.2
  • 0.1.13
  • 0.1.14
  • 0.1.15
  • 0.1.16
  • 0.1.17
  • 0.1.18
  • 0.1.19
  • 0.1.20
  • 0.1.21
  • 0.1.22
  • 0.1.23
  • 0.1.24
  • 0.1.25
  • 0.1.26
  • 0.1.27
  • 0.1.28
  • 0.1.4
  • 0.1.7
  • 0.1.8
  • 0.2.0
  • 0.2.1
  • v0.10.0
  • v0.10.1
  • v0.10.2
  • v0.11.0
  • v0.11.1
  • v0.11.2
  • v0.11.3
  • v0.11.4
  • v0.11.5
  • v0.11.6
  • v0.11.7
  • v0.11.8
  • v0.12.0
  • v0.12.1
  • v0.12.2
  • v0.12.3
  • v0.12.4
  • v0.12.5
  • v0.12.6
  • v0.12.7
  • v0.12.8
  • v0.12.9
  • v0.13.0
  • v0.14.0
  • v0.14.1
  • v0.15.0
  • v0.15.1
  • v0.15.2
  • v0.15.3
  • v0.15.4
  • v0.15.5
  • v0.15.6
  • v0.15.7
  • v0.16.0
  • v0.16.1
  • v0.17.0
  • v0.17.1
  • v0.17.2
  • v0.17.3
  • v0.17.4
  • v0.17.5
  • v0.17.6
  • v0.18.0
  • v0.18.1
  • v0.18.2
  • v0.18.3
  • v0.19.0
  • v0.19.1
  • v0.19.2
  • v0.19.3
  • v0.19.4
  • v0.19.5
  • v0.19.6
  • v0.2.10
  • v0.2.12
  • v0.2.13
  • v0.2.14
  • v0.2.3
  • v0.2.4
  • v0.2.5
  • v0.2.6
  • v0.2.7
  • v0.2.8
  • v0.2.9
  • v0.3.0
  • v0.3.1
  • v0.3.10
  • v0.3.11
  • v0.3.12
  • v0.3.13
  • v0.3.14
  • v0.3.15
  • v0.3.16
  • v0.3.17
  • v0.3.2
  • v0.3.3
  • v0.3.4
110 results

Target

Select target project
  • cordeliaze/cesium
  • pfouque06/cesium
  • wellno1/cesium
  • 1000i100/cesium
  • vincentux/cesium
  • calbasi/cesium
  • thomasbromehead/cesium
  • matograine/cesium
  • clients/cesium-grp/cesium
  • cedricmenec/cesium
  • Pamplemousse/cesium
  • etienneleba/cesium
  • tnntwister/cesium
  • scanlegentil/cesium
  • morvanc/cesium
  • yyy/cesium
  • Axce/cesium
  • Bertrandbenj/cesium
  • Lupus/cesium
  • elmau/cesium
  • MartinDelille/cesium
  • tykayn/cesium
  • numeropi/cesium
  • Vivakvo/cesium
  • pokapow/cesium
  • pini-gh/cesium
  • anam/cesium
  • RavanH/cesium
  • bpresles/cesium
  • am97/cesium
  • tuxmain/cesium
  • jytou/cesium
  • oliviermaurice/cesium
  • 666titi999/cesium
  • Yvv/cesium
35 results
Select Git revision
  • Vivakvo-master-patch-80805
  • Vivakvo-master-patch-99327
  • dev
  • gitlab_migration_1
  • issue_4
  • issue_780
  • master
  • patch-1
  • patch-10
  • patch-11
  • patch-12
  • patch-13
  • patch-14
  • patch-15
  • patch-16
  • patch-17
  • patch-18
  • patch-19
  • patch-2
  • patch-21
  • patch-22
  • patch-23
  • patch-24
  • patch-25
  • patch-26
  • patch-3
  • patch-4
  • patch-5
  • patch-6
  • patch-7
  • patch-8
  • patch-9
  • rml8
  • undefined
  • 0.0.1.ES.alpha1
  • 0.0.2
  • 0.1.13
  • 0.1.14
  • 0.1.15
  • 0.1.16
  • 0.1.17
  • 0.1.18
  • 0.1.19
  • 0.1.20
  • 0.1.21
  • 0.1.22
  • 0.1.23
  • 0.1.24
  • 0.1.25
  • 0.1.26
  • 0.1.27
  • 0.1.28
  • 0.1.4
  • 0.1.7
  • 0.1.8
  • 0.2.0
  • 0.2.1
  • v0.10.0
  • v0.10.1
  • v0.10.2
  • v0.11.0
  • v0.11.1
  • v0.11.2
  • v0.11.3
  • v0.11.4
  • v0.11.5
  • v0.11.6
  • v0.11.7
  • v0.11.8
  • v0.12.0
  • v0.12.1
  • v0.12.2
  • v0.12.3
  • v0.12.4
  • v0.12.5
  • v0.12.6
  • v0.12.7
  • v0.12.8
  • v0.12.9
  • v0.13.0
  • v0.14.0
  • v0.14.1
  • v0.15.0
  • v0.15.1
  • v0.15.2
  • v0.15.3
  • v0.15.4
  • v0.15.5
  • v0.15.6
  • v0.15.7
  • v0.16.0
  • v0.16.1
  • v0.17.0
  • v0.17.1
  • v0.17.2
  • v0.17.3
  • v0.17.4
  • v0.17.5
  • v0.17.6
  • v0.18.0
  • v0.18.1
  • v0.18.2
  • v0.18.3
  • v0.19.0
  • v0.19.1
  • v0.19.2
  • v0.19.3
  • v0.19.4
  • v0.19.5
  • v0.19.6
  • v0.2.10
  • v0.2.12
  • v0.2.13
  • v0.2.14
  • v0.2.3
  • v0.2.4
  • v0.2.5
  • v0.2.6
  • v0.2.7
  • v0.2.8
  • v0.2.9
  • v0.3.0
  • v0.3.1
  • v0.3.10
  • v0.3.11
  • v0.3.12
  • v0.3.13
  • v0.3.14
  • v0.3.15
  • v0.3.16
  • v0.3.17
  • v0.3.2
  • v0.3.3
  • v0.3.4
134 results
Show changes
......@@ -10,13 +10,13 @@
ng-class="{'pull-right': !smallscreen}"
ng-if="::item.sigDate">
<i class="ion-clock"></i>
{{::'WOT.LOOKUP.REGISTERED' | translate:item }}
{{:locale:'WOT.LOOKUP.REGISTERED' | translate:item }}
</h4>
<h4 class="gray"
ng-class="{'pull-right': !smallscreen}"
ng-if="item.memberDate">
<i class="ion-clock"></i>
{{::'WOT.LOOKUP.MEMBER_FROM' | translate:item}}
{{:locale:'WOT.LOOKUP.MEMBER_FROM' | translate:item}}
</h4>
<h4 class="gray">
<span class="positive" ng-if="::item.name && item.uid">
......@@ -25,6 +25,7 @@
</span>
<b class="ion-key"></b>
{{::item.pubkey | formatPubkey}}
<span ng-if="::(!item.uid && !item.revoked)" class="assertive" translate>WOT.NOT_MEMBER_PARENTHESIS</span>
<span ng-if="::item.revoked" class="assertive" translate>WOT.IDENTITY_REVOKED_PARENTHESIS</span>
</h4>
......
<div class="lookupForm">
<div class="lookupForm" bind-notifier="{locale: $root.settings.locale.id}">
<div class="item no-padding">
......@@ -22,7 +22,7 @@
<input type="text"
class="visible-xs visible-sm"
placeholder="{{'WOT.SEARCH_HELP'|translate}}"
placeholder="{{:locale:'WOT.SEARCH_HELP'|translate}}"
ng-model="search.text"
ng-model-options="{ debounce: 650 }"
ng-change="doSearch()"
......@@ -30,7 +30,7 @@
select-on-click>
<input type="text"
class="hidden-xs hidden-sm"
id="{{wotSearchTextId}}" placeholder="{{'WOT.SEARCH_HELP'|translate}}"
id="{{wotSearchTextId}}" placeholder="{{:locale:'WOT.SEARCH_HELP'|translate}}"
ng-model="search.text"
on-return="doSearchText()">
<div class="helptip-anchor-center">
......@@ -43,7 +43,7 @@
ng-class="::{'hidden-xs hidden-sm': !showResultLabel}">
<div class="pull-left" ng-if="!search.loading && showResultLabel">
<ng-if ng-if="search.type=='newcomers'">
<h4 translate>WOT.LOOKUP.NEWCOMERS</h4>
<h4>{{:locale:'WOT.LOOKUP.NEWCOMERS'|translate}}</h4>
<small class="gray no-padding" ng-if="search.total">{{'WOT.LOOKUP.NEWCOMERS_COUNT'|translate:{count: search.total} }}</small>
</ng-if>
<ng-if ng-if="search.type=='pending'">
......@@ -51,7 +51,7 @@
<small class="gray no-padding" ng-if="search.total">{{'WOT.LOOKUP.PENDING_COUNT'|translate:{count: search.total} }}</small>
</ng-if>
<h4 ng-if="search.type=='text'">
<span translate>COMMON.RESULTS_LIST</span>
<span>{{:locale:'COMMON.RESULTS_LIST'|translate}}</span>
<small class="gray" ng-if="search.total">({{search.total}})</small>
</h4>
</div>
......@@ -63,14 +63,14 @@
ng-class="{'button-text-positive': search.type=='newcomers'}"
ng-click="doGetNewcomers()">
<i class="icon ion-person-stalker"></i>
{{'WOT.LOOKUP.BTN_NEWCOMERS' | translate}}
{{:locale:'WOT.LOOKUP.BTN_NEWCOMERS' | translate}}
</a>
<a ng-if="enableFilter"
class="button button-text button-small ink"
ng-class="{'button-text-positive': search.type=='pending'}"
ng-click="doGetPending()" class="badge-balanced">
<i class="icon ion-clock"></i>
{{'WOT.LOOKUP.BTN_PENDING' | translate}}
{{:locale:'WOT.LOOKUP.BTN_PENDING' | translate}}
</a>
<a ng-if="enableWallets"
class="button button-text button-small ink"
......@@ -78,7 +78,7 @@
ng-click="doGetWallets()" class="badge-balanced">
<i class="icon ion-card" style="left: -1px; top: 4px; position: relative; padding-left: 3px; padding-right: 3px;"></i>
<b class="icon-secondary ion-card" style="left: 10px; top: -4px; font-size: 14px;"> </b>
{{'MENU.WALLETS' | translate}}
{{:locale:'MENU.WALLETS' | translate}}
</a>
<!-- Allow extension here -->
......@@ -86,14 +86,14 @@
&nbsp;
<button class="button button-small button-stable ink"
ng-click="doSearch()">
{{'COMMON.BTN_SEARCH' | translate}}
{{:locale:'COMMON.BTN_SEARCH' | translate}}
</button>
<button class="button button-small button-positive {{parameters.okType}} ink"
ng-if="::allowMultiple"
ng-disabled="!selection.length"
ng-click="next()">
{{parameters.okText||'COMMON.BTN_NEXT' | translate}}
{{:locale:parameters.okText||'COMMON.BTN_NEXT' | translate}}
</button>
</div>
</div>
......@@ -105,9 +105,9 @@
<ng-if ng-if="!search.loading">
<div class="assertive padding" ng-if="!search.results.length">
<span ng-if="search.type=='text'" translate>COMMON.SEARCH_NO_RESULT</span>
<span ng-if="search.type=='pending'" translate>WOT.LOOKUP.NO_PENDING</span>
<span ng-if="search.type=='newcomers'" translate>WOT.LOOKUP.NO_NEWCOMERS</span>
<span ng-if="search.type=='text'">{{:locale:'COMMON.SEARCH_NO_RESULT'|translate}}</span>
<span ng-if="search.type=='pending'">{{:locale:'WOT.LOOKUP.NO_PENDING'|translate}}</span>
<span ng-if="search.type=='newcomers'">{{:locale:'WOT.LOOKUP.NO_NEWCOMERS'|translate}}</span>
</div>
<!-- simple selection + device -->
......@@ -120,14 +120,14 @@
<ng-repeat ng-repeat="item in search.results track by item.id">
<div ng-if="::item.divider"
class="item item-divider"
id="helptip-wot-search-result-{{$index}}">{{::('WOT.SEARCH.DIVIDER_' + item.index)|upper|translate}}</div>
id="helptip-wot-search-result-{{$index}}">{{:locale:('WOT.SEARCH.DIVIDER_' + item.index)|upper|translate}}</div>
<ion-item
ng-if="::!item.divider"
id="helptip-wot-search-result-{{$index}}"
class="item item-border-large item-avatar item-icon-right ink"
ng-click="::select(item)">
<ng-include src="item.templateUrl || 'templates/wot/item_content_identity.html'"></ng-include>
<ng-include src="::item.templateUrl || 'templates/wot/item_content_identity.html'"></ng-include>
<i class="icon ion-ios-arrow-right "></i>
<ion-option-button
......
<ion-modal-view class="modal-full-height">
<!-- TOP BAR -->
<ion-header-bar class="bar-positive">
<button class="button button-clear visible-xs"
ng-if="!slides.slider.activeIndex"
ng-click="closeModal()" translate>COMMON.BTN_CANCEL
</button>
<button class="button button-icon button-clear icon ion-ios-arrow-back buttons header-item"
ng-click="doPrev()"
ng-if="slides.slider.activeIndex && slideBehavior.hasPreviousButton">
</button>
<button class="button button-icon button-clear icon ion-ios-help-outline visible-xs"
ng-if="slideBehavior.helpAnchor"
ng-click="showHelpModal(slideBehavior.helpAnchor)">
</button>
<h1 class="title" translate>ACCOUNT.CERTIFICATION_MODAL.CHECKLIST_TITLE</h1>
<!-- next -->
<button class="button button-clear icon-right visible-xs"
ng-if="slideBehavior.hasNextButton"
ng-click="doNext()">
<span translate>COMMON.BTN_NEXT</span>
<i class="icon ion-ios-arrow-right"></i>
</button>
<!-- accept -->
<button class="button button-clear icon-right visible-xs"
ng-class="{'button-text-stable': !isLicenseRead}"
ng-if="slideBehavior.hasAcceptButton"
ng-click="isLicenseRead ? doNext() : undefined">
<span translate>ACCOUNT.NEW.BTN_ACCEPT</span>
<i class="icon ion-ios-arrow-right"></i>
</button>
<!-- send -->
<button class="button button-clear icon-right visible-xs"
ng-if="slideBehavior.hasSendButton"
ng-click="doNewAccount()">
<i class="icon ion-android-send"></i>
</button>
</ion-header-bar>
<!-- CONTENT -->
<ion-content class="has-header" scroll="true">
<div class="padding text-center" ><b>
{{ identity.uid }} - {{:rebind:identity.pubkey|formatPubkey: {full: true, checksum: formData.checksum} }}
</b></div>
<div class="padding" translate>ACCOUNT.CERTIFICATION_MODAL.INFOS</div>
<div class="card padding">
<div class="row nowrap row-center"
ng-repeat="check in cert_checklist"
ng-include="::'templates/wot/item_checklist_certification.html'">
</div>
</div>
<div class="padding text-right">
<button class="button button-clear button-dark ink hidden-xs" ng-click="closeModal()" type="button" translate>
COMMON.BTN_CANCEL
</button>
<button class="button button-stable icon-right ink"
ng-if="formData.licenseUrl"
ng-click="showLicenseModal()">
<i class="icon ion-document-text"></i>&nbsp;
{{'CURRENCY.VIEW.BTN_SHOW_LICENSE' | translate}}
</button>
<button class="button button-positive icon-right ion-chevron-right ink" ng-click="verifyAnswers()"
type="button" translate>
ACCOUNT.CERTIFICATION_MODAL.BTN_ALL_CHECK
</button>
</div>
</ion-content>
</ion-modal-view>
\ No newline at end of file
<ion-popover-view class="fit has-header popover-wallet-tx-actions">
<ion-header-bar>
<h1 class="title" translate>COMMON.POPOVER_ACTIONS_TITLE</h1>
</ion-header-bar>
<ion-content scroll="false">
<div class="list item-text-wrap">
<a class="item item-icon-left ink visible-xs visible-sm"
ng-click="downloadHistoryFile()">
<i class="icon ion-android-download"></i>
{{'COMMON.BTN_DOWNLOAD_ACCOUNT_STATEMENT' | translate}}
</a>
</div>
</ion-content>
</ion-popover-view>
......@@ -73,9 +73,14 @@
ng-class="{'positive': formData.isMember, 'gray': !formData.isMember}">
{{::formData.name||formData.uid}}
</h4>
<h5 class="text-center gray">
<h5 class="text-center gray row no-padding">
<div class="col">
<i class="icon ion-key"></i> {{formData.pubkey|formatPubkey}}
</div>
<!-- icon of the pubkey -->
<div class="col" ng-if=":rebind:formData.pubkey" jdenticon="{{:rebind:formData.pubkey}}" jdenticon-size="32"></div>
</h5>
<h5 class="assertive">
<span ng-if="::(formData.name || formData.uid) && !formData.isMember && !revoked" translate>WOT.NOT_MEMBER_PARENTHESIS</span>
<b ng-if="::(formData.name || formData.uid) && !formData.isMember && revoked" translate>WOT.IDENTITY_REVOKED_PARENTHESIS</b>
......
......@@ -62,7 +62,7 @@
<button class="button button-calm ink hidden-readonly"
ng-click="showTransferModal({pubkey:formData.pubkey, uid: formData.name||formData.uid})">
{{'COMMON.BTN_SEND_MONEY' | translate}}
{{'COMMON.BTN_SEND_MONEY_SHORT' | translate}}
</button>
<cs-extension-point name="after-buttons"></cs-extension-point>
......@@ -89,12 +89,17 @@
<span class="item item-divider" translate>WOT.GENERAL_DIVIDER</span>
<!-- Pubkey -->
<ion-item class="item-icon-left item-text-wrap ink"
copy-on-click="{{:rebind:formData.pubkey}}">
<div class="item item-icon-left item-text-wrap item-icon-right ink"
ng-if=":rebind:formData.pubkey"
on-hold="copy(formData.pubkey)"
copy-on-click="{{:rebind:formData.pubkey|formatPubkey: {full: true } }}">
<i class="icon ion-key"></i>
<span translate>COMMON.PUBKEY</span>
<h4 id="pubkey" class="dark text-left">{{:rebind:formData.pubkey}}</h4>
</ion-item>
<h4 id="pubkey" class="dark text-left">{{:rebind:formData.pubkey|formatPubkey: {full: true } }}</h4>
<!-- icon of the pubkey -->
<i class="icon" jdenticon="{{::formData.pubkey}}" jdenticon-size="32"></i>
</div>
<div class="item item-icon-left item-text-wrap"
ng-if=":rebind:!formData.hasSelf">
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.