Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,324 Commits 64 Branches 1,256 Tags
ead42e7cef968aa8ae82bf5ba1ee4e893abc2e4e
Commit Graph

5324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle ead42e7cef fix(memleak): temp, wonky fix to #4079 . Sets closure vars user to 
null in api.batchUpdate(). More will be needed
 2014-10-02 16:38:01 -06:00
Negue bf662ff119 fix rootCtrl.js ; forgot a comma while merging... 2014-10-01 20:53:29 +02:00
Negue b1a34a25a8 - add popoverHtml to enable Markdown in Popovers 
- add markdown filter to get Task Notes as Markdown
 2014-10-01 20:30:13 +02:00
negue a595880568 Merge pull request #4044 from negue/apiUrlService 
Use ApiUrlService in all services
 2014-10-01 19:58:26 +02:00
Tyler Renelle ab3c238d11 fix(avatar): put missing ng-click=buy-set back in 2014-09-30 22:06:05 -06:00
Tyler Renelle 5c56b0b7c9 bailey(halloween): 2014-09-30 21:53:34 -06:00
Tyler Renelle e21230f8c2 Revert "small fix" 
This reverts commit f3401e72c2.
 2014-09-30 21:42:48 -06:00
Tyler Renelle 0fa7277cf0 Revert "fix(tasks): tmp fix for #4066, minimize:false on tasks so they have" 
This reverts commit a6631f5d36.
 2014-09-30 21:28:47 -06:00
Tyler Renelle 3605b51748 feat(halloween): refactoring skin & hair to use the same mixins, add new 
halloween seasonal set
 2014-09-30 21:25:06 -06:00
Alice Harris ee325ce27f Merge pull request #4093 from deilann/release_pets 
feat(pets): release pets
 2014-10-01 06:35:36 +10:00
deilann 8427c53d90 release pets feature 2014-09-29 13:35:38 -07:00
Tyler Renelle a6631f5d36 fix(tasks): tmp fix for #4066, minimize:false on tasks so they have 
tags:{} default empty object
 2014-09-27 15:53:42 -06:00
Tyler Renelle efd17fe86b GA demographics 2014-09-26 13:45:01 -06:00
Tyler Renelle f3401e72c2 small fix 2014-09-26 11:24:29 -06:00
Tyler Renelle efbf151c11 Revert "perf(challenges): WIP" (see #4085) 
This reverts commit 632726fe02.

Conflicts:
	src/controllers/challenges.js
 2014-09-25 20:47:44 -06:00
Tyler Renelle 351e220b83 feat(mystery): 201409 2014-09-24 23:15:46 -06:00
Tyler Renelle 632726fe02 perf(challenges): WIP 2014-09-24 21:50:14 -06:00
Tyler Renelle 3f7b9b98cb chore(modules): upgrade mongoose, attempt to mitigate these server 
meltdowns. Also upgrade newrelic
 2014-09-24 13:08:48 -06:00
Tyler Renelle 562f593c8f fix(spells): temp fix to #4067, for some reason _v is undefined after 
casting spells?
 2014-09-24 13:07:40 -06:00
Matteo Pagliazzi 577cfb8d31 Merge pull request #4061 from Alys/trackFix2 
remove "track by" to fix https://github.com/HabitRPG/habitrpg/issues/4060
 2014-09-22 12:36:53 +02:00
Alice Harris 73f7f6605e remove track by to fix https://github.com/HabitRPG/habitrpg/issues/4060 2014-09-22 20:23:37 +10:00
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
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
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
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