sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 17:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
habitica/views/shared
History
Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
2013-12-02 18:24:33 -07:00
..
header Merge branch 'develop' into classes 2013-12-02 18:24:33 -07:00
modals Merge branch 'develop' into classes 2013-12-02 18:24:33 -07:00
profiles fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
tasks Merge branch 'develop' into classes 2013-12-02 18:24:33 -07:00
footer.jade fix up CONTRIBUTING.md, update "submit bugs" links with this change 2013-11-26 17:09:13 -07:00
formatting-help.jade Change Markdown help link to point at HabitRPG wiki 2013-11-24 13:13:21 -06:00
gems.jade gems: can click main gem button, doens't require [+] 2013-10-12 20:08:06 -07:00