Nick Winter
fbd0585379
Merge pull request #1861 from Imperadeiro98/master
...
Removed more wizard i18n stuff
2014-12-06 18:10:15 -08:00
Nick Winter
d53d1d5ace
Merginated.
2014-12-06 17:28:11 -08:00
Nick Winter
9bde375dcc
Implemented new AuthModal design (sans green button for signup/login).
2014-12-06 17:27:02 -08:00
Diego Reinoso
01b11027d6
Update es-ES.coffee
2014-12-06 17:49:20 -05:00
Scott Erickson
83e1fe8bfe
InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests.
2014-12-06 14:21:56 -08:00
Scott Erickson
b976a11d65
Removed the module loader modal, replaced with a simple progress bar at the top of the screen.
2014-12-06 13:11:47 -08:00
Imperadeiro98
43c0b399ed
Update keyboard_shortcuts.jade
2014-12-06 20:52:30 +00:00
Imperadeiro98
9813e7584f
Removed more wizard i18n stuff
...
I am not sure about line 278.
2014-12-06 20:41:01 +00:00
Scott Erickson
aac1aa379e
Set up stubs for future subscription sales.
2014-12-06 12:38:06 -08:00
Maks Lyashuk
bc4acde60f
Update and fix Ukrainian translation
2014-12-06 22:03:29 +02:00
Nick Winter
491a7ef456
Handling another error noted with Errorception. Updated minimum Firefox version to 25 based on seeing many (possibly non-critical) errors with it.
2014-12-06 12:02:48 -08:00
Nick Winter
708f0e543c
Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes.
2014-12-06 11:33:57 -08:00
Nick Winter
4348450a88
Removed old wizard_settings i18n keys. Propagated i18n.
2014-12-06 11:07:28 -08:00
Nick Winter
477ebb3c48
Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit.
2014-12-06 11:05:52 -08:00
Nick Winter
bba78970ea
Deleted WizardSettingsView.
2014-12-06 10:23:26 -08:00
Scott Erickson
62cab1e76b
Admins can now give users discounts and free accounts from the MainAdminView view.
2014-12-06 10:05:52 -08:00
Nick Winter
f189eafe0c
Activated a few more Czech translations.
2014-12-06 09:51:05 -08:00
Nick Winter
dd0d58dcb5
Merge pull request #1855 from Martin005/patch-1
...
Update cs.coffee
2014-12-06 09:49:53 -08:00
Nick Winter
00e6ce5f45
Couldn't reproduce #1851 , but this should work around the error if it happens again.
2014-12-06 09:46:37 -08:00
Nick Winter
175cdb5151
Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing.
2014-12-06 09:35:13 -08:00
Nick Winter
e9ab0c1f4d
Merge pull request #1859 from dmreinoso/patch-1
...
Update es-ES.coffee
2014-12-06 09:09:24 -08:00
Nick Winter
7d2d2776c8
Restricted crude-glasses in more later levels so it'd be less likely to get them equipped after the wooden ones should be on your face.
2014-12-06 08:37:13 -08:00
dmreinoso
30d6db8ca4
Update es-ES.coffee
2014-12-06 10:31:00 -05:00
Nick Winter
061e52e181
Merge pull request #1858 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-06 07:21:08 -08:00
Nick Winter
560a8c7b72
Merge pull request #1856 from Lirai/patch-3
...
Update de-DE.coffee
2014-12-06 07:20:21 -08:00
Imperadeiro98
1a8bf81258
Update pt-PT.coffee
2014-12-06 12:55:07 +00:00
Anders Bernard
ac9d173201
Update de-DE.coffee
2014-12-06 12:35:44 +01:00
Anders Bernard
dbaffde2a0
Update de-DE.coffee
2014-12-06 12:16:10 +01:00
Martin005
56e243a656
Update cs.coffee
2014-12-06 12:07:23 +01:00
nixel2007
8619f43801
Update ru.
...
Sync lines to en.coffee a bit
2014-12-06 13:16:58 +03:00
nixel2007
2e6ada0935
Update ru.
...
Today subscription update and small fixes.
2014-12-06 13:07:25 +03:00
Nick Winter
6a26681fec
Minor level progression tweak.
2014-12-05 18:30:31 -08:00
Nick Winter
bbc25a0877
Updated next level links.
2014-12-05 18:29:15 -08:00
Nick Winter
c7e2398f7c
Fixed some bugs with hero doll placement and dungeon unlocks.
2014-12-05 18:16:58 -08:00
Nick Winter
07f7e7473d
Merged.
2014-12-05 17:27:33 -08:00
Nick Winter
6596bde758
Right, don't need that in there.
2014-12-05 17:25:20 -08:00
Scott Erickson
836d2905b9
Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties.
2014-12-05 17:19:52 -08:00
George Saines
640b841306
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-12-05 16:57:44 -08:00
George Saines
04a6ab3734
resizing large img files, adding buttons for victory modal
2014-12-05 16:57:39 -08:00
Nick Winter
6344b0c1a3
Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only.
2014-12-05 15:46:15 -08:00
Nick Winter
8932cef46d
Merge pull request #1850 from Lirai/patch-1
...
Update de-DE.coffee
2014-12-05 15:46:09 -08:00
Matt Lott
d6265a4065
Fix default locked code css
...
Couldn’t get multiple ranges to highlight ranges correctly, so leaving
it on for python and coffeescript only.
2014-12-05 14:15:43 -08:00
Scott Erickson
209836c172
Fixed user patching to not also unsubscribe subscribers.
2014-12-05 14:11:38 -08:00
Anders Bernard
3304fedb16
Update de-DE.coffee
2014-12-05 22:16:48 +01:00
Nick Winter
fd88056123
Merge pull request #1849 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-12-05 12:54:38 -08:00
Imperadeiro98
074c16733b
Update pt-PT.coffee
2014-12-05 20:23:06 +00:00
Imperadeiro98
7a89d30bb6
Update pt-PT.coffee
2014-12-05 20:21:13 +00:00
nixel2007
9a2bc14bad
merge remote
2014-12-05 20:15:59 +03:00
nixel2007
793fbfcd18
Merge remote-tracking branch 'upstream/master'
2014-12-05 20:08:29 +03:00
Nick Winter
fb4646b1dd
Propagated i18n.
2014-12-05 09:08:26 -08:00
nixel2007
171d862fcf
ru
...
community block, skill_docs done, small fixes
2014-12-05 20:07:50 +03:00
Nick Winter
723209642c
Merge pull request #1845 from Imperadeiro98/patch-1
...
Fixed some i18n
2014-12-05 08:56:11 -08:00
Nick Winter
b01b74cdc8
Merge pull request #1843 from Lirai/patch-2
...
Update de-DE.coffee
2014-12-05 08:54:57 -08:00
Nick Winter
8b62b6ec44
Temporary workaround for #1842 .
2014-12-05 07:55:17 -08:00
Imperadeiro98
bf7872b059
Update legal.jade
2014-12-05 15:54:35 +00:00
Imperadeiro98
f089531aac
Update en.coffee
2014-12-05 15:43:54 +00:00
Imperadeiro98
e4be319875
Update legal.jade
2014-12-05 15:43:37 +00:00
Imperadeiro98
afbc669742
Update en.coffee
2014-12-05 15:41:31 +00:00
Imperadeiro98
7cd8a57d1e
Update legal.jade
2014-12-05 15:38:42 +00:00
Imperadeiro98
203b407b4b
Update en.coffee
2014-12-05 15:38:41 +00:00
Imperadeiro98
ecc94b411c
Update en.coffee
2014-12-05 15:29:18 +00:00
nixel2007
ef20e26484
ru
...
subscribe block and strings above.
2014-12-05 18:00:14 +03:00
nixel2007
5703e3eb94
ru
...
Play block
2014-12-05 17:42:19 +03:00
Lirai
e4120ceadf
Update de-DE.coffee
...
some translations
2014-12-05 10:43:41 +01:00
Matt Lott
4616df6c23
Add virtual page views for subscribe paths
2014-12-04 21:14:22 -08:00
Scott Erickson
d0ee8cb7c7
Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.
2014-12-04 17:41:27 -08:00
Matt Lott
bd797e8cfd
Highlight locked default code
2014-12-04 16:33:59 -08:00
Matt Lott
222e532006
Make default code locking contiguous
...
Lock ‘del’ command too.
2014-12-04 16:04:44 -08:00
Nick Winter
b5b38d042a
Added i18n for extrapolation tip.
2014-12-04 15:35:31 -08:00
Nick Winter
3c3d98b0ec
Merge pull request #1841 from Zacharias030/master
...
Added another tip to be displayed during loading
2014-12-04 15:34:16 -08:00
Zacharias Fisches
55f85e3682
Added another tip to be displayed during loading
...
There are only two kinds of people: those that can extrapolate from
incomplete data...
2014-12-05 00:21:36 +01:00
Nick Winter
0306d0ee31
Fixed bug with heroes not rendering in the hero picker.
2014-12-04 15:04:34 -08:00
Nick Winter
8318606457
Added a slot for the wizard hand hero doll images.
2014-12-04 14:35:25 -08:00
Nick Winter
b253eb9be8
Merged something.
2014-12-04 14:34:35 -08:00
Matt Lott
4ff6e95f62
Add show subscribe modal events
2014-12-04 14:23:47 -08:00
Nick Winter
bae90024b5
Merge pull request #1840 from nixel2007/master
...
Update ru.coffee
2014-12-04 14:20:14 -08:00
Nick Winter
24c3f6aa3a
Merge pull request #1829 from jkohlin/patch-1
...
Update sv.coffee
2014-12-04 14:09:53 -08:00
Nick Winter
b895db3da2
Merge pull request #1831 from Rubiconline/patch-1
...
Update fr.coffee
2014-12-04 14:09:28 -08:00
Nick Winter
49dd6704c3
Merge pull request #1839 from Imperadeiro98/patch-1
...
Fixed translation, I think
2014-12-04 14:08:29 -08:00
nixel2007
7179236caa
Update ru.coffee
...
G+ commands, skill_docs, about - team blocks, thangs and small fixes.
2014-12-05 01:00:50 +03:00
Nick Winter
dffc14f995
Put in a fallback in case somehow the gems weren't loaded for the PlayHeroesView locked hero gem costs.
2014-12-04 13:57:21 -08:00
Imperadeiro98
1c136b0657
Fixed translation, I think
2014-12-04 21:44:27 +00:00
Nick Winter
a25d306be7
Added restricted hero button where the choose hero would normally go, for heroes unavailable to a particular level.
2014-12-04 13:43:19 -08:00
Nick Winter
fa4f479107
Restricted Arcane Ally and Munchkin Harvest to warriors, since otherwise players will tend to suicidally pick their under-armored new ranger or wizard.
2014-12-04 13:37:17 -08:00
Nick Winter
a7eaac773d
Fixed some ranger paper doll stylings and a typo in the femaleRangeThumbr item doll image schema.
2014-12-04 13:30:20 -08:00
Nick Winter
c0842959e8
Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded.
2014-12-04 13:18:06 -08:00
Scott Erickson
0edf4e0ca1
Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users.
2014-12-04 13:07:07 -08:00
Matt Lott
e3abb9ceb3
Capture active user metrics
...
Watching for these events:
Level completed
User registered
Playtime of 30s in a level
Purchase
Payment
Subscribe
Earned an achievement
2014-12-04 12:57:57 -08:00
Scott Erickson
7025f0a488
Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up.
2014-12-04 11:56:14 -08:00
Nick Winter
86be36621d
Sped up real-time playback on some more non-randomized levels.
2014-12-04 11:31:22 -08:00
Nick Winter
7bfe0e5c9e
Updated Programmaticon II requirements. Adjust editor height after reloading code.
2014-12-04 11:31:22 -08:00
Lirai
324a749149
Update de-DE.coffee
...
uncommented...
2014-12-04 20:28:56 +01:00
Lirai
bde08dd24b
Update de-DE.coffee
...
Checked for errors and better translations.
2014-12-04 19:34:28 +01:00
Matt Lott
7537817081
Update subscribe parent copy
2014-12-04 09:57:01 -08:00
Nick Winter
a1d8b02ca6
Moved simulation Aether requires to be more specific and not loaded all the time on normal play pages.
2014-12-04 08:33:26 -08:00
Nick Winter
3573a929e3
Added requires for other languages in Simulator.coffee so simulation can work.
2014-12-04 08:21:36 -08:00
Nick Winter
f48468c474
Merge pull request #1834 from ebirkenes/translation
...
Bunch of norwegian translations
2014-12-04 07:40:10 -08:00
Maks Lyashuk
22fe41fd70
Fix another indent
2014-12-04 14:19:37 +02:00
Maks Lyashuk
8479f94ecb
Fix indent
2014-12-04 14:13:46 +02:00
Maks Lyashuk
f12d9b5598
New translation in uk.coffee
2014-12-04 13:14:19 +02:00
Nick Winter
69623edefb
WorldMapView no longer restricting access to adventurer and started levels.
2014-12-03 20:46:57 -08:00
Scott Erickson
41d78fd4c5
Payments view now sorts payments by date.
2014-12-03 19:44:04 -08:00
Nick Winter
4d72c1c84b
Show an AuthModal instead of a SubscribeModal to anonymous players.
2014-12-03 19:34:00 -08:00
Scott Erickson
0f706bfdf6
Fixed GPlus login.
2014-12-03 16:40:28 -08:00
Nick Winter
8cff42a843
Show SubscribeModal for non-admins, too.
2014-12-03 16:28:56 -08:00
Nick Winter
a8ce1bbfb2
Added unsubscribe button and subscription status on payments screen.
2014-12-03 16:11:46 -08:00
Nick Winter
1f2408a99f
Can actually edit requiresSubscription on levels.
2014-12-03 15:50:34 -08:00
Erlend Birkenes
4c4c263bb8
Fixed indentation error
2014-12-03 22:43:45 +01:00
Scott Erickson
eb98cf4952
Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one.
2014-12-03 13:32:28 -08:00
Nick Winter
4701ba22af
Got rid of a bit of skipping, enabled some other arenas for testing.
2014-12-03 13:17:57 -08:00
Nick Winter
6e57cbfb66
LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it).
2014-12-03 12:04:12 -08:00
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
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
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
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
ca6c95b0f7
Migrated getting nextLevelURL to the new campaign organization.
2014-12-01 13:46:55 -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
