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
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
Björn Kimminich
4d1130a9c6
Update de-DE.coffee
2014-12-01 14:00:36 +01:00
Matt Lott
23e60116d5
A/B test hiding locked levels in world map
2014-11-30 22:11:39 -08:00
Nick Winter
748fcf2a65
Fixed not showing locked items in inventory modal.
2014-11-30 19:45:40 -08:00
Nick Winter
88849d6dfb
Propagated i18n.
2014-11-30 18:13:30 -08:00
Björn Kimminich
5432be27f5
added some german translations
2014-12-01 03:11:28 +01:00
Nick Winter
35f1ed1e82
Implemented George's new level loading view design.
2014-11-30 18:02:45 -08:00
Nick Winter
d007f5337e
Fixed up inventory slot images for minions and wrists, and added Wizard/Ranger placeholder images.
2014-11-30 16:13:39 -08:00
Matt Lott
153c39b30b
Reverting larger currently-executing-line pointer
...
Not compatible with Firefox, and not clear how to make it work in both
browsers.
2014-11-30 16:03:23 -08:00
Matt Lott
2ecda7dbbf
Fix trackPageView options initialization
2014-11-30 15:28:01 -08:00
Nick Winter
44282cb946
Hooked up new menu music loop.
2014-11-30 14:57:34 -08:00
Matt Lott
070d3ec6c2
Fix Firefox code area border
2014-11-30 14:42:51 -08:00
Nick Winter
cf25b5c6ed
Made sure we can see the whole world map background, even though it looks bad when we stretch it.
2014-11-30 14:35:24 -08:00
Matt Lott
02eb254eba
Add virtual pageviews for level load and complete
2014-11-30 14:14:47 -08:00
Nick Winter
50eed15eed
Can now equip a second ring slot.
2014-11-30 14:12:07 -08:00
Nick Winter
9471beafd9
A few fixes for PlayHeroesModal and InventoryModal.
2014-11-30 14:00:29 -08:00
Nick Winter
68559a3aa5
Re-enabled top hero preloading on WorldMapView, but only when it makes sense.
2014-11-30 13:23:25 -08:00
Michael Schmatz
3cf80c895e
Removed log infos, iPad language selection
2014-11-30 16:19:01 -05:00
Nick Winter
8cb6c09889
Properly show paper doll equipment when inventory modal first loads.
2014-11-30 13:00:45 -08:00
Nick Winter
bd494dd513
Adding in what will eventually be our App Store URL.
2014-11-30 12:44:18 -08:00
Nick Winter
77a4cea387
Improvements for mobile layouts and mobile and iPad browser detection.
2014-11-30 12:27:34 -08:00
Matt Lott
066b1798ab
Make default code read-only
2014-11-30 11:47:54 -08:00
Scott Erickson
85f3972bfc
Fixed #1821
2014-11-30 10:57:17 -08:00
Matt Lott
94ae4bf6aa
Updating analytics integration selection
...
Context property has been renamed from providers to integrations.
https://segment.com/docs/libraries/analytics.js/#selecting-integrations
2014-11-29 22:16:18 -08:00
Scott Erickson
be809337c4
Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it.
2014-11-29 17:51:40 -08:00
Nick Winter
412955c6be
Got rid of some CSS filters that were making the PlayItemsModal take way too much memory.
2014-11-29 17:34:59 -08:00
Nick Winter
af24857255
Do not load silhouetted or hidden items. More importantly, remove the absolute positioning on the .required-level tag inside the item element to save 150MB (!!!) of memory for no discernible reason. (But actualy just remove that whole .required-level tag, because who even needs it.)
2014-11-29 17:06:56 -08:00
Scott Erickson
3a4eaa718f
Did what I needed to do to get d3 to not be loaded during play: refactored the ladder views out of the play wad, and got the Router to handle viewClass being a string rather than a fully loaded module.
2014-11-29 16:46:51 -08:00
Nick Winter
ad913024c0
Merge pull request #1817 from Imperadeiro98/master
...
Update pt-PT.coffee
2014-11-29 15:57:59 -08:00
Scott Erickson
6fccae579a
Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views.
2014-11-29 15:31:56 -08:00
Nick Winter
fe55811075
Fixed a bit of repaining that was going on when it shouldn't.
2014-11-29 15:06:54 -08:00
Nick Winter
c226856204
Fixed typo in previous rewadding.
2014-11-29 14:42:46 -08:00
Nick Winter
65280454bf
Merge pull request #1818 from kerradus/master
...
update RU translation
2014-11-29 14:42:18 -08:00
Dmitry
52311bd256
update RU translation
2014-11-30 01:24:19 +03:00
Scott Erickson
02ddd7f698
Fixed #1816 . Cleaned up logging in config.coffee.
2014-11-29 13:47:04 -08:00
Scott Erickson
129e07e231
Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView.
2014-11-29 13:36:48 -08:00
Imperadeiro98
abf75281ca
Update pt-PT.coffee
2014-11-29 21:25:46 +00:00
Imperadeiro98
8d9c7cf0be
Update pt-PT.coffee
2014-11-29 21:22:06 +00:00
Nick Winter
155ead86cf
Removed unneede catiline lib. Trying speedups for updating HUD property values and Lank Thang inventory.
2014-11-29 13:09:38 -08:00
Scott Erickson
17f2d76512
Undid some apparent changes from the last commit.
2014-11-29 12:53:57 -08:00
Scott Erickson
9b5228afd9
Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match.
2014-11-29 12:46:04 -08:00
Scott Erickson
1c33842125
Refactored core templates into a core folder.
2014-11-29 11:39:37 -08:00
Nick Winter
912df310a2
Disabled GitHub login for now, since it's too buggy and also makes the server mad slow.
2014-11-29 10:52:53 -08:00
Scott Erickson
1bd70591a0
Added new mongodb versions to be allowed.
...
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Nick Winter
b8d4f00cd4
Merge pull request #1813 from ebirkenes/tmp
...
Fix for #1795
2014-11-29 10:40:48 -08:00
Nick Winter
98199ac72e
Propagated i18n.
2014-11-29 10:38:55 -08:00
Nick Winter
891b78eb44
Hiding some ThangTypes from view in level editor.
2014-11-29 10:34:04 -08:00
Nick Winter
306f599673
Merge pull request #1815 from ewertonorg/translate-to-pt-br
...
Update pt-BR.coffee
2014-11-29 10:33:22 -08:00
Scott Erickson
0bbcdd5698
Made all of lib into a wad. Fixed AuthModal.
2014-11-29 08:54:18 -08:00
Nick Winter
d2aabbdacc
A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.
2014-11-29 08:43:40 -08:00
Nick Winter
dbbcfe3789
Fixed a couple requires needed for level editor.
2014-11-29 06:50:50 -08:00
ewertonorg
4b7fc0322c
Update pt-BR.coffee
2014-11-29 11:53:27 -02:00
Scott Erickson
82e2344fa5
Fixed new module loading system when optimized.
2014-11-29 00:34:55 -08:00
Nick Winter
89af30f436
Using home play i18n tag instead of common play tag.
2014-11-28 19:49:13 -08:00
Nick Winter
8400eb6016
Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring.
2014-11-28 19:39:51 -08:00
Scott Erickson
31214e854e
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05
Set up the site to load its logic and templates piecemeal rather than in one giant app.js file.
2014-11-28 16:38:56 -08:00
Scott Erickson
12b3428aee
Got rid of some styling in the achievement edit view that was messing with the new site chrome.
2014-11-28 16:38:56 -08:00
Nick Winter
32a271d17e
Updated to new paper doll positioning.
2014-11-28 14:23:44 -08:00
Nick Winter
4b45385571
Working on paper dolls.
2014-11-28 12:11:59 -08:00
Matt Lott
fc2c68a7af
Update Tracker.trackEvent
...
Mechanics have changed a bit: first param is an action string, second
param has specific properties if Google Analytics.
Updating some of the trackEvent calls to use correct actions and
categories.
2014-11-28 15:06:25 -05:00
Erlend Birkenes
6efb03ec40
Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little.
2014-11-28 19:30:41 +01:00
Erlend Birkenes
744b856092
Fixed padding on language-dropdown
2014-11-28 12:10:57 +01:00
Matt Lott
fead762d04
Stopping tracking analytics for admins
2014-11-27 23:55:28 -05:00
Erlend Birkenes
434b71c887
Added myself as translator on norwegian nb
2014-11-27 20:45:27 +01:00
Erlend Birkenes
5f7f1c2b65
Translated the entire contributing page plus some other stuff to norwegian.
2014-11-27 20:17:33 +01:00
Nick Winter
2d2a9ad681
Updated Hour of Code visitor counting.
2014-11-27 09:44:08 -08:00
Nick Winter
b5c7a4e0f2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-27 07:28:31 -08:00
Erlend Birkenes
37601efa17
More norwegian translations.
...
Conflicts:
app/locale/nb.coffee
2014-11-27 16:11:13 +01:00
Nick Winter
81495fd722
Added suspect code fragment to Known Enemy.
2014-11-26 19:30:23 -08:00
Nick Winter
0499702e10
Translated IFC Videira description to English, and added an image.
2014-11-26 19:22:39 -08:00
Nick Winter
bef466304d
Merge pull request #1805 from leocadiotk/patch-1
...
Update MainPlayView.coffee
2014-11-26 19:20:45 -08:00
Nick Winter
4e51289de8
Merge pull request #1800 from ShadowTrainer/patch-2
...
Update tr.coffee
2014-11-26 19:20:10 -08:00
Nick Winter
12253fc472
Resolved nb.coffee merge conflicts.
2014-11-26 19:19:30 -08:00
Nick Winter
167595789d
Merged tr.coffee.
2014-11-26 19:09:39 -08:00
Nick Winter
4c900b8870
Working on paper doll equipping.
2014-11-26 19:06:57 -08:00
leocadiotk
d2b394aaf2
Update MainPlayView.coffee
2014-11-26 23:16:07 -02:00
Nick Winter
7a7d82e8e4
Merge pull request #1792 from ccdarkness/patch-1
...
Update zh-HANS.coffee
2014-11-26 16:51:07 -08:00
Nick Winter
6e7e11a884
Merge pull request #1791 from nadian/patch-1
...
Update id.coffee
2014-11-26 16:50:50 -08:00
Nick Winter
16e0c2b4fb
Merge pull request #1804 from ebirkenes/translation
...
Lots of translations to norwegian bokmål
2014-11-26 16:49:58 -08:00
Nick Winter
ab1e256b98
Merge pull request #1803 from ebirkenes/master
...
Fixed wrong I18n suffix in Thang Editor section on Community page.
2014-11-26 16:48:31 -08:00
Nick Winter
915a3243f5
Added feature image hair and thumb slots to the ThangType.
2014-11-26 16:29:48 -08:00
Erlend Birkenes
c8a34e78e8
Lots of translations to norwegian bokmål
2014-11-27 01:00:02 +01:00
Erlend Birkenes
83e41bb38e
Fixed wrong I18n suffix in Thang Editor section on Community page.
2014-11-27 00:41:29 +01:00
Nick Winter
53c6da5ef8
Allowing upload of paper doll images for items.
2014-11-26 14:18:17 -08:00
Nick Winter
fc18ed0153
Undisabled the new Adventurer levels we just emailed about.
2014-11-26 12:56:58 -08:00
Matt Lott
cf6450201f
Fix IE9 simulation problems
...
World.deserialize call had mixed up parameters.
flagHistory wasn’t being initialized.
Error logging using unsupported CoffeeScript splats invocation.
2014-11-26 15:40:18 -05:00
Nick Winter
e538808c76
Merge branch 'master' of git://github.com/notno/codecombat into notno-master
2014-11-26 12:34:35 -08:00
Nick Winter
12394b6bba
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-26 12:33:36 -08:00
Nick Winter
9feb4e6add
Using ACE to add syntax highlighting to code documentation.
2014-11-26 12:33:29 -08:00
