Commit graph

5408 commits

Author SHA1 Message Date
Alice Harris
49afe21a41 Update VAGRANT.md
move instructions to wiki and link to them there
2014-09-21 17:13:15 +10:00
Alice Harris
deb6d8fcbf Update CONTRIBUTING.md
bug reporting: link to the primary location for bug report instructions
2014-09-21 16:57:52 +10:00
Aneesh Goel
0dc20b4b08 small payments refactor for better codeclimate 2014-09-20 14:53:14 -07:00
Tyler Renelle
f38db7b964 feat(fall): bailey + free candy script 2014-09-20 14:13:07 -06:00
Negue
c501652194 - add popoverHtml to enable Markdown in Popovers
- add markdown filter to get Task Notes as Markdown
2014-09-20 12:13:36 +02:00
Negue
71c9ea66f4 3rd and last! header scrolling fix, now the full scroll bar is "visible" for the mouse 2014-09-18 21:37:53 +02:00
Negue
b3c8acef10 fix guild list 2014-09-18 19:47:30 +02:00
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
Negue
e180f73a0e apiUrlService inside services 2014-09-17 20:35:44 +02: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
Negue
8f468c27ff use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js 2014-09-16 20:52:32 +02: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
Vera Pavel
3b16206293 fixing guild reject error (issue #2886)-correcting syntax 2014-09-15 21:35:27 -04:00
Negue
7a0883746c Use ApiUrlService in all services 2014-09-15 21:31:39 +02: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
Vera Pavel
70a409cb4a fix challenge export to csv to export all tasks (issue #2947) 2014-09-12 20:44:51 -04: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
Vera Pavel
35a8351739 Revert "making export to csv export everything (issue #2947)"
This reverts commit bf28019465.
2014-09-12 17:51:22 -04: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
Vera Pavel
bf28019465 making export to csv export everything (issue #2947) 2014-09-11 11:09:12 -04: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