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
Loading items

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
Loading items
Show changes
Showing
with 1504 additions and 499 deletions
www/img/flag-pt.png

975 B

www/img/logo_256px.png

31.3 KiB

www/img/logo_512px.png

70.6 KiB

<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<path fill="#444" d="M16 0.5c-8.563 0-15.5 6.938-15.5 15.5s6.938 15.5 15.5 15.5c8.563 0 15.5-6.938 15.5-15.5s-6.938-15.5-15.5-15.5zM23.613 11.119l-2.544 11.988c-0.188 0.85-0.694 1.056-1.4 0.656l-3.875-2.856-1.869 1.8c-0.206 0.206-0.381 0.381-0.781 0.381l0.275-3.944 7.181-6.488c0.313-0.275-0.069-0.431-0.482-0.156l-8.875 5.587-3.825-1.194c-0.831-0.262-0.85-0.831 0.175-1.231l14.944-5.763c0.694-0.25 1.3 0.169 1.075 1.219z"/>
</svg>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
angular.module('cesium.controllers', [ angular.module('cesium.controllers', [
'cesium.app.controllers', 'cesium.app.controllers',
'cesium.home.controllers', 'cesium.home.controllers',
'cesium.feed.controllers',
'cesium.join.controllers', 'cesium.join.controllers',
'cesium.login.controllers', 'cesium.login.controllers',
'cesium.help.controllers', 'cesium.help.controllers',
...@@ -13,5 +14,4 @@ angular.module('cesium.controllers', [ ...@@ -13,5 +14,4 @@ angular.module('cesium.controllers', [
'cesium.settings.controllers', 'cesium.settings.controllers',
'cesium.network.controllers', 'cesium.network.controllers',
'cesium.blockchain.controllers' 'cesium.blockchain.controllers'
]) ]);
;
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -396,7 +396,7 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI ...@@ -396,7 +396,7 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI
csSettings.data.wallet.alertIfUnusedWallet = false; // do not alert if empty csSettings.data.wallet.alertIfUnusedWallet = false; // do not alert if empty
var needSelf = angular.isUndefined(parameters.uid) || angular.isUndefined(parameters.blockUid) || var needSelf = angular.isUndefined(parameters.uid) || angular.isUndefined(parameters.blockUid) ||
(parameters.uid.toUpperCase() !== $scope.formData.pseudo.toUpperCase()); (parameters.uid !== $scope.formData.pseudo);
if (!needSelf) { if (!needSelf) {
wallet.setSelf(parameters.uid, parameters.blockUid); wallet.setSelf(parameters.uid, parameters.blockUid);
} }
...@@ -518,11 +518,11 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI ...@@ -518,11 +518,11 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI
return; return;
} }
var uid = $scope.formData.pseudo.toUpperCase(); var uid = $scope.formData.pseudo;
$scope.formData.computing=true; $scope.formData.computing=true;
// Same has given uid + self block: skip control // Same has given uid + self block: skip control
if (parameters.uid && uid === parameters.uid.toUpperCase()) { if (parameters.uid && uid === parameters.uid) {
$scope.formData.computing=false; $scope.formData.computing=false;
$scope.uiAlreadyUsed = false; $scope.uiAlreadyUsed = false;
return; return;
...@@ -533,7 +533,7 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI ...@@ -533,7 +533,7 @@ function JoinModalController($scope, $state, $interval, $q, $timeout, Device, UI
.then(function(res) { .then(function(res) {
$scope.uiAlreadyUsed = (res.results || []).some(function(pub){ $scope.uiAlreadyUsed = (res.results || []).some(function(pub){
return (pub.uids || []).some(function(idty) { return (pub.uids || []).some(function(idty) {
return (idty.uid.toUpperCase() === uid); // same Uid return (idty.uid === uid); // same Uid
}); });
}); });
$scope.formData.computing=false; $scope.formData.computing=false;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.