Commit Graph

354 Commits

Author SHA1 Message Date
Joy Clark 0aff0b0f22 mounts are wider than pets and the empty paw prints in the mount view are smaller than the mounts that have been found. This makes the grid view uneven. Adjusted the css so that the mounts and paw prints are aligned. 2015-04-24 19:57:15 +02:00
Matteo Pagliazzi bbc9a75d49 Merge pull request #5079 from gisikw/party-join-leave-buttons
Ensure correct join/leave button for parties
2015-04-24 18:36:25 +02:00
Sabe Jones f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
Kevin Gisi 65e42345f2 Ensure correct join/leave button for parties 2015-04-24 11:54:00 -04:00
Blade Barringer 523582f870 Add clear:both after task-column to fix floating issue 2015-04-23 17:58:33 -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
Blade Barringer 8cec2da905 Added button for jumping to inbox 2015-04-22 19:29:24 -05:00
Kevin Gisi 705f9016c5 Use minification-friendly syntax 2015-04-22 12:04:04 -04:00
Matteo Pagliazzi 37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02: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
Alys 56592d144d Merge pull request #5048 from Rbrinkley/patch-1
Update front.jade
2015-04-22 15:34:22 +10:00
Alys 28e49f99f5 Merge pull request #5055 from gisikw/contributor-profile-fix
Inject RootCtrl into MemberModalCtrl to expose shared methods
2015-04-22 15:34:10 +10:00
Sabe Jones 7a7fc96818 feat(mystery): April Subscribee Items 2015-04-21 21:14:19 -05:00
Kevin Gisi a05714405a Inject RootCtrl into MemberModalCtrl to expose shared methods 2015-04-21 05:17:15 -04:00
Rbrinkley 340c484547 Increased Carousel Sliding Time on Static.Front
Increased carousel sliding time for front page in the "Players use HabitRPG to Manage" section. Increased time from 4 seconds to 10 seconds. Not too slow and not too fast. fixes https://github.com/HabitRPG/habitrpg/issues/5047
2015-04-19 10:52:34 -05:00
Alys 175ec9bb46 Merge pull request #5007 from stillsnowedin/develop
Updated the custom day start information in settings. (#5006)
2015-04-19 15:02:37 +10:00
Rbrinkley 26c1003f4a Update front.jade
Increased time for carousel sliding from 4 seconds to 10 seconds. 4 seconds too fast for user to full read all the information, 10 seconds is  not too slow but not too fast.
2015-04-18 22:29:36 -05:00
Tyler Renelle cfc8ff96e6 feat(tour): tmp set variant=2 to (counter + finish button) until we can
get google experiment working
2015-04-16 20:17:13 -06:00
Blade Barringer 1d95784dde refactor isMemberOfGroup and tests 2015-04-16 07:58:35 -05:00
hairlessbear 68486f7c42 Fixed display of Pet Hydra in Tavern (Tier 6)
In the Tier 6 contributor description, the Pet Hydra wasn't displaying. Changed `div` tag to `span` to fix the issue.
2015-04-16 07:48:15 -05:00
Blade Barringer 4853c0814d Corrected function 2015-04-16 07:39:55 -05:00
Blade Barringer e1a623d3e0 Merge pull request #5031 from gisikw/guild-detail-join-leave
Join/Leave buttons on guild detail page. Addresses #4427
2015-04-15 22:46:33 -05:00
Kevin Gisi 160982df33 Simplify group detection logic for guilds 2015-04-15 23:10:12 -04: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
Kevin Gisi d455666650 Join/Leave buttons on guild detail page. Addresses #4427 2015-04-15 06:15:11 -04:00
Blade Barringer c7cc6f0ae8 Merge pull request #5027 from crookedneighbor/send_test_data_to_test_db
Send test data to test db
2015-04-14 19:59:02 -05:00
Kathryn Norris 2fc01ee776 Simplified custom day start info in settings. (#5006) 2015-04-14 16:47:37 -07:00
Blade Barringer fc979dfdaa create new string for quest participants to correct processing error
closes #5025, closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris 6a461be0a4 Replaced toggleCustomDayStartInfo function with angular magic. (#5006) 2015-04-14 14:49:45 -07:00
Blade Barringer 83858da25e Change button to be more specific 2015-04-14 08:11:39 -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
Alys 6296a2f4df Merge pull request #4969 from Alys/explain-drops-2015-03-04
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Kathryn Norris ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Blade Barringer b027e2c407 Corrected port and db to use 2015-04-13 17:22:24 -05: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
hairlessbear 54578366b2 Revert "Changed Difficulty link from Trello to Wiki"
This reverts commit 0f7ccca00b.
2015-04-11 21:53:20 -04:00
hairlessbear 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
Blade Barringer 5f8477ff10 Merge pull request #5005 from crookedneighbor/hall_of_heroes_quick_click
Made uuid in hall of heroes populate the input box
2015-04-10 23:56:34 -05:00
Blade Barringer 8642366f15 scroll to top and load hero; add tests for new behavior. 2015-04-10 23:51:34 -05:00
Blade Barringer 730ac4b3df correct chat api tests; prevent sending a blank message via the api 2015-04-10 18:27:58 -05:00
Blade Barringer 426960c590 Merge branch 'develop' into Horacious-APIv2 2015-04-10 07:33:26 -05:00
Blade Barringer 24ef3aa012 Made uuid in hall of heroes populate the input box 2015-04-09 21:57:06 -05:00
Blade Barringer ddc91e0227 Merge branch 'develop' into TheHollidayInn-tasks-add-multiple-maintain-order 2015-04-09 17:32:09 -05:00
Blade Barringer 9e118cbfcc Added gem popover title back in 2015-04-09 17:19:58 -05:00