Commit Graph

2141 Commits

Author SHA1 Message Date
Keith Holliday ab5fc1f526 Added initial get group tests 2016-01-23 13:42:00 -06:00
Matteo Pagliazzi 1a31f73238 fix query when setting new group leader 2016-01-20 21:35:00 +01:00
Keith Holliday ef6afaedb4 Added intitial group leave tests
Fixed test readability, updated party test, and updated challenge update code when leaving group
Updated library, added group existance check, and reset full party
Updated syntax, added new userUnlinkChallenges, and added some initial testing for challenges
Added challenge tasks tests
Added try/catch to group remove, add more party tests, fixed broken challenge test, removed useless return value
Added public guild tests, added more tests to party, and abstracted remove invitations logic

Closes #6506
2016-01-20 08:51:30 -06:00
Blade Barringer 66083f766c Merge branch 'api-v3' into api-v3-groups 2016-01-18 18:04:20 -06:00
Blade Barringer 32a2b3121e Merge branch 'develop' into api-v3 2016-01-18 18:04:07 -06:00
Sabe Jones d44ff94acb Merge pull request #6547 from vIiRuS/guidelinespage
Add viirus to Community Guidelines page. Fixes #6546
2016-01-18 15:37:58 -06:00
Sabe Jones c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
Sabe Jones 9b008f71a0 fix(CSS): remove redundant style 2016-01-18 16:13:24 -05:00
Phillip Thelen d0de12abac Add viirus to Community Guidelines page. Fixes #6546 2016-01-18 20:52:27 +01:00
Blade Barringer 1ff9db253b Merge branch 'api-v3' into api-v3-groups 2016-01-18 10:13:48 -06:00
Blade Barringer a0a840e22a Merge branch 'develop' into api-v3 2016-01-18 10:12:42 -06:00
Matteo Pagliazzi ee854229c7 fix dateCompleted not remove from un-completed todos and fix tasks test 2016-01-18 15:01:46 +01:00
Blade Barringer af19d0d77b fix: Correct stylus comment about modal height 2016-01-17 16:11:42 -06:00
Blade Barringer 0a2c833f9b Merge branch 'tylerxo-develop' into develop 2016-01-17 16:10:59 -06:00
Kristian Tashkov f37b5a7fac Challenges join route and tests 2016-01-17 15:44:15 -06:00
Matteo Pagliazzi ec7ed9c90e add tests for getChallengeMemberProgress route and several bug fixes 2016-01-17 18:31:03 +01:00
Matteo Pagliazzi 8de8ca7e18 add getChallengeMemberProgress route and misc fixes 2016-01-17 12:01:57 +01:00
Matteo Pagliazzi c27f98075c Merge branch 'api-v3-groups' into api-v3-members 2016-01-17 11:24:10 +01:00
Blade Barringer 965c5dbaa7 Merge branch 'api-v3' into api-v3-groups 2016-01-16 19:46:47 -06:00
Tyler Smith 1d7c30a06d Fixes for the profile modal
This commit fixes the following:

1. Unintented scrollbar was being created on the .modal container element
2. 15px gap between the footer and scrollable content, creating an odd visual lapse
3. Modal was too wide between 768px and 900px, bleeding off the page.
2016-01-16 16:14:20 -08:00
Blade Barringer 07f08de989 Merge branch 'improve_tests' into api-v3 2016-01-16 18:12:36 -06:00
Joshua Holland e98dc1405b Fix rendering of front page news icons
Rendering was 'pixelated', is now 'auto'.
2016-01-16 22:43:29 +00:00
Joshua Holland c85f994f4c Make .img-rendering-auto apply to descendants 2016-01-16 22:39:40 +00:00
Matteo Pagliazzi f447af19ae add tests for getting challenge members and fix a lot of bugs 2016-01-16 16:18:06 +01:00
Matteo Pagliazzi d7d63ad229 populate group.leader 2016-01-16 15:10:18 +01:00
Matteo Pagliazzi ad41037f59 finish tests for members controller 2016-01-15 21:47:20 +01:00
Sabe Jones 23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Matteo Pagliazzi 2ee75c1ad3 add tests for getMember 2016-01-15 19:44:45 +01:00
Matteo Pagliazzi b0caf71641 fix several busg with tasks and challenges 2016-01-15 18:54:28 +01:00
Matteo Pagliazzi 3eb9d4b098 members controller: support challenges 2016-01-15 15:30:13 +01:00
Matteo Pagliazzi 50a85337a7 better access control for challenges 2016-01-15 15:29:50 +01:00
Matteo Pagliazzi e0b10d44ca Merge branch 'api-v3-groups' into api-v3-members 2016-01-15 11:22:11 +01:00
Luveluen 5315cc9055 Update character.json to separate optOut into two translation strings
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
Georgi Gardev 24e08676db Add icon for pinned Safari tabs
Fixes #6451
Closes #6522
2016-01-14 20:32:51 -06:00
Georgi Gardev e761315c74 Remove tooltip for 'reverse chat messages' checkbox
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
Josh Holland a0b264f686 Align progress and help icons on to-dos column
Fixes #6474

As per #6474, progress and help icons on the to-dos column were
previously misaligned due to inline styles. This commit adds the same
inline styles to both icons.

Move inline styles on task column icons to a class

This uses existing classes instead of adding a new one, because if new
icons are added in the future this should catch them without any extra
classes having to be added to the new icons.

In addition, this will catch any new .option-box added to .task-column
in the future; this may be good or bad, but is easy to fix in any case.
2016-01-14 20:24:09 -06:00
Sabe Jones b6b2c25358 style(modal): text and visual tweaks for Gems 2016-01-14 15:58:14 -05:00
Matteo Pagliazzi 7d5a7503cb fix access to user.tasksOrder 2016-01-14 20:55:13 +01:00
Matteo Pagliazzi 5206469e90 add unlinkTask route and refactor user.unlink (now user.unlinkChallengesTasks) 2016-01-14 19:46:43 +01:00
Matteo Pagliazzi 2b9aa11598 Merge branch 'api-v3-groups' into api-v3-challenges-tasks 2016-01-14 18:25:59 +01:00
Sabe Jones 14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi 9a908785c1 new history preening, save tasks after cron 2016-01-13 23:07:08 +01:00
Matteo Pagliazzi 6f6d4edcec Merge branch 'api-v3-groups' into api-v3-members 2016-01-13 18:41:53 +01:00
Matteo Pagliazzi 4afad11067 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:41:27 +01:00
Matteo Pagliazzi 771bc0c5b5 put back acceptablePUTPaths variable deleted in merge 2016-01-13 18:41:09 +01:00
Matteo Pagliazzi e2edb974d7 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:40:04 +01:00
Matteo Pagliazzi 914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Matteo Pagliazzi 6088b6da42 fix edge case where res.respond would not work, misc comments 2016-01-13 18:35:29 +01:00
Matteo Pagliazzi 7c15472fab wip on members controllers 2016-01-13 18:29:02 +01:00
Alys fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00