diff --git a/builds/confjuv-dev.apk b/builds/confjuv-dev.apk index 22fcadb..8c053fb 100644 Binary files a/builds/confjuv-dev.apk and b/builds/confjuv-dev.apk differ diff --git a/builds/confjuvapp-live.apk b/builds/confjuvapp-live.apk index 31908de..d780286 100644 Binary files a/builds/confjuvapp-live.apk and b/builds/confjuvapp-live.apk differ diff --git a/builds/confjuvapp-web.zip b/builds/confjuvapp-web.zip index 76ab88c..bf8ef92 100644 Binary files a/builds/confjuvapp-web.zip and b/builds/confjuvapp-web.zip differ diff --git a/config.xml b/config.xml index dc9f5dd..1a4333e 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + #3ConfJuv Aplicativo móvel para 3ª Conferência Nacional de Juventude diff --git a/www/html/_left_sidebar.html b/www/html/_left_sidebar.html index 5e93066..d2c4576 100644 --- a/www/html/_left_sidebar.html +++ b/www/html/_left_sidebar.html @@ -11,7 +11,7 @@
  • Minhas Propostas
  • Propostas Seguidas
  • Propostas Apoiadas
  • -
  • Todas as Propostas
  • +
  • Todas as Propostas
  • Sair
  • diff --git a/www/index.html b/www/index.html index 8780949..8bb2f2d 100644 --- a/www/index.html +++ b/www/index.html @@ -35,7 +35,7 @@ - + diff --git a/www/js/controllers.js b/www/js/controllers.js index ad6f6cd..1d346c1 100644 --- a/www/js/controllers.js +++ b/www/js/controllers.js @@ -1582,11 +1582,18 @@ angular.module('confjuvapp.controllers', []) N A T I O N A L P H A S E P R O P O S A L S ******************************************************************************/ - $scope.nationalProposals = []; - $scope.showNationalProposals = function() { $scope.proposalFilters = { 'author_id': ConfJuvAppConfig.noosferoNationalPhaseProfileId }; $scope.reloadProposals(); }; + /****************************************************************************** + A L L P R O P O S A L S + ******************************************************************************/ + + $scope.loadAllProposals = function() { + $scope.proposalFilters = null; + $scope.reloadProposals(); + }; + }); // Ends controller -- libgit2 0.21.2