[pollen] branch develop updated (d302d01 -> 86b2cf6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from d302d01 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 86b2cf6 fixes #1100 error on load edit user profile page The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 86b2cf6f0c627428fd7108c67e58c9b4c829f7a6 Author: Dralagen <dralagen@dralagen.fr> Date: Sat Aug 30 09:32:16 2014 +0200 fixes #1100 error on load edit user profile page Summary of changes: pollen-ui-angular/src/main/webapp/partials/user-edit.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 86b2cf6f0c627428fd7108c67e58c9b4c829f7a6 Author: Dralagen <dralagen@dralagen.fr> Date: Sat Aug 30 09:32:16 2014 +0200 fixes #1100 error on load edit user profile page --- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index 0fc0e59..31a2f82 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -20,11 +20,12 @@ --> <ul class="nav nav-tabs"> - <li ng-class="{active : tab == 'viewProfile'}"><a href="/#/user/edit" ng-click="tab = 'viewProfile'">{{ 'user.tab.viewProfile' | translate }}</a></li> - <li ng-class="{active : tab == 'editProfile'}"><a href="/#/user/edit" ng-click="tab = 'editProfile'">{{ 'user.tab.editProfile' | translate }}</a></li> - <li ng-class="{active : tab == 'editPassword'}"><a href="/#/user/edit" ng-click="tab = 'editPassword'">{{ 'user.tab.editPassword' | translate }}</a></li> + <li ng-class="{active : tab == 'viewProfile'}"><a href="#/user/edit" ng-click="tab = 'viewProfile'">{{ 'user.tab.viewProfile' | translate }}</a></li> + <li ng-class="{active : tab == 'editProfile'}"><a href="#/user/edit" ng-click="tab = 'editProfile'">{{ 'user.tab.editProfile' | translate }}</a></li> + <li ng-class="{active : tab == 'editPassword'}"><a href="#/user/edit" ng-click="tab = 'editPassword'">{{ 'user.tab.editPassword' | translate }}</a></li> </ul> <div ng-include="'partials/user-edit-viewProfile.html'" ng-if="tab == 'viewProfile'" class="anim-fade"></div> <div ng-include="'partials/user-edit-editProfile.html'" ng-if="tab == 'editProfile'" class="anim-fade"></div> -<div ng-include="'partials/user-edit-password.html'" ng-if="tab == 'editPassword'" class="anim-fade"></div> \ No newline at end of file +<div ng-include="'partials/user-edit-password.html'" ng-if="tab == 'editPassword'" class="anim-fade"></div> + -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm