sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4216 commits 3 branches 0 tags 1.6 GiB
Commit graph

4216 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
6878596cb4 Merge branch 'lefnire/spells' into develop 2014-01-22 00:32:29 -08:00
Tyler Renelle
32dc651bfb Revert "feat(cheating) prevent +habit spamming with a 10s timer" 
This reverts commit ad4ca6655a.
 2014-01-22 00:29:55 -08:00
Tyler Renelle
47bd6dcb79 fix(spells): more $rootScope spell-casting bug fixes 2014-01-22 00:27:55 -08:00
Tyler Renelle
e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle
c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is 
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
 2014-01-21 23:04:01 -08:00
Tyler Renelle
17d60b45ff Merge pull request #2512 from colegleason/version-error 
chore(VersionError): add debug code to emails showing completed ops
 2014-01-21 22:57:01 -08:00
Cole Gleason
187ea1c739 chore(VersionError): add debug code to emails showing completed ops 
This adds a field to the email if there is an error on batchUpdate. This
field contains all the attempted operations. So the last item in the
list would be the operation that we encountered the error at. @lefnire,
mind taking a look at this and pushing if you feel comfortable with
adding more to the emails?
 2014-01-22 00:50:14 -06:00
Sabe Jones
5ddf09fe13 fix(settings): reintroduce space between captions and help bubbles stripped during localization 2014-01-21 19:52:04 -06:00
Tyler Renelle
9e69d7959f feat(quests): add level requirement for quests 2014-01-21 17:46:17 -08:00
Tyler Renelle
990c3aa762 test(quests): make sure other members get drop 2014-01-21 15:59:53 -08:00
Tyler Renelle
f478d10c20 fix(quests): bug fix to multi-drop 2014-01-21 15:08:11 -08:00
Tyler Renelle
f16654d235 feat(quests): add canBuy so we can exclude certain items from the 
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
 2014-01-21 14:44:53 -08:00
Tyler Renelle
e48c7277f8 fix(quests): list multiple rewards in dialog 2014-01-21 14:12:09 -08:00
Tyler Renelle
d9e5725ee1 feat(quests): allow quests to drop multiple items 2014-01-21 13:13:15 -08:00
Tyler Renelle
f71d6957e8 test(quests): test quest drops 2014-01-21 13:07:33 -08:00
Tyler Renelle
18e98abfa1 test(quests): ensure non-questers don't get hurty by boss on cron #2249 2014-01-21 12:45:18 -08:00
Tyler Renelle
07bca1f265 test(quests): start adding quests/bosses quests. Unfortunately it failes because it() is parallel, but Im trying to have each it() setup for the next. Gotta figure somethign out 2014-01-21 09:51:38 -08:00
Tyler Renelle
4efd0f5ed8 fix(bosses): don't reset progress.up when starting a new quest. We want 
to be able to carry over damage from the same day a boss battle begins,
even if the dailies were completed before battle-start. Fixes #2168
 2014-01-20 16:40:48 -08:00
Tyler Renelle
19dba81603 Merge pull request #2476 from djuretic/travis_status 
Add Travis build status to readme
 2014-01-20 15:28:12 -08:00
Tyler Renelle
1cd5e994cc Merge pull request #2491 from HabitRPG/sabe/tweak 
fix(nodemon): ignore CHANGELOG.md on watch
 2014-01-20 15:27:28 -08:00
Cole Gleason
6d0168364c Revert "chore(errors): send req.body before JSON.parsing @colegleason" 
This reverts commit 39f0961b75. @lefnire,
this was just sending `[object Object]` instead of `{}`. We want the
JSON.strigify, actually.
 2014-01-20 11:44:10 -06:00
Matteo Pagliazzi
52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Matteo Pagliazzi
fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Matteo Pagliazzi
d000c70679 fix(translations): revert some views 2014-01-20 17:08:27 +01:00
Matteo Pagliazzi
f85117a422 Merge pull request #2486 from luveluen/develop 
jade->json
 2014-01-20 07:56:54 -08:00
Luveluen
ffff867ba3 Update stable.jade 2014-01-20 16:20:06 +01:00
Luveluen
462f11e48c Update inventory.jade 2014-01-20 16:08:37 +01:00
Luveluen
c37512baa6 Update index.jade 2014-01-20 14:41:51 +01:00
Sabe Jones
d6c55952da fix(nodemon): ignore CHANGELOG.md on watch 
Because this started annoying the carp out of me once I linked @colegleason's commit-msg hook.
 2014-01-19 21:59:35 -06:00
Tyler Renelle
ad4ca6655a feat(cheating) prevent +habit spamming with a 10s timer 2014-01-19 19:32:17 -08:00
Tyler Renelle
9cdf6b5e34 chore(todos): add tests for 3-day todo archiving #2478 2014-01-19 17:39:50 -08:00
Tyler Renelle
4cc39f16a1 fix(todos): add migration for dateCreated & dateCompleted #2478 2014-01-19 17:16:38 -08:00
Tyler Renelle
b1afc177aa fix(todos): add dateCompleted to todos so they're archived 3 days after 
completion, not 3 days after creation. Fixes #2478
 2014-01-19 17:12:33 -08:00
Tyler Renelle
f4859daef1 Merge pull request #2488 from Rathlan/issue-2472-MakeHelpAvailable 
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
 2014-01-19 15:03:49 -08:00
Tyler Renelle
b0fc17bae5 chore(cluster): @colegleason I'm disabling cluster for now, people are 
reporting more issues on develop (VersioError & 503) than before. Can
revert his commit in the near future, want to investigate a bit though
 2014-01-19 14:52:57 -08:00
Luveluen
68041f206c Update settings.jade 2014-01-19 22:02:55 +01:00
Luveluen
87d528ce50 Update profile.jade 
fullname -> fullName
 2014-01-19 21:46:57 +01:00
Luveluen
bfebb61520 Update profile.jade 2014-01-19 21:40:41 +01:00
Paul Sainsbury
66582b2d05 Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ 2014-01-19 22:24:54 +02:00
Luveluen
46e29e8999 Update settings.jade 2014-01-19 21:16:52 +01:00
Luveluen
4e5323ea2f Update settings.jade 2014-01-19 21:10:18 +01:00
Luveluen
b48c584f43 Update settings.jade 2014-01-19 21:05:41 +01:00
Luveluen
1f0d91e9c6 Update profile.jade 2014-01-19 21:04:03 +01:00
Luveluen
b9bafc304e Update settings.jade 2014-01-19 21:03:01 +01:00
Luveluen
00cb57deb6 Update settings.jade 2014-01-19 21:00:11 +01:00
Luveluen
d87a3caae7 Update profile.jade 2014-01-19 20:50:31 +01:00
Luveluen
f748d89fdc Update profile.jade 2014-01-19 20:11:03 +01:00
Luveluen
e8647c7cbc Update profile.jade 2014-01-19 20:05:48 +01:00
Luveluen
745fdeb34f Update profile.jade 2014-01-19 19:59:35 +01:00
Luveluen
21de0b7e74 Update settings.jade 2014-01-19 19:58:04 +01:00