Commit Graph

9193 Commits

Author SHA1 Message Date
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
Matteo Pagliazzi 94511f3a1c chore(i18n): update locales 2014-09-27 18:54:59 +02:00
Matteo Pagliazzi b00e9034b6 Merge pull request #320 from hazel-nut/snowflake-wand
correcting snowflake wand text. fixes HabitRPG/habitrpg#3989
2014-09-27 18:36:42 +02: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 ee39286c8d feat(mystery): 201409 2014-09-24 23:21:05 -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
Jess Virdó 64622666a0 correcting snowflake wand text. fixes #3989 2014-09-23 15:37:10 -04: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
Matteo Pagliazzi c453343502 chore(i18n): update locales 2014-09-21 21:48:08 +02: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
Alice Harris d82a8440ec Merge pull request #317 from Alys/mysteryDate-Sep20
add more on-hover text to Mystery Item box to explain when it is released
2014-09-21 08:40:50 +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
Tyler Renelle 731d75a059 Merge branch 'fall-fest' into develop 2014-09-20 14:01:30 -06:00
Brandon Seda 85a4fbfeae Resizes pet-dragon-hydra.png
Also removes commented out reference in backer.css
2014-09-20 09:23:42 -04: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 47e6dda82c add markdown as angular filter 2014-09-20 12:05:26 +02:00
Alice Harris eb51a3f989 add on-hover text to Mystery Item box to explain when it is released because SO MANY QUESTIONS EVERY MONTH 2014-09-20 11:13:18 +10:00
Aneesh Goel d7970d1dd2 add coverage tools to habitrpg-shared 2014-09-19 03:11:13 -07: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
Alice Harris 2f56607114 increase number of gems given to each contrib tier - https://github.com/HabitRPG/habitrpg/issues/3933 2014-09-18 13:34:43 +10:00
Alice Harris 152b68a0a9 remove username from output of script 2014-09-18 11:48:55 +10:00
Alice Harris 1370080217 improve code, remove need for second script 2014-09-18 11:48:55 +10:00
Alice Harris 224fbe2d85 increase number of gems for contributors AND report actions taken and results https://github.com/HabitRPG/habitrpg/issues/3933 2014-09-18 11:48:55 +10:00
Steffen Breiler 9bfd38c5f9 Fix percent function to return minimum zero
The percent function is used for ui-bars. When returning numbers below zero the bar will show up with 100% width, 'cause css don't know negative width.
2014-09-18 01:26:52 +02: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 30be8749c4 Merge pull request #313 from Alys/develop1
allows stats to change for users who used rebirth
2014-09-16 20:55:19 -06:00
Tyler Renelle bf7f65e8c8 feat(fall): npc-swap 2014-09-16 17:43:46 -06:00
Tyler Renelle 133634c247 feat(fall): special fall gear 2014-09-16 17:30:22 -06:00
Tyler Renelle 2790ee1bab feat(fall): Add candy drops. Add canDrop & canBuy to food, handled separately for this
event and future events
2014-09-16 17:25:58 -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
Tyler Renelle fc73c0841f feat(quests): add rooster rampage quest 2014-09-16 16:08:21 -06:00
Alice Harris b93445ed93 allows stats to change for users who used rebirth 2014-09-17 06:24:39 +10:00
Negue 8f468c27ff use ApiUrlService instead of API_URL; fixed spacing in groupsCtrl.js 2014-09-16 20:52:32 +02:00
Negue 4516a6544c change ApiUrlService.getApiUrl to ApiUrlService.get 2014-09-16 19:33:16 +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