Download as
Browse Code »

Commit 0dd8283b8f9270793adfb582b0241469e1185817

Authored by Rafael Diego
2 parents be70d15f 856e7266
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 4 changed files with 5 additions and 3 deletions   Show diff stats
bower_components.zip
View file @be70d15
No preview for this file type
src/app/components/proposal-carousel/proposal-carousel.directive.js
  Diff comments   View file @0dd8283
@@ -67,7 +67,8 @@ @@ -67,7 +67,8 @@
67 67
68 ProposalCarouselController.prototype.showContent = function (proposal) { 68 ProposalCarouselController.prototype.showContent = function (proposal) {
69 var vm = this; 69 var vm = this;
70 - 70 + console.log(proposal);
  71 + console.log("proposal");
71 vm.$state.go('programa', { 72 vm.$state.go('programa', {
72 slug: proposal.parent.slug, 73 slug: proposal.parent.slug,
73 proposal_id: proposal.id 74 proposal_id: proposal.id
src/app/components/proposal-list/proposal-list.directive.js
  Diff comments   View file @0dd8283
@@ -36,7 +36,8 @@ @@ -36,7 +36,8 @@
36 36
37 ProposalListController.prototype.showContent = function (proposal) { 37 ProposalListController.prototype.showContent = function (proposal) {
38 var vm = this; 38 var vm = this;
39 - 39 + console.log(proposal);
  40 + console.log("proposal");
40 vm.$state.go('programa', { 41 vm.$state.go('programa', {
41 slug: proposal.parent.slug, 42 slug: proposal.parent.slug,
42 proposal_id: proposal.id 43 proposal_id: proposal.id
src/app/pages/auth/new-password.html
  Diff comments   View file @0dd8283
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 novalidate 31 novalidate
32 name="newPasswordForm" 32 name="newPasswordForm"
33 ng-submit="newPasswordForm.$valid && pageNewPassword.submitNewPassword($event, newPasswordForm)"> 33 ng-submit="newPasswordForm.$valid && pageNewPassword.submitNewPassword($event, newPasswordForm)">
34 - <input type="hidden" name="code" value="{{::pageNewPassword.token}}" /> 34 + <input type="hidden" id="code" name="code" value="{{::pageNewPassword.token}}" />
35 <div class="row"> 35 <div class="row">
36 <div class="col-md-6"> 36 <div class="col-md-6">
37 <div class="form-group"> 37 <div class="form-group">