c324ea3e03
Merge branch 'hairlessbear-hide_challenge_achievement' into develop
2015-04-25 22:15:37 -05:00
5cde0495a8
Add parenthesis back in so boolean will render correctly
2015-04-25 22:15:04 -05:00
7494cb1438
Make gem popover consistent with gold and silver. Closes #5088
2015-04-25 21:53:00 -05:00
831af01db6
Made fixes suggested by crookedneighbor
2015-04-25 22:38:16 -04:00
4d8310296b
Added another one-time binding
2015-04-25 22:14:16 -04:00
2d748e22e6
Removed unnecessary one-time bindings
2015-04-25 22:05:19 -04:00
4f340940ed
Added another one time binding
2015-04-25 21:10:14 -04:00
732ad1ef07
Fixed broken indentation
2015-04-25 20:24:50 -04:00
0b71c16966
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:17:23 -04:00
afdfa9e58e
Changed a bunch of ng-show to ng-if and added one-time bindings
2015-04-25 20:07:09 -04:00
ba2bdf6094
Merge pull request #5066 from hairlessbear/hide_challenge_achievement
...
Fixed challenges achievement always displaying
2015-04-25 18:57:53 -05:00
708ef0882b
Changed ng-show to ng-if and added one-time bindings
2015-04-25 19:32:41 -04:00
93c69aa573
move extra  
2015-04-25 11:08:48 -05:00
29ebe68461
Fixes #5083
2015-04-25 10:49:00 -05: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
f9cf860ae8
Merge pull request #5058 from SabreCat/busy-bee
...
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
f1c8941724
Merge pull request #5065 from crookedneighbor/social-number-placement
...
Added button for jumping to inbox
2015-04-23 17:41:03 -05:00
54e82a14a2
fix(invite-friends): text should be valid for both parties and guilds
2015-04-23 20:48:44 +02: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
8cec2da905
Added button for jumping to inbox
2015-04-22 19:29:24 -05:00
7c36e49243
Merge pull request #5022 from gisikw/dated-tasks-correct-impl
...
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
7a7fc96818
feat(mystery): April Subscribee Items
2015-04-21 21:14:19 -05: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
Blade Barringer