Commit Graph

678 Commits

Author SHA1 Message Date
Cole Gleason 2b17b041ca Merge pull request #2533 from Sinza-/buy-quest
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
Tyler Renelle a582a0546d feat(marketing): some frontpage updates, a screenshot, & "contact us"
button mods
2014-01-28 10:36:05 -08:00
Matteo Pagliazzi 14b01836c5 fix(merge) 2014-01-28 19:10:07 +01:00
Matteo Pagliazzi 6ac7f9e5c7 merge @speg pr 2014-01-28 19:08:35 +01:00
Tyler Renelle 66f95cdd4c feat(premium): updates to group plans info page 2014-01-28 09:22:46 -08:00
Tyler Renelle f7f4a0c166 feat(administrators): start adding features page for admin accounts 2014-01-27 18:24:24 -08:00
Tyler Renelle 0ddaae4d75 feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links 2014-01-27 17:40:43 -08:00
Tyler Renelle 2e18f0eb82 feat(premium): backport client-side premium code to public repo, it's
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
Tyler Renelle 1d8539837c Merge pull request #2576 from Sinza-/mult-sell-buttons
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 17:26:42 -08:00
Tyler Renelle 47bcaf83e7 feat(homepage): use .marketing for centering, add playbutton as static
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28), let's iterate
/ prettify. @deilann
2014-01-26 14:22:01 -08:00
Marcelo Sizer de2c0280b2 Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion 2014-01-26 01:18:54 -02:00
Dušan Juretić 70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Matteo Pagliazzi 13131087ff fix(translations): add env.t to rootScope 2014-01-24 23:19:17 +01:00
Matteo Pagliazzi 5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Matteo Pagliazzi 95f1dc6e60 improve(translation): allow for data interpolation 2014-01-24 18:08:54 +01:00
Marcelo Sizer 17e70e84d6 Remove level lock to purchase 2014-01-23 23:30:11 -02:00
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 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
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 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 9e69d7959f feat(quests): add level requirement for quests 2014-01-21 17:46:17 -08:00
Tyler Renelle ad4ca6655a feat(cheating) prevent +habit spamming with a 10s timer 2014-01-19 19:32:17 -08:00
Tyler Renelle a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Cole Gleason 0579c43248 fix(profile): fix bug where empty profile displayed on username click
Due to #2396, Shared was undefined in one controller. There may be other
cases we should look out for.

Fixes #2465
2014-01-18 01:38:09 -06:00
diablo 7179a30827 Fixed broken test for display name 2014-01-17 19:16:40 -06:00
diablo 16c38634b6 Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert' 2014-01-16 21:42:08 -06:00
diablo dfdccfb458 generifies article for food when feeding to pet 2014-01-16 21:34:10 -06:00
diablo 7e791158d4 Fixes misuse of food.key in modal display and instead uses the text value 2014-01-16 20:42:15 -06:00
Andrew Bloomgarden dc368bb652 Remove references to $rootScope.Shared & .Content in non-view code.
Instead, have them request services that return them so tests don’t need to prepare special state.
2014-01-15 21:33:58 -08:00
Andrew Bloomgarden 77801e458e Change static module name to habitrpgStatic.
The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
2014-01-15 21:33:57 -08:00
Tyler Renelle 86220f3e0e Merge pull request #2319 from HabitRPG/sabe/preferences
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08:00
Tyler Renelle 0ce10ef339 Merge pull request #2352 from colegleason/quest-scroll
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-15 15:39:59 -08:00
Sabe Jones 6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Tyler Renelle 23d4cba3d3 start moving some directives to habitrpg-shared so mobile can use them,
starting with markdown directive
2014-01-13 22:15:32 -07:00
Cole Gleason 58803773d2 Allow users to purchase quest scrolls even if they haven't finished the previous quest 2014-01-10 15:43:44 -06:00
steve hiemstra 99dccc288e manual username & password input
fixes #2295
when using browser/plugin auto-complete from what I understand certain browser events
are not emmited and thus angular never picks up the new values.

This patch adds a fallback using jQuery to set the username & password if the angular
properties are not set.

see: https://github.com/angular/angular.js/issues/1460
2014-01-09 20:18:33 -05:00
Sabe Jones 27e9dfa0d5 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:19:38 -06:00
Brandon McPhail 521653c102 Rounded critical hit percentages in notifications, e.g. 149.999998% becomes 150% 2014-01-08 15:33:36 -08:00
Brandon McPhail 77278bcffc Fixed issue where only the first markdown link in a message would open in a new tab. Now all do. 2014-01-08 15:33:36 -08:00
Cole Gleason cdd80f11e8 Copy leave and clickLeave function for party to fix #2304. TODO: Refactor into one function? 2014-01-08 15:09:08 -06:00
Tyler Renelle f742d3202a Merge pull request #2296 from SyntaxPickax/develop
Fixed UI issues when editing checklists
2014-01-07 20:22:52 -08:00
Tyler Renelle 5501969262 Merge pull request #2255 from colegleason/leave-guild-challenges
When a user leaves a group, remove them from all group challenges
2014-01-07 19:57:39 -08:00
Brandon McPhail cf069cbca2 Fixed case where click on trash icon left Checklist string. Test for task.checklist[0] was unnecessary in saveTask(). 2014-01-07 12:30:47 -08:00
Brandon McPhail 07d4fc1184 Fixed UI issues when editing checklists 2014-01-07 11:55:41 -08:00
Tyler Renelle bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2
Beef up critical hit notification with its own style and icon
2014-01-07 10:34:07 -08:00