50953ddf81
Merge pull request #2525 from Sinza-/develop
...
Replace a line for env.t
2014-01-23 06:01:06 -08:00
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
ae0d758d8f
feat(challenges): add button for csv export
2014-01-22 23:22:21 -08:00
5201343867
Merge pull request #2528 from HabitRPG/sabe/tweak
...
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
2014-01-22 22:49:39 -08:00
16a602f94c
feat(challenges): add csv export for challenge progress. WIP, will refine this over time - but we need it something like this for the STWC come 1/31.
2014-01-22 22:47:41 -08:00
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
d782fc6b6a
fix(stats): Better layout for attribute point allocation
2014-01-22 20:34:03 -06:00
4d834c5c2b
Replace a line for env.t
2014-01-22 22:37:09 -02:00
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
eec6ead971
Revert "improve(translations): translate death modal"
...
This reverts commit 50333026b6
2014-01-22 17:34:54 +01:00
50333026b6
improve(translations): translate death modal
2014-01-22 17:18:35 +01:00
090c28a35b
improve(translations): translated shared/modals/achievements
2014-01-22 17:08:12 +01:00
a6c67f1781
fix(translations): merge @luveluen pull request, fix some syntax
2014-01-22 16:09:32 +01:00
4f07ab39b0
Update inventory.jade
2014-01-22 12:10:51 +01:00
6878596cb4
Merge branch 'lefnire/spells' into develop
2014-01-22 00:32:29 -08:00
32dc651bfb
Revert "feat(cheating) prevent +habit spamming with a 10s timer"
...
This reverts commit ad4ca6655a
2014-01-22 00:29:55 -08:00
47bd6dcb79
fix(spells): more $rootScope spell-casting bug fixes
2014-01-22 00:27:55 -08:00
e0646bb98d
fix(spells): add some spells tests, don't send up body to spell paths
2014-01-22 00:16:52 -08:00
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
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
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
5ddf09fe13
fix(settings): reintroduce space between captions and help bubbles stripped during localization
2014-01-21 19:52:04 -06:00
9e69d7959f
feat(quests): add level requirement for quests
2014-01-21 17:46:17 -08:00
990c3aa762
test(quests): make sure other members get drop
2014-01-21 15:59:53 -08:00
f478d10c20
fix(quests): bug fix to multi-drop
2014-01-21 15:08:11 -08:00
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
e48c7277f8
fix(quests): list multiple rewards in dialog
2014-01-21 14:12:09 -08:00
d9e5725ee1
feat(quests): allow quests to drop multiple items
2014-01-21 13:13:15 -08:00
f71d6957e8
test(quests): test quest drops
2014-01-21 13:07:33 -08:00
18e98abfa1
test(quests): ensure non-questers don't get hurty by boss on cron #2249
2014-01-21 12:45:18 -08:00
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
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
19dba81603
Merge pull request #2476 from djuretic/travis_status
...
Add Travis build status to readme
2014-01-20 15:28:12 -08:00
1cd5e994cc
Merge pull request #2491 from HabitRPG/sabe/tweak
...
fix(nodemon): ignore CHANGELOG.md on watch
2014-01-20 15:27:28 -08:00
8b97438607
Update stable.jade
2014-01-20 19:44:33 +01:00
e47afa8965
Update stable.jade
2014-01-20 19:41:17 +01:00
c85e3a2107
Update inventory.jade
2014-01-20 19:23:49 +01:00
18eeafafc8
Update inventory.jade
2014-01-20 19:07:50 +01:00
06132f8a48
Update inventory.jade
2014-01-20 18:55:29 +01:00
6d0168364c
Revert "chore(errors): send req.body before JSON.parsing @colegleason"
...
This reverts commit 39f0961b75
2014-01-20 11:44:10 -06:00
52decb7ede
fix(translations): @lefnire now everything is ok
2014-01-20 17:51:43 +01:00
fa212b6e93
Update index.jade
2014-01-20 17:50:28 +01:00
fba739535b
fix(translations): correct some variables
2014-01-20 17:25:14 +01:00
d000c70679
fix(translations): revert some views
2014-01-20 17:08:27 +01:00
f85117a422
Merge pull request #2486 from luveluen/develop
...
jade->json
2014-01-20 07:56:54 -08:00
ffff867ba3
Update stable.jade
2014-01-20 16:20:06 +01:00
Matteo Pagliazzi