708ef0882b
Changed ng-show to ng-if and added one-time bindings
2015-04-25 19:32:41 -04:00
1ee5bbae72
Added a missing dot
2015-04-24 18:38:15 -04:00
f9eef5c497
Greyed-out challenges achievement
2015-04-24 18:36:49 -04:00
e16c1c2ec3
Fixed challenge achievement always displaying
...
Challenge achievement will now only display if the user has won 1 or more challenges.
2015-04-22 22:06:50 -04:00
93fcc8e71b
Fixed challenges achievement always displaying
2015-04-22 21:54:08 -04:00
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
7d1a58ca00
fix(slimes): Tweaks and missing sprite
...
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
f13c6cba00
feat(pets): Slime Quest
2015-04-15 18:08:43 -05:00
9aaf252628
Merge pull request #5016 from hairlessbear/develop
...
Changed Difficulty link from Trello to Wiki
2015-04-14 22:32:14 +10:00
b503a0fd64
Repaired task reordering issue
...
* Created `conditionalOrderBy` filter with a similar signature to `orderBy`,
using a single conditional argument that when false, causes the filter to
return the array unchanged
* Updated task view to use `conditionalOrderBy`
* Added karma specs for `conditionalOrderBy` filter
2015-04-13 08:51:08 -04:00
02838214c7
Reimplement (broken) task ordering
2015-04-13 07:47:56 -04:00
8af1f0538b
revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996
2015-04-13 20:16:24 +10:00
0083c3f881
Revert "Put list back into removeTask fn, update removal logic within challegeCtrl"
2015-04-13 19:34:59 +10:00
91562c82b4
changed Difficulty link from Trello to Wiki
2015-04-11 23:23:25 -04:00
54578366b2
Revert "Changed Difficulty link from Trello to Wiki"
...
This reverts commit 0f7ccca00b
2015-04-11 21:53:20 -04:00
0f7ccca00b
Changed Difficulty link from Trello to Wiki
...
Changed the Difficulty link from the Trello feature request to the
appropriate wiki page
2015-04-11 21:49:57 -04:00
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
0878293138
Update menu.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:55:44 -05:00
b9490d39b8
Update gems.jade
...
https://github.com/HabitRPG/habitrpg/issues/2932
2015-04-09 07:53:53 -05:00
860ca9fc16
Put list back into removeTask function, update removal logic within challengeCtrl
2015-04-08 23:03:45 -04:00
f12d56e456
Revert "Merge pull request #4995 from HabitRPG/revert-4980-sort-dated-todos"
...
This reverts commit 33f928b6d876ef1fdd92
2015-04-07 22:38:43 -04:00
9bb2f46264
Modify removeTask to accept a task object. Update task view to reflect new method signature.
2015-04-07 22:38:20 -04:00
cc674f57cd
Revert "Sorted dated todos by date."
2015-04-07 19:51:27 -05:00
66d5b38dad
fix(news): Move pic
2015-04-06 19:26:14 -05:00
38bbf63a22
fix(news): Add heading
2015-04-06 19:24:48 -05:00
616a7d9650
feat(backgrounds): April BGs
2015-04-06 19:03:24 -05:00
ac01d9ad8b
Sorted dated todos by date.
2015-04-06 03:47:00 -04:00
7d579ea08a
Merge branch 'CancelSendOnBlankPM' of https://github.com/rdhammond/habitrpg into rdhammond-CancelSendOnBlankPM
...
Conflicts:
website/views/shared/modals/members.jade
2015-04-05 23:24:46 +10:00
6199e1d843
Merge branch 'remove-interactivity-challenge-tasks' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-remove-interactivity-challenge-tasks
...
Conflicts:
website/public/css/tasks.styl
website/views/shared/tasks/task.jade
2015-04-05 22:01:10 +10:00
8033b129ff
Merge pull request #4915 from gisikw/free_100_key_to_the_kennels
...
Make Key to the Kennels free for Triad Bingoers.
2015-04-04 10:48:15 +10:00
7a357933dc
Merge pull request #4914 from gisikw/repair_ie_meters
...
Fix broken meters in IE
2015-04-04 01:54:24 +10:00
0e581444b7
Merge pull request #4887 from TheHollidayInn/focus-textarea-on-pm
...
Added focus directive to focus textarea for a private message model box
2015-04-04 01:45:30 +10:00
ab6d8d0821
Merge pull request #4950 from gisikw/force-latest-bailey
...
Ensure Bailey always displays the most recent message.
2015-04-04 01:29:32 +10:00
7740f1969b
Fix broken meters in IE
...
Health, XP, and Mana bars were broken in IE, due to the use of {{ }} within
style attributes. Using Angular's string interpolation within style attributes
doesn't work in IE, as IE will actually strip the property immediately upon DOM
render. Using ng-style allows properties to be preserved, and renders
cross-browser correctly.
2015-04-02 15:41:01 -04:00
d4329c7a5a
fix(news): Corrections
2015-04-01 23:37:24 -05:00
b263ba3099
fix(seasonal): Sneaky floral
...
Srsly, just don't say it.
2015-04-01 23:19:54 -05:00
f0e7f0464c
fix(seasonal): NO FLOWERS
...
We do not say the F word here. Strange things happen in Habitica when someone uses that word. We speak only of "the smelly things with the petals."
2015-04-01 23:07:36 -05:00
b6a4d65d8c
feat(seasonal): Shiny Seed
2015-04-01 22:36:07 -05:00
6e1024d8ed
fix(flowers): FLOWERS ON FLOWERS
2015-03-31 20:17:01 -05:00
79606736a1
Ensure Bailey always displays the most recent message.
...
* Added a Grunt task to precompile website/views/shared/new-stuff.jade to a
static html file.
* Updated the new-stuff.jade modal template to use a $rootScope property.
* Added a special case to openModal for the newStuff template, by which it
fetches the flat file, marks it as trusted HTML, and sets it to the
$rootScope property before rendering the modal.
2015-03-31 20:38:15 -04:00
740ddefd76
fix(flowers): AND FIXES
2015-03-31 18:55:07 -05:00
1cc3c5539f
feat(flowers): AND SLIMES
...
AND BACKGROUNDS
2015-03-31 18:41:50 -05:00
2acef4d42b
feat(flowers): FLOWERS
2015-03-31 18:30:22 -05:00
9722af679d
feat(customize): Spring Colors
2015-03-28 16:22:52 -05:00
cea97e4da8
Documenting the (Bootstrap recommended!) wrapper workaround for tooltips
...
on disabled elements. Added code to prevent user from posting blank
messages by using meta-enter as a workaround.
2015-03-28 01:21:39 -04:00
ca87a46b04
Adjusted Key to the Kennel logic so only *release both* is free with Triad Bingo achievement
2015-03-26 18:30:56 -04:00
334393d33b
Make Key to the Kennels free for Triad Bingoers.
...
* Updated logic in `common/script/index.coffee` to accept Triad Bingo
achievement in lieu of gems.
* Removed Gem cost on inventory page if user has achievement.
* Updated Key to the Kennels modal to hide "Buy Gems" button if user has
achievement.
* Removed Gem costs from buttons if user has achievement.
* Added new copy for Key to the Kennels modal that omits gem prices if the user
has the achievement.
2015-03-26 18:30:56 -04:00
e9062c31a2
Merge pull request #4913 from galarant/apply-level-cap-to-stats-display
...
front end reflects level cap for stats bonus
2015-03-26 17:49:45 +10:00
77cc05a668
fix(pets): Eggy eggy feed
2015-03-25 22:01:42 -05:00
hairlessbear