krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

Browse Source 
Conflicts:
	bower.json
	public/manifest.json
	src/controllers/auth.js
This commit is contained in:
Blade Barringer
2015-02-05 11:20:40 -06:00
parent 28b9ad11cb 3897266ba6
commit dca2f13dda
12 changed files with 397 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/controllers/groupsCtrl.js
View File

@@ -111,7 +111,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
.controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups',
function($scope, $rootScope, Members, Shared, $http, Notification, Groups) {
$scope.timestamp = function(timestamp){
return moment(timestamp).format('MM/DD/YYYY');
return moment(timestamp).format($rootScope.User.user.preferences.dateFormat.toUpperCase());
}
// We watch Members.selectedMember because it's asynchronously set, so would be a hassle to handle updates here
$scope.$watch( function() { return Members.selectedMember; }, function (member) {