krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,396 Commits 64 Branches 1,225 Tags
18a3024aeadc5dec47fad2c87c868b64d796064c
Commit Graph

12396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer
2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00
Blade Barringer
c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Blade Barringer
f33469609c Adjust sprite task to not include wheelchair images in the customize-option handling 2016-03-24 07:57:50 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Blade Barringer
01a7132b0b refactor: Extract play reward sound logic into function 2016-03-23 17:55:44 -05:00
Kenny Carlsen
7b708f51ba Proposed bug fix, issue #6668 - erroneous reward purchase sound 2016-03-23 17:55:41 -05:00
Sabe Jones
17b02f2867 fix(news): missing promo 2016-03-23 15:47:22 -04:00
Sabe Jones
ba1cc67654 chore(news): fill out remaining Bailey 2016-03-23 15:36:24 -04:00
Sabe Jones
be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer
2a4a8466ca Merge pull request #6948 from MathWhiz/patch-1 
Fix ISSUE_TEMPLATE.md
 2016-03-23 11:48:13 -05:00
MathWhiz
802b8bed0a Fix ISSUE_TEMPLATE.md 
Added parentheses around two of the comments to hide them.
 2016-03-23 09:11:08 -05:00
Blade Barringer
a958fefa6b Merge pull request #6946 from HabitRPG/update_pageres 
Update pageres
 2016-03-23 08:36:52 -05:00
Blade Barringer
ef2a1f5929 chore: Update pageres 
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
 2016-03-23 08:16:39 -05:00
Blade Barringer
fd10422e0c tests: Add preliminary tests around send message and send gift 2016-03-22 21:49:27 -05:00
Blade Barringer
f5d4eba292 fix: Default message to '' when not passed in sendGift route 2016-03-22 21:49:27 -05:00
Brian Murray
eaea55687b Make change regarding pluralization of gem gift message easier to read and not one long line 2016-03-22 21:49:27 -05:00
Brian Murray
369386e370 Only add an 's' to months of subscription or gems given if they are not 1. 2016-03-22 21:49:22 -05:00
Blade Barringer
9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu
521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
MathWhiz
86516b5e20 Update presskit 2016-03-22 08:41:02 -05:00
Blade Barringer
92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Blade Barringer
3add287a85 Merge branch 'khipkin-fix_class_change_gear_modal' into develop 2016-03-22 08:10:55 -05:00
MathWhiz
c70b40e0a3 Add pull request instructions to CONTRIBUTING.MD 2016-03-22 07:59:13 -05:00
Blade Barringer
bbcef441bf Adjust template instructions 2016-03-22 07:59:13 -05:00
mathwhiz
a5b7066358 Add templates for issues and pull requests 2016-03-22 07:59:06 -05:00
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106 Merge pull request #6900 from doyler/develop 
Note about weekly progress update (fixes #6884)
 2016-03-18 07:37:32 -05:00
Blade Barringer
4cb652dca4 Merge pull request #6889 from crookedneighbor/add_debug_scripts 
feat: Add debug scripts to easilly get all pets/mounts/gear
 2016-03-18 07:36:27 -05:00
Blade Barringer
22c83c92c2 Merge pull request #6904 from HabitRPG/inventory_sorting_debug 
Inventory sorting debug
 2016-03-18 07:33:45 -05:00
Alys
fb338a00cb prevent quests being started in guilds 2016-03-18 08:38:32 +10:00
Blade Barringer
de2f9eb28b Update tests to us set by default 2016-03-17 17:28:46 -05:00
Sabe Jones
ccdbdb2969 fix(seasonal-shop): choose quest more precisely 2016-03-17 13:13:21 -04:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Sabe Jones
816ef00378 Merge pull request #6890 from khipkin/new_party_badges 
add tests for awarding party {up,on} achievs
 2016-03-17 11:05:20 -05:00
Blade Barringer
ced0b44b2f fix: Remove name from sortable inventory 2016-03-17 08:47:56 -05:00
Blade Barringer
d4d668a7aa fix: Correct typo in equipment click 2016-03-17 08:09:37 -05:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Christopher Giroir
cfae524579 Updating button text to GET instead of VIEW 2016-03-16 23:23:36 -07:00
Sabe Jones
b4b0d7e89c chore(news): mobile updates Bailey 2016-03-17 00:09:42 -04:00
Kaitlin Hipkin
0ca949b1bb pull initialization of controller into helper method and stub state 2016-03-16 23:50:16 -04:00
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland
a639038a41 Move stat allocation to a mixin to avoid code duplication 2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929 Quick allocation of attribute points from level-up modal 
Resolves #6720.
 2016-03-16 22:06:54 -05:00
Kaitlin Hipkin
469ece70c3 clean up party {up,on} tests, add calls to $controller after setup 2016-03-16 22:32:24 -04:00