Commit Graph

150 Commits

Author SHA1 Message Date
hairlessbear 8e5cdbd742 Fixed challenges achievement always displaying (again)
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
2015-05-13 12:12:03 -04:00
Blade Barringer 71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer 1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
NotGonnaGitUs 09a713dbde Changed menu title to "promo codes" instead of "coupons". 2015-05-08 19:36:14 +05:30
git-afsantos 38056a4837 fix(stats) removed extraneous class bonus
Even leveled users below level 100 were showing an extra 0.5 stat class bonus. This was due to the level bonus being a float, instead of an integer. Used `Math.ceil` to fix the level bonus, thus removing the extraneous 0.5 class bonus.
2015-05-08 00:05:44 +01:00
negue e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Tyler Renelle 4f7c9cd445 feat(guide): temporarily remove current tutorial, add simple ? to expand help 2015-05-07 14:31:53 -04:00
Sabe Jones 2a375a120c feat(backgrounds): prettify news 2015-05-06 19:48:47 -05:00
Sabe Jones 00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Negue b2bad4d77f Update todo preview in dialog 2015-05-03 17:12:08 +02:00
Blade Barringer 62f7eae5d5 Fixes #5132 2015-05-03 09:01:12 -05:00
Blade Barringer 1f85b5bf67 add hack to have both mouseover and persisten click behavior 2015-05-01 22:12:00 -05:00
Blade Barringer e334ce7684 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-01 12:36:07 -05:00
Blade Barringer 954f9baeec chore(bailey) - skills rebalancing 2015-05-01 12:29:59 -05:00
Sabe Jones b6955db39c chore(news): Spring Fling warning 2015-04-30 17:23:26 -05:00
Blade Barringer e4b21ac325 Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo 2015-04-29 17:19:24 -05:00
Negue 189423b0db markdown preview - code "inherit white-space" / hide links for 'system' 2015-04-27 19:47:42 +02:00
Negue 75579a7c36 add previewMarkdown / click as popover-trigger / misc changes 2015-04-27 19:23:56 +02:00
Blade Barringer c324ea3e03 Merge branch 'hairlessbear-hide_challenge_achievement' into develop 2015-04-25 22:15:37 -05:00
Blade Barringer 5cde0495a8 Add parenthesis back in so boolean will render correctly 2015-04-25 22:15:04 -05:00
Blade Barringer 7494cb1438 Make gem popover consistent with gold and silver. Closes #5088 2015-04-25 21:53:00 -05:00
hairlessbear 831af01db6 Made fixes suggested by crookedneighbor 2015-04-25 22:38:16 -04:00
hairlessbear 4d8310296b Added another one-time binding 2015-04-25 22:14:16 -04:00
hairlessbear 2d748e22e6 Removed unnecessary one-time bindings 2015-04-25 22:05:19 -04:00
hairlessbear 4f340940ed Added another one time binding 2015-04-25 21:10:14 -04:00
hairlessbear 732ad1ef07 Fixed broken indentation 2015-04-25 20:24:50 -04:00
hairlessbear 0b71c16966 Changed a bunch of ng-show to ng-if and added one-time bindings 2015-04-25 20:17:23 -04:00
hairlessbear afdfa9e58e Changed a bunch of ng-show to ng-if and added one-time bindings 2015-04-25 20:07:09 -04:00
Blade Barringer ba2bdf6094 Merge pull request #5066 from hairlessbear/hide_challenge_achievement
Fixed challenges achievement always displaying
2015-04-25 18:57:53 -05:00
hairlessbear 708ef0882b Changed ng-show to ng-if and added one-time bindings 2015-04-25 19:32:41 -04:00
Blade Barringer 93c69aa573 move extra &nbsp 2015-04-25 11:08:48 -05:00
Blade Barringer 29ebe68461 Fixes #5083 2015-04-25 10:49:00 -05:00
hairlessbear 1ee5bbae72 Added a missing dot 2015-04-24 18:38:15 -04:00
hairlessbear f9eef5c497 Greyed-out challenges achievement 2015-04-24 18:36:49 -04:00
Sabe Jones f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
Blade Barringer f1c8941724 Merge pull request #5065 from crookedneighbor/social-number-placement
Added button for jumping to inbox
2015-04-23 17:41:03 -05:00
Matteo Pagliazzi 54e82a14a2 fix(invite-friends): text should be valid for both parties and guilds 2015-04-23 20:48:44 +02:00
hairlessbear 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
hairlessbear 93fcc8e71b Fixed challenges achievement always displaying 2015-04-22 21:54:08 -04:00
Blade Barringer 8cec2da905 Added button for jumping to inbox 2015-04-22 19:29:24 -05:00
Alys 7c36e49243 Merge pull request #5022 from gisikw/dated-tasks-correct-impl
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Sabe Jones 7a7fc96818 feat(mystery): April Subscribee Items 2015-04-21 21:14:19 -05:00
Sabe Jones 7d1a58ca00 fix(slimes): Tweaks and missing sprite
Slimes don't have skeletons anyway, right?
2015-04-15 18:48:57 -05:00
Sabe Jones f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Alys 9aaf252628 Merge pull request #5016 from hairlessbear/develop
Changed Difficulty link from Trello to Wiki
2015-04-14 22:32:14 +10:00
Kevin Gisi 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
Kevin Gisi 02838214c7 Reimplement (broken) task ordering 2015-04-13 07:47:56 -04:00
Alys 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
Alys 0083c3f881 Revert "Put list back into removeTask fn, update removal logic within challegeCtrl" 2015-04-13 19:34:59 +10:00
hairlessbear 91562c82b4 changed Difficulty link from Trello to Wiki 2015-04-11 23:23:25 -04:00