Commit 0dd8283b8f9270793adfb582b0241469e1185817

Authored by Rafael Diego
2 parents be70d15f 856e7266

Merge branch 'master' into staging

bower_components.zip
No preview for this file type
src/app/components/proposal-carousel/proposal-carousel.directive.js
... ... @@ -67,7 +67,8 @@
67 67  
68 68 ProposalCarouselController.prototype.showContent = function (proposal) {
69 69 var vm = this;
70   -
  70 + console.log(proposal);
  71 + console.log("proposal");
71 72 vm.$state.go('programa', {
72 73 slug: proposal.parent.slug,
73 74 proposal_id: proposal.id
... ...
src/app/components/proposal-list/proposal-list.directive.js
... ... @@ -36,7 +36,8 @@
36 36  
37 37 ProposalListController.prototype.showContent = function (proposal) {
38 38 var vm = this;
39   -
  39 + console.log(proposal);
  40 + console.log("proposal");
40 41 vm.$state.go('programa', {
41 42 slug: proposal.parent.slug,
42 43 proposal_id: proposal.id
... ...
src/app/pages/auth/new-password.html
... ... @@ -31,7 +31,7 @@
31 31 novalidate
32 32 name="newPasswordForm"
33 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 35 <div class="row">
36 36 <div class="col-md-6">
37 37 <div class="form-group">
... ...