106a7fa475
refactor(errors): refactor the way errors, offline, & queued ops are handled
2014-02-06 21:10:13 -07:00
90e9a1aeaa
i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)
2014-02-06 17:17:21 +01:00
386d108c3c
Replace hard-coded strings for window.env.t on js files
2014-02-05 20:43:49 -02:00
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08:00
67ee011aa3
fix(footer): ensure window.env is accessible from static pages, so we
...
can get deferred scripts on frontpage (esp google analytics)
2014-02-03 11:43:03 -07:00
43d05a54a3
refactor(footer): ensure debug buttons only show in development
2014-02-03 11:42:23 -07:00
535fd4fe82
refactor(footer): remove amazon affiliate code
2014-02-03 11:41:47 -07:00
f95dac7d1d
chore(analytics): upgrade GA to universal analytics (cc @deilann)
2014-02-03 11:06:10 -07:00
90ed3eb510
Merge pull request #2703 from deilann/abortquest
...
correcting quest abort message
2014-02-02 15:57:08 -08:00
61a4a90d2c
Merge pull request #2610 from etryn/develop
...
Fixed unnecessary margin on button group buttons
2014-02-01 23:56:43 -08:00
dab9ddbda2
fix(quests): quests with a level cap cannot be bought before that level.
...
Users were buying the vice quest hoping to play it, not realizing it
would drop at that level. Let's restrict buying the quest (at least in
the short term) until you reach that level.
Fixes #2707 .
2014-02-02 01:54:23 -06:00
dc7a6175e3
correcting quest abort message
2014-02-01 19:05:25 -08:00
875698c111
Created new CSS entry for equipment-title and modified inventory.jade accordingly
2014-02-01 12:52:38 -05:00
2d97577708
Textual tweaks for spellcasting
...
Makes the notification for casting a spell on the party consistent with the message generated in party chat.
2014-02-01 07:01:40 -06:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
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
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
14b01836c5
fix(merge)
2014-01-28 19:10:07 +01:00
6ac7f9e5c7
merge @speg pr
2014-01-28 19:08:35 +01:00
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
9fa8646768
Fixed unnecessary margin on button group buttons
...
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
2014-01-28 01:13:24 -08:00
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
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
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
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
de2c0280b2
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 01:18:54 -02:00
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
13131087ff
fix(translations): add env.t to rootScope
2014-01-24 23:19:17 +01:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
95f1dc6e60
improve(translation): allow for data interpolation
2014-01-24 18:08:54 +01:00
17e70e84d6
Remove level lock to purchase
2014-01-23 23:30:11 -02:00
d3d970b87f
Make locked quests purchasable
2014-01-23 23:11:30 -02:00
9e6a9a3d0e
Don't show information if the quest is locked
2014-01-23 18:26:55 -02:00
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
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08: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
9e69d7959f
feat(quests): add level requirement for quests
2014-01-21 17:46:17 -08:00
ad4ca6655a
feat(cheating) prevent +habit spamming with a 10s timer
2014-01-19 19:32:17 -08:00
a1df41ad81
fix(spells): <ESC> to cancel spell-casting
2014-01-18 14:15:45 -07:00
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
7179a30827
Fixed broken test for display name
2014-01-17 19:16:40 -06:00
16c38634b6
Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert'
2014-01-16 21:42:08 -06:00
dfdccfb458
generifies article for food when feeding to pet
2014-01-16 21:34:10 -06:00
7e791158d4
Fixes misuse of food.key in modal display and instead uses the text value
2014-01-16 20:42:15 -06:00
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
Tyler Renelle