anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-04-20 22:54:28 -03:00
commit 009d7b75b8
13 changed files with 261 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/controllers/header.js
View file

@ -3,13 +3,13 @@
angular.module('copay.header').controller('HeaderController',
function($scope, $rootScope, $location, walletFactory, controllerUtils) {
$scope.menu = [{
'title': 'Home',
'icon': 'fi-home',
'link': '#/home'
}, {
'title': 'Copayers',
'icon': 'fi-torsos-all',
'link': '#/peer'
}, {
'title': 'Addresses',
'icon': 'fi-address-book',
'link': '#/addresses'
}, {
'title': 'Transactions',
'icon': 'fi-loop',
@ -49,4 +49,5 @@ angular.module('copay.header').controller('HeaderController',
$rootScope.flashMessage = {};
};
$rootScope.isCollapsed = true;
});