krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +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/rootCtrl.js
View File

@@ -166,7 +166,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
}
matrix = [[env.t('date'), env.t('score')]];
_.each(history, function(obj) {
matrix.push([moment(obj.date).format('MM/DD/YY'), obj.value]);
matrix.push([moment(obj.date).format(User.user.preferences.dateFormat.toUpperCase().replace('YYYY','YY') ), obj.value]);
});
data = google.visualization.arrayToDataTable(matrix);
options = {