Commit graph

5294 commits

Author SHA1 Message Date
Matteo Pagliazzi
292d2455ba fix(emails): try multiple attemps (delay not avalaible in api because in not yet released version) 2014-09-18 18:43:55 +02:00
Matteo Pagliazzi
7e53eaf1ae Revert "Revert "ngRepeat with track by""
This reverts commit c90c8f9a5f.
2014-09-18 18:37:02 +02:00
Alice Harris
f6e1e091f4 Merge pull request #4010 from negue/group_returnMembers
return group members on questAccept / questAbort
2014-09-18 18:39:38 +10:00
Matteo Pagliazzi
900d8e7dfa fix(emails): re-add emails for payments, @lefnire should be ok now I had used req.user but it did not exist. There is a way to test payments locally? Because even now I can not verify it is really ok 2014-09-17 15:55:19 +02:00
Tyler Renelle
ad146d6d88 fix(payments): revert payments.js to 5cc4c60, see #2454 cc @paglias 2014-09-16 21:31:52 -06:00
Tyler Renelle
c32cd57c92 bailey: Rooster Pets, Party Sorting, And Back-To-School Challenge 2014-09-16 16:13:29 -06:00
Tyler Renelle
94e1d48588 feat(quests): add rooster rampage quest 2014-09-16 16:08:35 -06:00
Alice Harris
6e33c237d3 Merge pull request #4022 from Alys/partyAvatarSortOrder
improve and clarify party avatar sort options for header - fixes https://github.com/HabitRPG/habitrpg/issues/2239
2014-09-16 14:15:01 +10:00
negue
c348d72142 fix payments.js compile 2014-09-15 21:20:41 +02:00
Alice Harris
028c136d43 Merge pull request #4029 from Alys/readme
gut README.md and insert links to wiki documentation
2014-09-15 19:18:26 +10:00
Matteo Pagliazzi
3118508e9c fix(emails): send only if email found 2014-09-14 19:35:51 +02:00
Matteo Pagliazzi
fca45a3c0b feat(emails): add emails on signup, subscription begin and donation 2014-09-13 14:28:11 +02:00
Alice Harris
5ce4f18567 gut README.md and add links to wiki documentation - everything in one place. Approved by lefnire in https://github.com/HabitRPG/habitrpg/pull/4024#issuecomment-55451042 2014-09-13 14:56:07 +10:00
Tyler Renelle
84d1bf9e27 tmp(challenges): remove STW chal from tavern, revert with 4c6bcb5444 2014-09-12 19:15:11 -06:00
Tyler Renelle
49f2718eec Merge pull request #4006 from gasolin/mobile_task_view
add responsive mobile web task view #4005
2014-09-12 17:28:03 -06:00
Tyler Renelle
dc359e7f75 fix(pushTo): only pushToBottom on todos 2014-09-12 14:44:03 -06:00
Tyler Renelle
4c6bcb5444 tmp(challenges): temporarily remove STW challenge from the list until we
can fix the bug
2014-09-12 14:13:06 -06:00
Tyler Renelle
78624c0bc7 bailey: new official challenge, help menu, MD in checklists 2014-09-12 14:13:06 -06:00
Tyler Renelle
09e43a3560 Merge pull request #4024 from Alys/seedjs
comment-out seed.js because it's no longer required
2014-09-12 13:39:12 -06:00
Negue
34fe2a9d9e change sticky-header height to 205px instead of auto - fixes #4023 2014-09-12 17:25:58 +02:00
Alice Harris
b5ee56b079 Merge pull request #4007 from Alys/pushToBottom-sortOrder-Sep03
add support for pushTaskToBottom to help with To-Do sort order bug
2014-09-12 14:05:52 +10:00
Alice Harris
e6a29f80fa Merge pull request #4002 from Alys/questAbortFix
add Cancel button for quests, allow party to cancel/abort if quest owner missing, add Debug tools for quest testing
2014-09-12 14:01:09 +10:00
Alice Harris
85498d8257 adjust comments 2014-09-12 13:12:42 +10:00
Alice Harris
1503924a2e comment-out seed.js because it's no longer required - https://github.com/HabitRPG/habitrpg/issues/3852#issuecomment-55334572 2014-09-12 13:09:08 +10:00
Alice Harris
0378cb5dae Merge pull request #4019 from Alys/eggMounts-Sep11
hide Plain Egg mounts and remove them from totalMounts count - fixes https://github.com/HabitRPG/habitrpg/issues/3240
2014-09-12 12:10:06 +10:00
Alice Harris
5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00
Alice Harris
d9661cf089 hide Plain Egg mounts and remove them from the totalMounts count 2014-09-11 17:59:37 +10:00
Tyler Renelle
29d1cf460c bailey() 2014-09-09 23:10:05 -06:00
Negue
62361b6c3b set sticky header height to auto - fix #3011 2014-09-09 20:10:08 +02:00
Negue
cc17c3cfef return group members on questAccept / questAbort 2014-09-09 18:35:32 +02:00
Alice Harris
dc65bd7f45 comment out the button for allowing manual pushToBottom 2014-09-09 17:13:19 +10:00
Alice Harris
6cc1d1146e refactor User.user.ops.sortTask into $scope.pushTask 2014-09-09 17:04:13 +10:00
Alice Harris
52efad41a2 make pushTaskToBottom work, but it is messy 2014-09-09 16:20:02 +10:00
Alice Harris
e1d10a9af4 introduce some hideous temporary test code 2014-09-09 13:53:15 +10:00
gasolin
d4701e60da add responsive mobile web task view #4005 2014-09-09 11:14:38 +08:00
Tyler Renelle
f59bba598e Merge pull request #4003 from Lamecarlate/develop
Update inventory.styl
2014-09-08 17:53:58 -06:00
Chaopale Lamecarlate
716fb9b111 Update inventory.styl 2014-09-08 23:10:27 +02:00
Alice Harris
9dcc2576c3 remove dev comment 2014-09-09 06:00:23 +10:00
Alice Harris
b5ac0c635a improve new code for cancelling quests in invitation stage and for handling the cases where the quest owner is no longer in the quest or in the party 2014-09-09 06:00:23 +10:00
Alice Harris
801753b37a add Cancel option to API for quests that have not been started (invitation stage) 2014-09-09 06:00:23 +10:00
Alice Harris
f520b8ae66 add extra Debug tools useful for quests 2014-09-09 06:00:23 +10:00
Alice Harris
0e163034cf semi-random tentative crappy code for improving quest aborting, especially when the quest owner has left the party 2014-09-09 06:00:23 +10:00
Matteo Pagliazzi
c90c8f9a5f Revert "ngRepeat with track by"
This reverts commit 397ef5e72c.
2014-09-08 12:30:30 +02:00
Tyler Renelle
6253404677 tests(api.mocha): move bac to coffeescript from javascript 2014-09-07 17:06:24 -06:00
Tyler Renelle
aa0c365326 wip(indexes): starter code for handling duplicate accounts #3986 2014-09-07 14:34:43 -06:00
Tyler Renelle
7e91fa4524 Merge pull request #3987 from Alys/soundOff404-Sep05
prevent harmless but annoying 404 errors for sound files when sound is off
2014-09-05 16:08:14 -06:00
Tyler Renelle
1dc141b1ec Merge pull request #3993 from negue/performance_trackBy
ngRepeat with track by
2014-09-05 16:04:14 -06:00
Tyler Renelle
9dda82ac1c Merge pull request #3988 from Alys/helpMenu_0827
add Help menu - fixes UI Trello card: Help/FAQs
2014-09-05 13:47:08 -06:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Alice Harris
9cf76f0deb fix whitespace 2014-09-05 21:07:57 +10:00