Commit Graph

4263 Commits

Author SHA1 Message Date
Marcelo Sizer d3d970b87f Make locked quests purchasable 2014-01-23 23:11:30 -02:00
Marcelo Sizer 9e6a9a3d0e Don't show information if the quest is locked 2014-01-23 18:26:55 -02:00
Marcelo Sizer 6c68c51ab5 Fix version conflict 2014-01-23 17:26:37 -02:00
Marcelo Sizer 635451dc8c Close quest modal after quest purchase 2014-01-23 16:11:40 -02:00
Marcelo Sizer b2d5e2a090 Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest 2014-01-23 15:53:42 -02:00
Matteo Pagliazzi 13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Matteo Pagliazzi 50953ddf81 Merge pull request #2525 from Sinza-/develop
Replace a line for env.t
2014-01-23 06:01:06 -08:00
Luveluen 6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen 669789df67 Update index.jade 2014-01-23 09:45:34 +01:00
Luveluen 50f992b63c Update hall.jade 2014-01-23 09:43:17 +01:00
Luveluen ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen ed180692e3 Update create-group.jade 2014-01-23 09:36:32 +01:00
Luveluen 6fb88ee1b5 Update chat-message.jade 2014-01-23 09:35:18 +01:00
Luveluen 34fe364fea Update chat-box.jade 2014-01-23 09:33:41 +01:00
Luveluen 2282e36bac Update challenges.jade 2014-01-23 09:31:33 +01:00
Tyler Renelle 9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select
challenge winner.
2014-01-22 23:22:21 -08:00
Tyler Renelle ae0d758d8f feat(challenges): add button for csv export 2014-01-22 23:22:21 -08:00
Tyler Renelle 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
Tyler Renelle 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
Sabe Jones d3f4a561fd docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
Requires commit 667a426 on habitrpg-shared. Adds a line to the Rebirth modal informing users that limited edition gear can be repurchased after Rebirth. Removed a line from the top of the modal to make room, preventing scrolling at ordinary resolutions--I'm open to suggestions if we think that line is crucial.
2014-01-22 20:45:04 -06:00
Sabe Jones d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Marcelo Sizer 4d834c5c2b Replace a line for env.t 2014-01-22 22:37:09 -02:00
Luveluen 077e23519c Update avatar.jade 2014-01-23 00:24:15 +01:00
Luveluen c4a230d73c Update avatar.jade 2014-01-23 00:19:42 +01:00
Luveluen 0fb8ec9a8b Update tavern.jade
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
Luveluen 13503986fb Update index.jade
line 39
2014-01-22 23:43:58 +01:00
Luveluen 9f56426472 Update hall.jade
line 47!
2014-01-22 23:34:06 +01:00
Luveluen 098247233f Update group.jade
line 133 problem
2014-01-22 23:21:19 +01:00
Luveluen 39eb590299 Update create-group.jade 2014-01-22 22:51:57 +01:00
Luveluen 7540f6acc9 Update challenges.jade 2014-01-22 22:16:54 +01:00
Luveluen 11a558cd20 Update challenge-box.jade 2014-01-22 21:42:48 +01:00
Matteo Pagliazzi c51c9ad03b improve(translation): merge @Sinza- pr 2014-01-22 19:51:30 +01:00
Marcelo Sizer ef97abf1bf Fix diverging older version 2014-01-22 16:16:19 -02:00
Marcelo Sizer bb13f37525 Fix identation 2014-01-22 16:07:04 -02:00
Marcelo Sizer 6ada7f300f Replace hard-coded strings for env.t on views/shared/modals folder 2014-01-22 16:04:28 -02:00
Matteo Pagliazzi 5a03409e33 Revert "improve(translations): translated shared/modals/achievements"
This reverts commit 090c28a35b.
2014-01-22 17:38:19 +01:00
Matteo Pagliazzi eec6ead971 Revert "improve(translations): translate death modal"
This reverts commit 50333026b6.
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi 50333026b6 improve(translations): translate death modal 2014-01-22 17:18:35 +01:00
Matteo Pagliazzi 090c28a35b improve(translations): translated shared/modals/achievements 2014-01-22 17:08:12 +01:00
Matteo Pagliazzi a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Luveluen 4f07ab39b0 Update inventory.jade 2014-01-22 12:10:51 +01:00
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