Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,095 Commits 64 Branches 1,256 Tags
59f9b742d94b69bcfe80a72a942601f4e39397bc
Commit Graph

2095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle 59f9b742d9 tags: add migration to set initial empty tags to an array - why was it 
being set to an object?
 2013-05-07 10:27:31 +01:00
Tyler Renelle 7e6fe850e8 tags: user.setNull('tags',[]) 2013-05-07 10:04:54 +01:00
Tyler Renelle 475d32c38c Merge branch 'develop' 2013-05-07 08:59:36 +01:00
Tyler Renelle 5e16dddefa tags: add bailey notification 2013-05-07 08:59:14 +01:00
Tyler Renelle 71d123945e Merge pull request #905 from switz/css-box 
@lefnire => Fix #868 - No more missing buttons
 2013-05-07 00:55:04 -07:00
Daniel Saewitz 2d5c54a287 Disable border on completed 2013-05-07 03:51:41 -04:00
Daniel Saewitz fe950b5044 Fixes #868 2013-05-07 03:43:39 -04:00
Daniel Saewitz c32e09c961 Merge pull request #903 from switz/pet-fix 
@switz => Fixes #902 - Fix reselection of similar pet type
 2013-05-06 23:39:36 -07:00
Daniel Saewitz 40d9c7b1ff Fixes #902 2013-05-07 02:37:00 -04:00
Tyler Renelle 81dbaaef67 use unicode & icon-repeat to solve character support issue, temporary 
solution to #868
 2013-05-06 22:20:21 +01:00
Tyler Renelle 33749af7c8 only show achievements tab if they have any 2013-05-06 21:28:27 +01:00
Tyler Renelle 88c0db47f1 tags: only show filters when in tasks view 2013-05-06 21:27:10 +01:00
Tyler Renelle ad54079c0c tags: simply display by just showing an icon with a tooltip listing tags 2013-05-06 20:51:25 +01:00
Tyler Renelle a0faa3ea05 allow buying when tokens == item.value 2013-05-06 19:51:36 +01:00
Tyler Renelle 91b71f9214 allow buying when tokens == item.value 2013-05-06 19:51:15 +01:00
Tyler Renelle e2a4e8b826 small cleanup 2013-05-06 18:02:42 +01:00
Tyler Renelle 3347163d5c tags: rename to Filters: to Tags: 2013-05-06 18:00:30 +01:00
Tyler Renelle 9370958693 tags: move tags stuff in tasks html out to filters.html, click the 
tag on a task to apply tag
 2013-05-06 17:57:06 +01:00
Tyler Renelle be6460edbb tags: click 'add' works now, along with enter 2013-05-06 17:34:17 +01:00
Tyler Renelle 68effee1e8 tags: remove inline comments a la @switz https://gist.github.com/switz/d3dfdf42c369c254466c 2013-05-06 17:24:26 +01:00
Tyler Renelle 3e40443d0f tags: try more explicit model.push 2013-05-06 17:17:24 +01:00
Tyler Renelle d975931500 tags: add tags legend to task meta 2013-05-06 17:05:34 +01:00
Tyler Renelle b561dcba09 tags: eff it, refresh after saving tags 2013-05-06 16:53:59 +01:00
Tyler Renelle fa7232760c tags: use icon-pencil for editing 2013-05-06 16:43:01 +01:00
Tyler Renelle 82682e1af1 tags: cleanup, prevent bug for multiple tag-creation 2013-05-06 16:41:35 +01:00
Tyler Renelle ccd091b622 tags: some visual cleanup of the filter bar 2013-05-06 15:59:58 +01:00
Tyler Renelle bed0f64d47 tags: use select combobox instead of dropdown, easier code & mitigates 
some css issues
 2013-05-06 15:27:27 +01:00
Tyler Renelle 40dc8e422c new tag sets _newTag to '', reset dom, static-bound tag loop 2013-05-06 15:18:36 +01:00
Tyler Renelle 9740e79d8d reset dom on tags instead of location.reload() 2013-05-06 15:14:32 +01:00
Tyler Renelle a3003a758d Merge branch 'tags' into develop 
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html
 2013-05-06 14:01:43 +01:00
Tyler Renelle 9737e0e2a2 settings in two panes rather than sub-tabs 2013-05-06 09:55:44 +01:00
Tyler Renelle 0cf18483ff chat functions better with just some padding rather than hight & 
line-height (see multi-line chats with the large line-height)
 2013-05-05 23:34:14 +01:00
Tyler Renelle ed1f3acded full username test in chat (_user.profile.name only part of the 
equation), and min-height: 60px - was getting stacked longtext issue
 2013-05-05 23:29:10 +01:00
Tyler Renelle 06be572220 Merge remote-tracking branch 'switz/chat' into develop 
Conflicts:
	src/app/helpers.coffee
 2013-05-05 23:17:17 +01:00
Tyler Renelle b0b90f686c add back in model.id(), modified lefnire/racer#habitrpg model.id() instead 2013-05-05 23:04:09 +01:00
Tyler Renelle b4b0733e21 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-05 22:04:28 +01:00
Tyler Renelle d055f68c5b temporary fix to #891, model.id() isn't working for some reason. 
Provide custom `helpers.uuid()` function until I can figure this out
 2013-05-05 22:03:26 +01:00
Daniel Saewitz 669cdb35b6 Cleanup model code 2013-05-05 13:47:50 -04:00
Daniel Saewitz 3526cd6f72 Keep relative times updated every 60 seconds 2013-05-05 13:44:24 -04:00
Daniel Saewitz c1c2f025ad Merge develop and add functionality to party chat 2013-05-05 13:07:36 -04:00
Stan Lindsey 671f843d30 csv export script 2013-05-05 17:00:59 +01:00
Tyler Renelle 9b1bcb8367 dynamic pets, fix #897 2013-05-05 13:54:32 +01:00
Daniel Saewitz 68a932d5ab Remove timestamp 2013-05-04 15:00:26 -04:00
Daniel Saewitz c8ddd39577 Add relative dates to chat 2013-05-04 14:56:21 -04:00
Daniel Saewitz 66dbc3f258 Highlight username in tavernchat 2013-05-04 13:15:47 -04:00
Tyler Renelle 7ebe611078 adjust achievement view logic for previous commit 2013-05-04 16:41:07 +01:00
Tyler Renelle 0f1ec096ef add backer.contributor & backer.npc for tavern & party chat 2013-05-04 16:03:03 +01:00
Tyler Renelle c8e4386b4b add backer, npc, and contributor achievements (still need to run 
database migrations for them)
 2013-05-04 14:24:37 +01:00
Tyler Renelle 3a259ae1c7 preparation for backer-gear setting by restricting sets to user.backer 2013-05-04 14:10:38 +01:00
Tyler Renelle b468f052fd remove "+ undefined" for (-)habit. Workaround, need to find why 
stats.gp is being set from (-)habit at all
 2013-05-04 12:10:34 +01:00