sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 11:38:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4956 commits 3 branches 0 tags 1.6 GiB
Commit graph

4956 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06:00
Tyler Renelle
831f971193 fix(backers): give missing backer mount to $70+, sorry everyone :( :( 
fixes #3544
 2014-06-10 15:25:59 -06:00
deilann
b00bb26b03 Merge pull request #3584 from Gaelan/patch-1 
Well, this was embarrassing.
 2014-06-09 23:15:36 -07:00
Gaelan
8bd9f3d348 Fix stats.jade. 
I broke it in a previous PR.
 2014-06-09 22:51:28 -07:00
Sabe Jones
7bd421f10c Merge pull request #3582 from Gaelan/just_call_it_perception 
Stop using abbreviated names of attributes in UI.
 2014-06-09 22:09:58 -05:00
Bob Example
33a3958a2c Stop using abbreviated names of attributes in UI. 2014-06-09 17:29:51 -07:00
Tyler Renelle
f85d6b2978 feat(quests): add octopus quest 2014-06-09 14:33:08 -06:00
Tyler Renelle
b7cf71773a fix(quests): refunding scrolls. add .exec() to User.update() without callback 2014-06-08 18:28:04 -06:00
Tyler Renelle
efc9a6e715 fix(pets): if !Content.hatchingPotions[x], use string passed for 
displayname. Fixes #3575
 2014-06-08 11:11:34 -06:00
Tyler Renelle
ce2f0b1ba7 Merge pull request #3577 from vIiRuS/patch-1 
Only refund quest scroll to leader if quest was active
 2014-06-08 10:42:20 -06:00
Phillip Thelen
3aa8c885cf remove callback from user update 
This way it continues to evaluate and also execute the group update.
 2014-06-08 18:37:43 +02:00
Tyler Renelle
f46749824f Merge pull request #3524 from OverloadUT/ui-fix-disable-submit-during-edit 
Hide task control buttons during editing
 2014-06-08 10:13:42 -06:00
Tyler Renelle
34e0859d8b Merge pull request #3560 from denis-sokolov/cleanup-jsonjs 
chore(migrations): cleanup unused json library, added in 999669a2, not removed in cbe23f638a
 2014-06-08 10:07:20 -06:00
Phillip Thelen
e01ff99610 Only refund quest scroll to leader if quest was active 
otherwise quest leader gets more quest scrolls than they had to begin with.
 2014-06-08 16:08:14 +02:00
Matteo Pagliazzi
74d206ab74 fix(i18n): use strings 2014-06-07 14:26:58 +02:00
Tyler Renelle
38a2c8d0f4 Merge pull request #3535 from OverloadUT/fix-spells-mana-check 
API rejects spell cast if not enough mana
 2014-06-06 15:56:34 -06:00
Tyler Renelle
09392aca24 fix(IE): Remove comment triggering quirks mode in IE, fixes #3550 2014-06-06 14:00:47 -06:00
Tyler Renelle
a5d3fb1907 Merge pull request #3563 from bountysource-support/patch-1 
Add Bountysource badge to README
 2014-06-06 08:48:35 -06:00
Tyler Renelle
4aa938dfd9 chore(bailey): june mystery item, earthquake thingy 2014-06-05 22:59:06 -06:00
benmanley
9cd42524ec refactor(filters.styl): minor layout changes 2014-06-05 16:19:22 +01:00
benmanley
5b689b38df refactor(avatar.styl): add text shadow to lvl label 2014-06-05 16:19:22 +01:00
benmanley
57eb80f9db refactor(.hero-stats): restyle status meters 
Add text to icons to clarify purpose of each bar
Tidy up tooltip behaviour
Aesthetic changes
 2014-06-05 16:19:22 +01:00
bountysource-support
03fafce007 Add Bountysource badge to README 
Because you have some open bounties, we thought you might want to display this badge in your README!
 2014-06-04 16:26:08 -07:00
Tyler Renelle
5a73923d0a Merge pull request #3540 from vIiRuS/patch-1 
Update API Parameter documentation for Equip call
 2014-06-04 14:56:28 -04:00
Tyler Renelle
f4022f692a Merge pull request #3190 from denis-sokolov/jshintrc 
feat(jshint): add initial config
 2014-06-04 14:44:38 -04:00
deilann
f290840995 Merge pull request #3554 from Gaelan/dry_routes 
DRY up src/routes/pages.js.
 2014-06-03 23:29:03 -07:00
Denis Sokolov
c26d51ed5e chore(migrations): cleanup unused json library, added in 999669a2, not removed in cbe23f638a 2014-06-04 15:26:28 +09:00
Bob Example
1b3521e3b3 DRY up src/routes/pages.js. 2014-06-01 23:03:33 -07:00
Matteo Pagliazzi
f10b9cbfc6 feat(i18n): support british english 2014-05-29 18:20:40 +02:00
Matteo Pagliazzi
df8eb107cd fix(i18n): use strings 2014-05-28 18:07:25 +02:00
Phillip Thelen
d86f3caeaa Update API Parameter documentation for Equip call 
the function that is called actually expects different values than specified in the documentation.

This is related to #3525.
The API itself works, it just does no validation of the input and the documentation is wrong, which is why I used it wrong.

Having some kind of validation would probably still a good idea.
 2014-05-27 23:54:58 +02:00
Greg Laabs
1bcc31683b Update spell cast test to ensure user has mana 2014-05-26 13:15:55 -07:00
Greg Laabs
6b7925b227 API rejects spell cast if not enough mana 
Fix #3493 “API does not validate if user has enough mana”
 2014-05-26 09:28:23 -07:00
Matteo Pagliazzi
b2ef756443 Merge pull request #3527 from OverloadUT/locale.ignore.system.files 
Translation loader now ignores non-directories
 2014-05-26 17:27:48 +02:00
Greg Laabs
11595caeb5 Only load .json files from locale directories 
This opens up the possibility of putting READMEs or what have you
inside locale directories, and will avoid problems if system files or
folders end up in the locales.
 2014-05-26 08:18:48 -07:00
Greg Laabs
84e1223809 Locale loader now ignores non-directories 
Locales must be stored in directories and the code previously crashed
if there were any unexpected files in the locale folder. Now the code
simply ignores all non-directories.
 2014-05-25 09:13:23 -07:00
Greg Laabs
49772bb571 Translation loader now ignores system files 
I was having an issue with habitrpg failing to load when OSX created a
.DS_Store file in the locales directory. This code fixes that by
ignoring all hidden files (files that start with “.”)
 2014-05-24 18:04:32 -07:00
Greg Laabs
04034dbdf1 Hide task control buttons during editing 2014-05-23 19:54:32 -07:00
Tyler Renelle
29be5d6e3e feat(mystery): may 2014 mystery item 2014-05-23 00:34:32 +02:00
Tyler Renelle
c72cbb014e Merge pull request #3467 from dmonllao/ignore-vim-tmp 
chore(nodemon): ignore Vim temp files
 2014-05-22 15:59:03 -06:00
Tyler Renelle
4c6fea4fd5 Merge pull request #3511 from thepeopleseason/vagrant_update_140520 
fix(vagrant): explicitly call bower install
 2014-05-22 15:55:04 -06:00
Tyler Renelle
c441ae418b fix(accessories): add body accessory to user model, fixes #3346 2014-05-22 23:23:26 +02:00
James Hsiao
bbd14bd47c fix(vagrant): explicitly call bower install 2014-05-21 23:11:19 -04:00
deilann
c879f46c07 Merge pull request #3507 from yafinee/no_bubble_if_mount 
#3054 - When feeding/saddling, ineligible pets should not get the green ...
 2014-05-21 13:40:10 -07:00
Yafinee
ff612555ea #3054 - When feeding/saddling, ineligible pets should not get the green bubble 2014-05-21 19:54:20 +00:00
deilann
020f278577 fix(footer): update github link 
Link updated to https://github.com/HabitRPG/habitrpg/issues/2760
 2014-05-18 04:25:15 -07:00
Tyler Renelle
ef166a9a10 feat(hall): click hero name for modal. fixes #3478 2014-05-16 20:15:59 -06:00
Tyler Renelle
e77f667a98 Revert "feat(todo_archive)" (see http://goo.gl/mCygbz) 2014-05-15 23:47:38 -06:00
Matteo Pagliazzi
01c9307cd1 fix(i18n): fix /content api call 2014-05-15 23:15:57 +02:00
benmanley
eedb1d147c fix(filters.jade): prevent duplication of new tags 
Remove ng-submit='createTag(_newTag)' as it duplicates the action of
ng-click='createTag(_newTag)’ resulting in two new tags being created.
 2014-05-15 12:10:38 +01:00