sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2398 commits 3 branches 0 tags 1.6 GiB
Commit graph

77 commits

Author SHA1 Message Date
Tyler Renelle
8fdeccf43c challenges: fix disappearing repeat bug 2013-06-02 10:07:15 -04:00
Tyler Renelle
5f78d801a8 challenges: make @editable dynamic so we can add tasks when in edit mode 2013-05-31 18:59:20 -04:00
Tyler Renelle
fd7ae42a43 Merge branch 'develop' into challenges 
Conflicts:
	views/app/filters.html
	views/app/tasks.html
 2013-05-31 17:18:26 -04:00
Tyler Renelle
268157ca24 tags: use explicit {#each users[_userId].tags} instead of model.ref private path {#each _user.tags}. fixed many tags issues. see https://github.com/codeparty/derby/issues/267 2013-05-31 16:25:59 -04:00
Tyler Renelle
91c5331a28 challenges: couple bug fixes 2013-05-30 08:41:07 +01:00
Tyler Renelle
88ff245aec challenges: add taskInChallenge() view helper and broken task.challenge link 2013-05-29 20:53:57 +01:00
Tyler Renelle
bd18667420 convert task-editing state to private path so we don't have 
conflicting ids
 2013-05-28 16:43:16 +01:00
Tyler Renelle
2fbff2a0bc challenges: lock down editing capabilities on certain task properties, 
instead showing the challenge's properties (in case they change
challenge-side).This includes editing the tag name
 2013-05-28 11:52:32 +01:00
Tyler Renelle
35049f7752 Merge branch 'develop' into challenges-tmp 
Conflicts:
	src/app/helpers.coffee
	src/app/index.coffee
 2013-05-26 15:29:59 +01:00
Tyler Renelle
258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle
bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle
ff2fedda48 add ability to restore lost streaks, also add int() view helper 
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
 2013-05-21 14:33:31 +01:00
Tyler Renelle
9b41712ca6 challenges: fix to not apply user's active tags to new challenge 
tasks, but also not apply filters except to main user's list
 2013-05-17 23:32:24 +01:00
Tyler Renelle
6507795d99 challenges: prevent some task options (such as scoring, check-marking, 
tags, etc) for challenge edits
 2013-05-17 20:59:29 +01:00
Tyler Renelle
0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn 2013-05-17 14:06:27 +01:00
Tyler Renelle
d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird 2013-05-17 14:06:27 +01:00
Slappybag
367c860ac8 syntax error on my part 2013-05-12 14:34:49 +01:00
Tyler Renelle
bb1ea755f1 tasks / rewards.html - pass in the actual list, and whether booleans 
@editable and @main, which will allow for challenges lists & mngr
accounts / public lists
 2013-05-12 13:12:13 +01:00
Tyler Renelle
4347ba52ba overhaul tasks.html so we can start generalizing task-lists, 
ground-work for challenges
 2013-05-12 11:33:05 +01:00
Tyler Renelle
f7145bb951 cleanup of the show-completed / show-remaining. That context-dependant 
/ display-context-for stuff was bugging me out, and wasn't using Derby
to it's potential. also some tags & habit-wide cleanup in helpers:taskClasses()
 2013-05-12 10:52:32 +01:00
Daniel Saewitz
58d6c39be8 Allow translations to be set from local model 2013-05-09 13:07:54 -04: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
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
d975931500 tags: add tags legend to task meta 2013-05-06 17:05:34 +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
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
bcb2505a96 add streak GP bonus & drop bonus (separately handled) 2013-05-03 18:51:47 +01:00
Tyler Renelle
c9aa04439d begin implementing streaks 2013-05-03 18:20:28 +01:00
Kevin Kaland
f6f397dcb0 Use user's current day for completed/uncompleted. 
References #587.
 2013-04-12 23:20:30 +02:00
Tyler Renelle
41449d349a protocol-agnostic amazon images & hover-script at the end 2013-03-31 00:27:47 -07:00
Tyler Renelle
ce43a7503b no more adsense, switching to amazon affiliates because of https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo 2013-03-31 00:06:29 -07:00
Tyler Renelle
be83a2c46e Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-29 22:28:27 -07:00
Tyler Renelle
9b42eb825b small ads & static-bindings cleanup (doesn't fix the ads issue) 2013-03-29 21:48:08 -07:00
Daniel Saewitz
2b59c205a2 Remove translations for now 2013-03-29 14:15:17 -04:00
Tyler Renelle
6d6085e29b Merge branch 'ads' into pets 2013-03-28 00:28:59 -07:00
Tyler Renelle
124409bfc5 Merge pull request #715 from switz/translations 
@lefnire => i18n support... aka Translations!
 2013-03-25 18:42:53 -07:00
Zachary Kain
b038b74534 checkbox shenanigans fix. 2013-03-25 10:05:44 -04:00
Daniel Saewitz
8107200105 i18n implemented 2013-03-23 16:03:12 -04:00
Tyler Renelle
199006d692 move todos-charts up top 2013-03-21 16:36:24 -06:00
Tyler Renelle
b286b95153 add charts back in, temporary style 2013-03-21 16:31:23 -06:00
Tyler Renelle
9255644108 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-18 21:51:54 -06:00
Tyler Renelle
b287d854f1 add tag-editing context (add new, delete). still have to refresh after everything, do to the live-bound each bug 2013-03-18 20:25:01 -04:00
Tyler Renelle
494d5cecf9 for now don't live-bind to {#each _user.tags}. There's a derby bug 
here, so we'll have to refresh when users add new tags until we get
that fixed
 2013-03-18 19:47:15 -04:00
Tyler Renelle
d6652bcf12 rename user._tagFilters to user.filters 2013-03-18 18:13:05 -04:00
Tyler Renelle
f332c5d9a8 Merge branch 'develop' into toebu-tags-filters 
Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/tasks.html
 2013-03-18 17:09:42 -04:00
Tyler Renelle
70dcd0b886 move rewards column into rewards rewards.html 2013-03-18 16:47:03 -04:00
Zachary Kain
97294b793f robustify input stuff. Still NEED to rip out existing bootstrap classes so mine take hold 2013-03-18 14:37:14 -04:00
Zachary Kain
6d2df1ccc9 fix price input bug 2013-03-18 14:37:03 -04:00
Tyler Renelle
903745f7c9 pass in whole task object to taskClasses 2013-03-17 21:50:02 -04:00
Tyler Renelle
4614e48cdc Adding first rudimentary version of tagging and filtering. New users get three tags: morning, afternoon and evening. At the moment, one can not change these tags or add new ones. There are also some problems: tagging a newly added task, also tags one of the existing tasks. Also, when having an active filter and removing the corresponding tag from a task, that task is immediately hidden, although you are still editing it. 2013-03-17 09:10:27 -04:00