Nick Winter
50ec896fd8
Added a requiresSubscription property to the levels.
2014-12-03 11:46:03 -08:00
George Saines
371127a368
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-03 11:19:52 -08:00
George Saines
bcaad51b24
more level rearranging
2014-12-03 11:19:48 -08:00
Nick Winter
0ac9b3758b
Fixed bug with subscriptions not working. Added subscription status text to the world map.
2014-12-03 11:19:10 -08:00
Erlend Birkenes
861cb64fec
More norwegian translations
2014-12-03 20:01:00 +01:00
Matt Lott
898b22723e
Update subscribe copy
2014-12-03 11:00:45 -08:00
George Saines
103d1035a2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-03 10:53:52 -08:00
George Saines
5dafe4b541
changing the placement of the level dots
2014-12-03 10:53:45 -08:00
Nick Winter
73b5f130b5
Repositioned ranger weapons.
2014-12-03 10:39:16 -08:00
Nick Winter
f82ccfc4cb
The sky darkened.
2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7
SubscribeModal is in.
2014-12-03 09:14:14 -08:00
Erlend Birkenes
5d4d631ae6
More norwegian translations.
...
Conflicts:
app/locale/nb.coffee
2014-12-03 16:36:04 +01:00
Matt Lott
201547e388
Revert autocomplete to support Enter too
2014-12-02 22:14:01 -08:00
Nick Winter
32d3745b77
A tiny bit more progress on the SubscribeModal.
2014-12-02 21:27:12 -08:00
Scott Erickson
aea1e39b58
Tweaked the subscription handler to act more like the payment handler when a card charge fails. It returns 402.
2014-12-02 20:40:33 -08:00
Scott Erickson
cd3bb690f4
Created stripe subscription logic.
2014-12-02 20:02:35 -08:00
Nick Winter
15d7ac876a
Starting SubscribeModal.
2014-12-02 20:01:53 -08:00
Nick Winter
bf4c030d33
Updated data from playtime breakdown script.
2014-12-02 18:13:37 -08:00
Nick Winter
a7b617eab3
Slight update to playtime breakdown script to run faster.
2014-12-02 16:56:42 -08:00
Matt Lott
806644ca58
Add Matt's avatar
2014-12-02 13:35:02 -08:00
Matt Lott
774260769d
Update pageview tracking
...
Based on more feedback from segment.io support.
Still trying to get Google Analytics virtual pageviews to work
correctly.
2014-12-02 13:25:18 -08:00
Scott Erickson
3675c79b26
Hotfix for #1828 . Still doesn't figure out why user preferredLanguage properties are being set to null.
2014-12-02 13:19:05 -08:00
Rubiconline
e1326f1698
Update fr.coffee
2014-12-02 21:25:58 +01:00
Scott Erickson
5dcdabfd62
Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.
2014-12-02 11:47:15 -08:00
Nick Winter
6cfb45e7a6
Pausing branchingGroup temporarily for school testing.
2014-12-02 09:18:39 -08:00
Matt Lott
1773744bcd
Turn off a/b test hide locked levels
...
Minor increase in level completion for hiding locked levels was not
statistically significant. We can run this test again after level
banners and world map paths have been ironed out.
2014-12-02 09:13:42 -08:00
Johan
06dcb8c48b
Update sv.coffee
2014-12-02 17:03:33 +01:00
Nick Winter
967e8ac7a4
Use Aether 0.3 on the server, too.
2014-12-01 21:08:15 -08:00
Nick Winter
19dde10a54
Fixed jade comment syntax error.
2014-12-01 18:33:37 -08:00
Nick Winter
8c7e62b9bd
Added back doll image buckets.
2014-12-01 18:19:20 -08:00
Scott Erickson
7f97a3b91e
The PlayItemsModal now dynamically loads portrait images as they scroll into view.
2014-12-01 17:33:45 -08:00
Nick Winter
4f9dc39567
Fixed item details view shadow.
2014-12-01 17:17:27 -08:00
Matt Lott
5965d319d6
Fix Firefox world map level hover flicker
2014-12-01 17:12:02 -08:00
Nick Winter
4b75516a88
Fixed Amara's positioning.
2014-12-01 17:08:48 -08:00
Scott Erickson
cd5b57a658
Set up our resource retrying mechanism to stop after 20 tries.
2014-12-01 16:09:59 -08:00
Nick Winter
8ce192bf7c
Got modularized Aether imports working for PlayLevelView and its workers.
2014-12-01 15:43:22 -08:00
Scott Erickson
7f3f1a6038
Set up aether module loading, but it's not working, so creating a branch until it works.
2014-12-01 15:43:22 -08:00
Scott Erickson
a48fa41edd
CocoViews and CocoModels now notify users of connection errors and automatically retry when getting and putting data goes wrong.
2014-12-01 15:29:19 -08:00
Matt Lott
b2b25f354c
Narrow pageview tracking to only Google Analytics
2014-12-01 14:53:11 -08:00
Matt Lott
35adea61e0
Update trackPageView integrations call
...
Based on feedback from segment.io support. Was unclear from
documentation how to provide only name and options object.
2014-12-01 13:58:21 -08:00
Nick Winter
ffcfec0a6a
Trying to shut the server up about some anonymous user who is simulating.
2014-12-01 13:53:17 -08:00
Nick Winter
ca6c95b0f7
Migrated getting nextLevelURL to the new campaign organization.
2014-12-01 13:46:55 -08:00
Nick Winter
74e97ecb7b
Merge pull request #1827 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-01 13:41:37 -08:00
Imperadeiro98
6036d2bd74
Update pt-PT.coffee
2014-12-01 20:45:29 +00:00
Imperadeiro98
1e4d6b3bd5
Update pt-PT.coffee
2014-12-01 20:27:52 +00:00
Scott Erickson
1b12eee3ac
Fixed signup in victory modals and ContributeClassView.
2014-12-01 10:49:38 -08:00
Scott Erickson
57b154810b
Added a placeholder me for iPad which inspects the object once the page loads.
2014-12-01 10:45:19 -08:00
Scott Erickson
43ac0e8572
Proxied 'lib/auth' to 'core/auth' for the iPad which can't be updated so quickly.
2014-12-01 10:35:45 -08:00
Nick Winter
f9b239ded7
Fixed #1820 .
2014-12-01 08:18:38 -08:00
Nick Winter
aeda3bbf08
Merge pull request #1826 from bkimminich/patch-2
...
Update de-DE.coffee
2014-12-01 07:39:24 -08:00