codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-11 00:02:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
10758 commits 27 branches 0 tags 134 MiB
Commit graph

7860 commits

Author SHA1 Message Date
Raphaelwuhao
104ca4f2cd Update zh-HANS.coffee 2015-11-14 20:57:30 -08:00
Nick Winter
5d9d5c0ae6 Remove ProblemAlertView help button 2015-11-14 17:33:05 -08:00
Nick Winter
aee2f7c219 Add loading indicators, hide UI pre-load for /play 2015-11-14 17:30:37 -08:00
Nick Winter
b31e5fc93a Fix user.code.problem routes to use . instead of _ 2015-11-14 16:32:21 -08:00
Nick Winter
401d383ff4 Change gutter X to exclamation mark 2015-11-14 16:31:05 -08:00
Rob
c0d9c231bc Normalize some URLs that used both .s and _s to use only .s 2015-11-13 15:16:03 -05:00
Matt Lott
b3362c8d0d Add courses to top menu 
Bumping about to bottom menu, removing clans.
 2015-11-13 11:33:03 -08:00
Matt Lott
c7a7a9d3ac Redirect /teachers to /courses/teachers?hoc=true 
Will update /teachers soon with relevant information, but at the moment
it is too outdated.
 2015-11-13 10:30:37 -08:00
Matt Lott
c7118d69e5 Redirect 2014 HoC link to 2015 HoC link 
https://app.asana.com/0/54276215890539/65805646890763
 2015-11-13 10:17:05 -08:00
Imperadeiro98
12523dd247 Update pt-PT.coffee 2015-11-13 13:21:08 +00:00
Imperadeiro98
d555b04ca4 Merge pull request #3173 from Ikuyadeu/patch-1 
Update ja.coffee
 2015-11-13 13:00:36 +00:00
Imperadeiro98
fc4008567c Fix build 2015-11-13 12:59:34 +00:00
Yuki Ueda
e6d769bab0 Update ja.coffee 2015-11-13 15:59:19 +09:00
Nick Winter
d744d2db2b Propagate i18n 2015-11-12 16:42:37 -08:00
Matt Lott
840970c267 🐛Fix greek translation file indentation 2015-11-12 16:39:44 -08:00
Nick Winter
3c62b5b39e Merge pull request #3172 from zsdregas/master 
Greek Translation
 2015-11-12 16:36:15 -08:00
Nick Winter
356f65561c Add ladder banner images to ladder home 2015-11-12 16:30:56 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Zacharias Sdregas
fdeb86e353 Greek Translation 121115 2015-11-12 23:09:22 +02:00
Zacharias Sdregas
b9d2b7b07b Almost Done 2015-11-12 23:07:38 +02:00
Matt Lott
e6e0617945 Tracking property for admin added course headcount 2015-11-12 12:16:40 -08:00
Nick Winter
910dd8e6b6 Use course access control for shared course hero levels 2015-11-12 11:00:54 -08:00
Nick Winter
cb101c7905 Replace simple loops while while True in course level sample code 2015-11-12 11:00:51 -08:00
Nick Winter
fe05e66458 Give Campaigns types so that course campaigns can share hero levels 2015-11-12 10:25:25 -08:00
Nick Winter
f7f7cd683e Allow using hero levels as course levels. Refactor current course tracking to use GET parameters. 2015-11-12 10:25:25 -08:00
Scott Erickson
8b00c38350 Merge pull request #3168 from Imperadeiro98/use-view 
Refactor to use view in template for issue #3138
 2015-11-12 09:58:49 -08:00
Matt Lott
df57e99957 Don't block videos in guide for course levels 
https://app.asana.com/0/54269205393657/61779149610165
 2015-11-12 06:05:21 -08:00
Zacharias Sdregas
ca0e5af481 Some more translated 2015-11-12 15:03:07 +02:00
Matt Lott
5ca68ff682 🐛Fix analytics dashboard date oboe 2015-11-11 20:21:35 -08:00
Nick Winter
29892a9619 Add user country to contact messages 
https://app.asana.com/0/54275583589675/64698696631078/f
 2015-11-11 15:43:25 -08:00
Nick Winter
b9deb363d2 Add Brazil office address 2015-11-11 10:33:21 -08:00
Nick Winter
fae1411e3a Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes 2015-11-11 09:07:16 -08:00
Zacharias Sdregas
88eeb2b3b7 some 250 more strings translated 2015-11-11 18:16:41 +02:00
Nick Winter
f6307ac04e Made while True snippets work in course levels 2015-11-11 07:41:52 -08:00
Nick Winter
42b53dff20 Fix camera and spectate bugs with new loading intro behavior 2015-11-11 06:42:12 -08:00
Imperadeiro98
18eef3b0ec Merge pull request #3171 from probil/patch-4 
Update ukrainian l18n
 2015-11-11 14:25:34 +00:00
Imperadeiro98
a36220694a Indentation fix 2015-11-11 14:25:17 +00:00
Imperadeiro98
871738ecdb Merge pull request #3134 from janjoos/patch-2 
Smart update
 2015-11-11 14:24:41 +00:00
Nick Winter
0dc0b51556 Hid loading intro scroll for now, bad scroll bars. 2015-11-11 05:53:01 -08:00
Matt Lott
1c0550ff9f 🐛Fix admin analytics date bugs 2015-11-10 17:26:15 -08:00
Scott Erickson
d9d5dce2e0 Merge branch 'master' into course-correction 2015-11-10 16:34:33 -08:00
Nick Winter
7e433b9e12 Use ?intro=true to show intro screen even after level completion 2015-11-10 16:09:21 -08:00
Nick Winter
2259076800 LoadingScreen -> level intro behavior 2015-11-10 15:22:09 -08:00
Nick Winter
4497334e6d Update a couple team avatar and descriptions 2015-11-10 15:21:34 -08:00
Matt Lott
e33323e7eb Add line charts to admin analytics dashboard 
https://app.asana.com/0/54276215890539/64369256136957
 2015-11-10 14:55:48 -08:00
Max Lyashuk
f69d28b8cb Update ukrainian l18n 
Translated more lines, fix wrong translations, fix language specific things
 2015-11-11 00:41:07 +02:00
Scott Erickson
cddf000276 Add way for admins to grant users course prepaids 2015-11-10 14:33:27 -08:00
Josh Callebaut
c4779468bd Adds Josh C's image and updates the about page. 2015-11-10 13:46:48 -08:00
Scott Erickson
a0212da789 Improve StudentCoursesView 
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
 2015-11-10 12:08:44 -08:00
Zacharias Sdregas
5491bf4860 318 more strings translated 2015-11-10 17:42:55 +02:00
Zacharias Sdregas
0c8f8e3d78 Greek Translation - A few more string translated 2015-11-10 07:23:04 +02:00
Scott Erickson
0c5b39e029 Merge branch 'master' into course-correction 
Some package scripts got in the way of each other
 2015-11-09 18:18:02 -08:00
Scott Erickson
12b3947448 Tweak wording on TeacherCoursesView 2015-11-09 18:14:42 -08:00
Scott Erickson
c8fc893ef1 Adjust CourseDetailsView for classrooms 
* Disable settings modal
 * Show classroom name instead of course instance name if available
 2015-11-09 18:08:39 -08:00
Scott Erickson
628ed9a990 Remove add students tab from CourseDetailsView 2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3 Fixes for courses, hoc 
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
 2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2 Initial setup of the hoc page 2015-11-09 16:45:12 -08:00
Scott Erickson
39a60f1cb7 Disabling required fields to make it easier to migrate 2015-11-09 16:07:27 -08:00
Imperadeiro98
28363f780a Small tweaks 2015-11-09 21:35:33 +00:00
Scott Erickson
f7a41dc91a When a student joins a classroom, they also join all course instances for that classroom which are free to join 2015-11-09 13:29:49 -08:00
Imperadeiro98
8e8a3103d5 Refactor to use view in template for issue #3138 
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
 2015-11-09 21:29:27 +00:00
Scott Erickson
91b8f9bb40 Switch back active tab, was switched for testing 2015-11-09 12:41:55 -08:00
Scott Erickson
1f37f12cc5 Fix auto course-instance creation 
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
 2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c Add courses tab to teacher courses page 2015-11-09 11:48:40 -08:00
Max Lyashuk
596bae17d6 Update ukrainian l18n, fix bugs 2015-11-09 21:16:01 +02:00
Zacharias Sdregas
9aa66db52d More strings translated 2015-11-09 16:03:51 +02:00
Matt Lott
95b61c2f83 Add recurring revenue to admin analytics page 
https://app.asana.com/0/54276215890539/59638739614287
 2015-11-08 17:00:24 -08:00
Matt Lott
7861faaf93 Add active classes to admin analytics page 
https://app.asana.com/0/54276215890539/59638739614287
 2015-11-06 14:11:39 -08:00
Nick Winter
ad240152c6 Fix #3159 2015-11-06 13:00:23 -08:00
zacharias
6fc2e339de more strings translated 2015-11-06 13:37:39 +02:00
Scott Erickson
7daff0861f Add functionality to StudentCoursesView 2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925 Add functionality to TeacherCoursesView 2015-11-05 17:26:31 -08:00
Scott Erickson
7d686c5194 Add Backbone events to stripe handler 2015-11-05 15:31:25 -08:00
Scott Erickson
b36bf7b171 Add PurchaseCoursesView 2015-11-05 15:30:57 -08:00
Scott Erickson
4b71447877 Have POST /db/prepaid/:id/redeemers set user.coursePrepaidID property 2015-11-05 12:53:25 -08:00
Rob
39a97135de Explicitly check for selection when overriding return. 2015-11-05 10:14:53 -08:00
RUSLAN LÓPEZ CARRO
2de074821c Update es-419.coffee 2015-11-05 11:24:13 -06:00
Nick Winter
995459e1d5 Merge pull request #3156 from Imperadeiro98/some-updates 
Remove a lot of unused strings
 2015-11-05 08:25:32 -08:00
Rob
cde3b252da Don't load user sessions on non premium dashboards. 2015-11-04 16:57:48 -08:00
Scott Erickson
00ce821939 Add InviteToClassroomModal, begin join class in StudentCoursesView 2015-11-04 16:54:13 -08:00
Rob
75532e3a79 Use generated member count instead of pulling a list of all members from mongo when we get the public clans list. 2015-11-04 16:00:54 -08:00
Imperadeiro98
424bea90b6 Reverted resources strings removal 2015-11-04 22:44:46 +00:00
Imperadeiro98
89521e2dbe Remove a lot of unused strings 2015-11-04 21:45:15 +00:00
Nick Winter
34715befcc Increment user's concept stats on level completion 2015-11-04 13:42:09 -08:00
Matt Lott
722540f3be Remove old user analytics page 2015-11-04 10:59:10 -08:00
Matt Lott
d445024cb6 Add admin analytics page with MAUs 
Includes updating analytics insert script used to inject aggregated
data into production database.
 2015-11-04 10:59:10 -08:00
Scott Erickson
d987b644a9 Merge remote-tracking branch 'origin/master' 2015-11-04 10:54:59 -08:00
Scott Erickson
669ab416e5 Fix SubscriptionView to keep emails when emails are erroneous 2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation 
# Conflicts:
#	app/views/account/SubscriptionView.coffee
 2015-11-04 10:47:39 -08:00
Nick Winter
1b4f6262cb Exclude non-selected code language documentation blocks from level guides 2015-11-04 10:46:16 -08:00
Nick Winter
0caf9c3547 Fix avatars not showing up in HUD. 
Asana 54271591170319
 2015-11-04 10:26:54 -08:00
Imperadeiro98
dbd9e325d4 Merge pull request #3155 from mads232/patch-2 
Update da.coffee
 2015-11-04 18:04:24 +00:00
Imperadeiro98
b0908524c4 Merge pull request #3153 from snarkota/patch-4 
Update lt.coffee
 2015-11-04 17:52:58 +00:00
Imperadeiro98
81e68ca795 Merge pull request #3152 from abdalim/msmy-home 
Add Bahasa Melayu translations for Home
 2015-11-04 17:50:45 +00:00
Imperadeiro98
7dacacf232 Merge pull request #3151 from poshus1984/patch-1 
Update lt.coffee
 2015-11-04 17:50:11 +00:00
Rob
361b5229e6 Use an newer, official build of ace instead of just copying the files into our source tree. 2015-11-03 17:33:35 -08:00
Scott Erickson
66432990f4 Add framework for new courses pages 2015-11-03 16:41:06 -08:00
Nick Winter
964b3f534c Remove Bloc offer 2015-11-03 15:45:05 -08:00
Scott Erickson
0e2305bc3d Add POST /db/course_instance/:id/members 2015-11-03 14:00:51 -08:00
Scott Erickson
429f50e1c6 Untie CourseInstance creation from prepaids, tie them to classrooms instead 2015-11-03 11:18:44 -08:00
mads232
841412a87d Update da.coffee 2015-11-03 18:43:55 +01:00
Scott Erickson
27d423a410 Add Classroom server model and endpoints 2015-11-02 17:07:23 -08:00
Nick Winter
05e95923c2 Add Carlos to /about 2015-11-02 16:15:43 -08:00
Josh Callebaut
f885a0e45d This updates the en.coffee file to account for josh_c's blurb and title. 2015-11-02 16:08:03 -08:00
Josh Callebaut
8b26c8a8b5 Merge remote-tracking branch 'upstream/master' 2015-11-02 16:03:32 -08:00
Josh Callebaut
c0ddbd2df1 Uniquifies the i18n tag for Josh C 2015-11-02 15:26:03 -08:00
Josh Callebaut
05f74a2fcd Adds Josh Callebaut to the about.jade file. 2015-11-02 15:21:05 -08:00
Nick Winter
b1ae9075ff Updated README to include a few new avatars. 2015-11-02 15:19:54 -08:00
Scott Erickson
c3735ba0eb Add exhausted property to prepaid model 
It is true when redeemers.length >= maxRedeemers
 2015-11-02 13:06:58 -08:00
Nick Winter
5106bd5390 Fix sortThangComponents corner case in course levels with Plans attaching twice 
Fixes https://app.asana.com/0/54276215890539/62515742172177/f
 2015-11-02 12:35:28 -08:00
Nick Winter
caab006c5e Merge pull request #3149 from dillonforrest/master 
Change visible references of 'HipChat' to 'Slack'.
 2015-11-02 10:32:48 -08:00
snarkota
ce376564a9 Update lt.coffee 2015-11-02 16:55:14 +02:00
Alim
0b156242d9 Add Bahasa Melayu translations for Home 2015-11-01 13:57:19 +08:00
Sigitas Mockus
20017691d3 Update lt.coffee 2015-10-31 19:10:43 +02:00
Imperadeiro98
1cdb598350 Fixes to last merge 2015-10-31 14:06:13 +00:00
albenarammou
94cb1075e8 Update bg.coffee 2015-10-31 09:24:05 +02:00
Scott Erickson
fa4355f946 Add programming language to options in course instances 2015-10-30 15:56:43 -07:00
Scott Erickson
0da66bd468 Refactor CourseEnrollView to use view in template 2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4 Make redeem coupon network errors on /courses happen within modal 2015-10-30 11:05:24 -07:00
Scott Erickson
429f2c2839 Fix renderSelectors to handle selectors with multiple targets 2015-10-30 11:05:24 -07:00
Nick Winter
504e65ec27 Commit client-side code for acdfe7c 2015-10-30 09:43:05 -07:00
Rob
cea412c0a9 Fix indentation. 2015-10-30 11:16:48 -04:00
Imperadeiro98
6e01f367d9 Fixes to last merge 2015-10-30 14:37:05 +00:00
Imperadeiro98
08e9d682d0 Merge pull request #3143 from RobertLukowski/patch-3 
Update de-DE.coffee
 2015-10-30 14:35:05 +00:00
dillon
493d302a0d Change visible references of 'HipChat' to 'Slack'. 2015-10-30 00:07:58 -07:00
Nick Winter
f100d6dba6 Merge pull request #3118 from codecombat/soffes/ipad 
[WIP] Changes for iPad app
 2015-10-29 16:24:39 -07:00
Rob
e048848d6b Add 50% more room for fingers in the autocomplete box. 2015-10-29 18:16:58 -04:00
Rob
75c63a0ace When pressing enter with an active selection, just make a new line under it. 2015-10-29 18:16:23 -04:00
Imperadeiro98
bf1ef72a15 Merge pull request #3148 from javatlacati/patch-1 
Update es-419.coffee
 2015-10-29 21:42:05 +00:00
Matt Lott
8b254164c9 Free course enrollment for admins 2015-10-29 14:09:19 -07:00
RUSLAN LÓPEZ CARRO
9283492cb8 Update es-419.coffee 
Some already translated strings appear as untranslated :S
 2015-10-29 14:32:15 -06:00
Rob
f0e1fc1f77 Let API properties declare their return values should be captured. 
Auto complete will know when to add a variable asingment.
 2015-10-29 15:07:19 -04:00
Imperadeiro98
f2ca1dbd63 Updates to i18n 2015-10-29 15:57:22 +00:00
Nick Winter
3352042af5 Uncomment nl-BE section header 2015-10-29 07:40:30 -07:00
Nick Winter
46c8b4f81d Merge nl-BE.coffee 2015-10-29 07:37:06 -07:00
RobertLukowski
0d2f747a6e Update de-DE.coffee 
I hope the de-Translation is better
 2015-10-29 15:19:40 +01:00
WardLanssens
8acaa80397 Update nl-BE.coffee 2015-10-29 15:18:50 +01:00
Scott Erickson
7b54a04d33 Fix reload code button in play view on IE9 2015-10-28 15:45:34 -07:00
Scott Erickson
f95426dbd9 Fix done button in LevelPlayView in IE9 
It had no background.
 2015-10-28 15:24:08 -07:00
Scott Erickson
a21d85c4ed Remove some vestigial commented out styling for AuthModal buttons 2015-10-28 14:40:07 -07:00
Scott Erickson
fb51d40cb4 Switch AuthModal buttons to use btn-illustrated classes, for browser compatibility 
They were white boxes in IE9 with their custom setup.
 2015-10-28 14:37:59 -07:00
Scott Erickson
48c10d214d Make highlight pointer disappear immediately and move off screen when hidden 
It causes problems in IE10 and lower, because the css property pointer-events
does not work in those browsers. So fixed that by moving the arrow out of the way.
 2015-10-28 14:01:37 -07:00
Scott Erickson
52395661f7 Fix SubscribeModal buttons on IE10 2015-10-28 11:48:15 -07:00
Scott Erickson
0228614ef6 Fix login icon placement on IE10 2015-10-28 11:34:00 -07:00
Scott Erickson
31367f39c1 Add class "ie10" to body when using IE10 2015-10-28 11:33:36 -07:00
Imperadeiro98
16e30f5b9a Update pt-PT.coffee 2015-10-28 17:37:59 +00:00
Nick Winter
448e1c3d9f Propagated i18n 2015-10-28 09:08:05 -07:00
Imperadeiro98
d2c6540c2d Merge pull request #3137 from evvanderplas/patch-1 
Update nl-NL.coffee: typos, grammar
 2015-10-28 14:33:09 +00:00
Nick Winter
a970f322f9 Merge pull request #3132 from Imperadeiro98/i18n-updates 
Updated i18n across some files
 2015-10-28 06:41:35 -07:00
Nick Winter
cfd6862222 Merge pull request #3129 from Driphter/master 
Added non-mutating methods for Vectors in player code
 2015-10-28 06:38:07 -07:00
Nick Winter
20f2abfb37 Propagate i18n 2015-10-28 06:26:01 -07:00
Nick Winter
ead9cf11df Add Estonian locale stub 2015-10-28 06:25:42 -07:00
Rob
da92e15bfb Give some API properties priority in autocomplete. 2015-10-27 23:23:43 -04:00
Scott Erickson
6e1cb8a1d1 Add owner name to course details page 2015-10-27 17:47:48 -07:00
Scott Erickson
9e04d425cc Levels link in ControlBarView goes to last visited course instance page for course levels 2015-10-27 17:04:07 -07:00
Imperadeiro98
e1b10183eb Some cleanups to subscription-view.jade 2015-10-27 21:57:49 +00:00
Scott Erickson
af7bb08dc3 List courses you are in at the top of /courses 2015-10-27 13:58:45 -07:00
Scott Erickson
a5793630c2 Stop showing ChooseHero tab in GameMenu for course and course-ladder levels 2015-10-27 13:21:39 -07:00
Scott Erickson
7641216fd0 Make not supported mobile message on /courses landing page 2015-10-27 12:43:54 -07:00
Scott Erickson
66afb10f91 Fix a useful trailing whitespace that was removed 
My work machine editor's settings were changed, but not my home editor.
Both have now been fixed. I reviewed the template and this was the only significant
whitespace that was removed, I believe.
 2015-10-27 12:29:32 -07:00
Scott Erickson
b736feb017 Refactor ArticleEditView to use view in template 2015-10-27 12:09:36 -07:00
Scott Erickson
2e666073f1 Refactor SubscriptionView to use view in template 2015-10-27 12:07:16 -07:00
evvanderplas
2af15f7667 Update nl-NL.coffee: typos, grammar 
First obvious typos fixed
 2015-10-27 19:12:46 +01:00
Imperadeiro98
a7b35305de Fixed .spr in cla.jade 2015-10-27 15:07:39 +00:00
Matt Lott
38242eb55e Add /Careers routing entry 2015-10-26 20:39:40 -07:00
Scott Erickson
0869b11f53 Refactor DeltaView to use view in template 2015-10-26 17:00:52 -07:00
Scott Erickson
c10d11f61b Refactor DiplomatView to use view in template 2015-10-26 14:46:35 -07:00
Scott Erickson
45044d06a4 Refactor CLAsView to use view in template 2015-10-26 14:35:42 -07:00
Scott Erickson
58eaec8e6b Refactor MainLadderView to use view in template 2015-10-26 14:23:06 -07:00
Matt Lott
48786372d8 🐛Prevent parallel managed sub unsubscribes 
Our unsubscribe API does not support this.  Removing option from
subscription UI.

Fixes #2976
 2015-10-26 13:45:38 -07:00
Nick Winter
afa410a370 Added Ace of Coders tournament rankings. 2015-10-26 13:30:49 -07:00
Rob Blanckaert
d26daf1dc0 Only show "press enter" for the selected line in autocomplete. 2015-10-26 15:39:22 -04:00
Imperadeiro98
6ee44bd6cc Fixed i18n in infinite_loop.jade 2015-10-26 12:46:06 +00:00
janjoos
db7add6bc5 Smart update 
2 codes
 2015-10-26 11:54:40 +01:00
Imperadeiro98
169627af82 Added a missing spr in CLA.jade 2015-10-23 20:49:15 +01:00
Scott Erickson
3df4f26293 Remove a test wrench thrown into CommunityView 2015-10-23 10:50:21 -07:00
Scott Erickson
fad9d0a757 Remove auto-reload delay, see if we can do without it now 
According to a comment now deleted, we had auto reload delay 300ms for race
conditions, mainly onCompile tweaking source map file sourceMappingURL values.
That only happens in production now, though, so let's try removing it for development.

Original comment added: 5104f0a1e7
Michael deleted it :( 6d7864c415
 2015-10-23 10:47:01 -07:00
Scott Erickson
921054d53f Improve brunch re-compile speed by updating bunch libraries 
Also fixed a couple templates newer brunch complained about.
 2015-10-23 10:09:34 -07:00
Imperadeiro98
8a8d8c9d23 Fixed use of i18n in popover 2015-10-23 16:54:42 +01:00
Imperadeiro98
09422910f7 Updated i18n 2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41 Refactor InvoicesView to use view in template 2015-10-22 15:26:52 -07:00
Scott Erickson
cd065f3ba6 Refactor TeachersFreeTrialView to use view in template 2015-10-22 15:23:04 -07:00
Scott Erickson
9de50ac181 Refactor CLAView to use view in template 2015-10-22 15:16:32 -07:00
Nick Winter
4af6162c5c Replace simple loop docs with while-true docs in course levels 2015-10-22 10:29:10 -07:00
Scott Erickson
ddf351aac7 Refactor PaymentsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285 Refactor AccountSettingsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
9a29c26cc8 Refactor HomeView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
94d29d2e8a Move trailing slash removal to client Router, make client route "/play/" work for facebook 2015-10-21 16:55:48 -07:00
Scott Erickson
57c5384ec1 Refactor editor:save-new-version from a mediator event to a normal Backbone event 
Part of a push to move away from global subscriptions when 'local' ones will do.
 2015-10-21 15:34:07 -07:00
Driphter
73e3afa5f8 Added non-mutating methods for player code 2015-10-21 18:30:10 -04:00
Scott Erickson
6636051765 Refactor HomeView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:18:13 -07:00
Scott Erickson
452e6467b4 Refactor PrepaidView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794 Refactor AccountSettingsView to use new event callback naming guideline 
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
 2015-10-21 14:02:04 -07:00
Rob
1ff97243ad Hello, yes this is Rob. 2015-10-21 08:46:12 -07:00
Imperadeiro98
9b06d53856 Fixed previous merge 2015-10-20 18:25:07 +01:00
snarkota
343f6c378c Update lt.coffee 
More translation strings
 2015-10-20 19:35:45 +03:00
Matt Lott
3ed755076b Enable while True auto yielding for all level types 2015-10-20 06:42:46 -07:00
Nick Winter
b03091c35d Merge pull request #3123 from UltCombo/iframe-style 
Remove iframe borders using CSS instead of DOM
 2015-10-20 06:15:54 -07:00
UltCombo
2c97238a7f Remove iframe borders using CSS instead of DOM 
This patch makes iframe borders render identically in all supported browsers (i.e. no border).

Although Chrome does not displays borders around iframes by default, Firefox and Edge (IE) had visible iframe borders prior to this patch. This is because, as [previously mentioned](https://github.com/codecombat/codecombat/pull/3122#discussion_r42338590), the DOM property was mistyped as `frameborder` when it should be `frameBorder`.

As this is presentational issue, it feels more appropriate to fix it using CSS. Therefore, I've removed the buggy JS code and added a generic CSS solution to reset iframes' border styling.
 2015-10-19 22:58:51 -02:00
Matt Lott
cc642e7254 Auto yield while True loops for course levels 2015-10-19 16:46:53 -07:00
Nick Winter
2539814687 Merge pull request #3122 from UltCombo/help-video-fullscreen 
Allow embedded help videos to go fullscreen
 2015-10-19 12:40:28 -07:00
UltCombo
c02b311efa Allow embedded help videos to go fullscreen 2015-10-19 03:44:19 -02:00
AkaKaras
e1e8dc33d2 zh-hans typos 2015-10-18 21:17:13 -04:00
AkaKaras
11baf3fd61 megre 2015-10-18 21:08:51 -04:00
AkaKaras
1d6d6011d8 zh-HANS and zh-HANT translation 
both i18n are done, also had fix some typos
 2015-10-18 21:05:40 -04:00
Imperadeiro98
1a664b519a Uncommented strings from last merge 2015-10-18 15:39:03 +01:00
Imperadeiro98
a900cc003f Merge pull request #3120 from artinhuang/master 
Update to zh-HANS.coffee
 2015-10-18 15:35:16 +01:00
artinhuang
3c7bb3443c Modify some description,and add the new translations. 2015-10-18 18:39:49 +08:00
Imperadeiro98
13f30ca16a Uncommented strings from last merge 2015-10-18 11:23:42 +01:00
snarkota
23670b9f25 Update lt.coffee 
First lines of lithuanian translation
 2015-10-17 21:09:50 +03:00
Nick Winter
5f8ab8a212 Added support for test campaigns that don't save their levels/achievements 2015-10-16 16:06:53 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -07:00
Nick Winter
d5288a254b Remove Ace of Coders tournament blurb from home page 2015-10-16 14:55:58 -07:00
Sam Soffes
59f987e105 Check for new iPad User-Agent 2015-10-16 14:42:25 -07:00
Imperadeiro98
3d1e5f1e34 i18n account dropdown 'Prepaid Codes' 2015-10-15 21:41:47 +01:00
RUSLAN LÓPEZ CARRO
bf8da65060 Update es-419.coffee 2015-10-15 12:48:53 -05:00
Imperadeiro98
63d7df538c Fixed previous merge 2015-10-15 15:21:10 +01:00
Imperadeiro98
f72f786803 Merge pull request #3116 from Fokusnica/master 
changed and added some ru and uk locales
 2015-10-15 15:18:58 +01:00
Derevianko Liubov
58ba08ddb7 changed and added some ru and uk locales 2015-10-15 17:10:12 +03:00
Nick Winter
e15b30893f Note tournament end, undo tournament simulation bias 2015-10-15 06:32:52 -07:00
Jlit1001
a788533d13 1. simplify regex for email testing 
2. keep valid emails in text area
 2015-10-14 22:29:15 -07:00
Scott Erickson
844bc942b3 Fix #2785 2015-10-14 16:01:09 -07:00
Scott Erickson
cbf6032c68 Merge branch 'origin/spritesheets' 2015-10-14 15:03:34 -07:00
Scott Erickson
1f00f5b4b9 Remove vestigial function argument 2015-10-14 15:00:57 -07:00
Scott Erickson
b77626b8ee Minor fixes 
Making sure LayerAdapter doesn't wait for ThangType to load the image more than once.
LayerAdapter skips rendering if there's a prerendered sprite sheet whose image is not loaded.
 2015-10-14 14:48:43 -07:00
Scott Erickson
305cffb5ea Finish hooking up prerendered spritesheets with LayerAdapter 2015-10-14 14:33:26 -07:00
Imperadeiro98
a4d8aec2a7 Added i18n to contributor signup 2015-10-14 21:06:23 +01:00
Scott Erickson
1085731fdd Fix colorConfig prerendered sprite sheet data, comparison 2015-10-14 10:41:10 -07:00
Scott Erickson
39bddb889e Have LayerAdapter use prerendered spritesheets (unfinished) 2015-10-13 16:43:56 -07:00
RUSLAN LÓPEZ CARRO
8e9b46b73c Update es-419.coffee 2015-10-13 18:08:44 -05:00
Nick Winter
74763f0614 Fix experience/gems not showing in HeroVictoryModal 2015-10-13 13:44:25 -07:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7 Propagate i18n 2015-10-13 12:32:51 -07:00
Nick Winter
2336668b09 Actually commit my ru.coffee merge 2015-10-13 12:32:14 -07:00
Scott Erickson
3fc7b71f7a Remove log 2015-10-13 12:31:28 -07:00
Scott Erickson
74a7b53498 Remove vestigial test code 2015-10-13 12:30:18 -07:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups 
Added i18n to some strings
 2015-10-13 12:27:58 -07:00
Nick Winter
28530f44e6 Merge ru.coffee and uk.coffee 2015-10-13 12:26:28 -07:00
Nick Winter
ac750456b7 Merge ru.coffee and uk.coffee 2015-10-13 12:25:23 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1 
Update level_loading.jade
 2015-10-13 12:21:19 -07:00
Nick Winter
7584872c9f Fix #3106 introduced by b38a6c50 2015-10-13 08:22:13 -07:00
Imperadeiro98
20371fa146 Indentation re-fix 2015-10-13 16:14:43 +01:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -07:00
Imperadeiro98
2b8856aead Fixed indentation 2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800 Merge pull request #3104 from tufik000/patch-2 
Link to Ace of Coders
 2015-10-13 14:58:22 +01:00
Matt Lott
eda10a55ec Update /courses?_ppc= logged out instructions 2015-10-12 21:13:03 -07:00
Scott Erickson
66650452b2 Merge remote-tracking branch 'origin/master' 2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9 Add spriteSheets to ThangType, export modal to Thang Editor 
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
 2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060 Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context 2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c Add teacher HoC instructions to /courses 2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166 Add HoC blurb to top of /teachers pages 
Replacing courses beta testing blurb.
 2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b Route /hoc to courses 
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
 2015-10-12 16:25:23 -07:00
Imperadeiro98
56c4c5a1b3 Merge pull request #3105 from AkaKaras/translation 
Translation
 2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be zh-hant latest translation 
finally finished the translation, proud of myself (●—●)  b
 2015-10-12 16:54:14 -04:00
tufik000
00170d6821 Link to Ace of Coders 
Changed "torneir" to "torneio" and  "Era dos Programadores" to "Ás dos Programadores"
 2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84 added some ru and uk locales 2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8 added some ru and uk locales 2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084 Merge pull request #3101 from HelloSeaNation/patch-2 
Fix another typo
 2015-10-11 20:01:57 +01:00
AkaKaras
3325b91b5a Merge remote-tracking branch 'codecombat/master' into translation 
Conflicts:
	app/locale/zh-HANT.coffee
 2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626 zh-hant 
translation
 2015-10-11 09:15:28 -04:00
HelloSeaNation
e75413fbe2 Fix another typo 2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c Fix typo 2015-10-11 00:54:59 +13:00
Tery Lim
0b9e78e2b8 Some zh-HANS translations 
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
 2015-10-10 22:38:21 +13:00
Tery Lim
124b61a70c Update harry's tips 
`Yer a Wizard,`
 2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Matt Lott
8fce82ce72 Update trial requests approval page query to grab latest 
Used to be limited to first 2000 requests, which was hit on 10/7/15.
 2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765 Remove placeholder text in invite email box in course details page 
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
 2015-10-09 13:45:33 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68 Update pt-PT.coffee 2015-10-09 16:31:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511 Update level_loading.jade 2015-10-09 09:35:30 -05:00
Nick Winter
0d6f84cab6 Merginate uk.coffee 2015-10-09 06:08:36 -07:00
Imperadeiro98
442f9d2265 Merge pull request #3092 from kumabotz/patch-2 
Translate careers
 2015-10-09 12:32:54 +01:00
Imperadeiro98
20cd6643c8 Merge pull request #3091 from kumabotz/patch-1 
Update to zh-HANS period ( 。)
 2015-10-09 12:32:18 +01:00
Derevianko Liubov
cf7952149d add some uk locales 2015-10-09 11:06:09 +03:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622 1. set periodEnd to the next month if subscription cancelled at periodEnd 2015-10-08 19:43:13 -07:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up 
Cleaned up a couple of files
 2015-10-08 16:25:50 -07:00
Tery Lim
fb29cd1950 Translate careers 2015-10-09 12:03:46 +13:00
Tery Lim
4a26afd9b2 Update to zh-HANS period ( 。) 2015-10-09 11:11:51 +13:00
RUSLAN LÓPEZ CARRO
721b2c024e Update es-419.coffee 2015-10-08 16:35:21 -05:00
Matt Lott
99c20b88fa Don't show seat count when enrolling in free courses 2015-10-08 12:27:53 -07:00
Matt Lott
171678caad Add try out courses blurb to top of /teachers page 2015-10-08 11:51:00 -07:00
RUSLAN LÓPEZ CARRO
853d08b71e Update es-419.coffee 2015-10-08 11:44:13 -05:00
Matt Lott
9e8294fae8 Comment out courses teacher survey UI 
The teacher survey infrastructure does not support courses yet.
 2015-10-08 09:40:40 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b Update level_loading.jade 
How about adding these two quotes? :D
 2015-10-08 11:36:19 -05:00
Nick Winter
7e8b6589d5 Update HipChat links 2015-10-08 06:14:36 -07:00
Matt Lott
a6f4085b13 Update course details progress colors 
Only show not started key when expanded progress.
 2015-10-08 06:10:12 -07:00
Matt Lott
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
TJ Ledwith
a87ec2bd81 Added a few names. 
Added a few names.
 2015-10-08 07:43:48 -04:00
Matt Lott
a6e3110549 Update course details completed level/concept to light blue 2015-10-07 17:30:16 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses 
Default to 9999 instead.
 2015-10-07 17:08:22 -07:00
Scott Erickson
50f7391e76 Remove programming language and progress class settings 2015-10-07 16:31:19 -07:00
Scott Erickson
76422b3585 Put free teacher evaluation blurb in /courses/enroll on /courses too 2015-10-07 16:23:35 -07:00
Matt Lott
3292f13bc3 Ensure students play course levels in order 2015-10-07 15:33:52 -07:00
Matt Lott
bfacbf8add Course details page defaults to levels tab for students 2015-10-07 15:18:09 -07:00
Matt Lott
440bf9c6e0 /courses?_ppc=blah logged out message 
Also trim /courses prepaid code input.
 2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4 Separate URLs for /courses/students and /courses/teachers 2015-10-07 14:37:41 -07:00
Nick Winter
d651380040 Fix merge conflicts in es-419 2015-10-07 13:24:19 -07:00
Jhoon Saravia
beb8a425f0 Translated new sections and updated other translations 2015-10-07 10:54:49 -05:00
Scott Erickson
2d2f4814f4 Add course membership required error to LevelLoadingView 2015-10-06 12:48:58 -07:00
Matt Lott
75b9cb50d9 Add /courses prepaid code query var 
Update invite students link to go to /courses
 2015-10-06 12:30:22 -07:00
Matt Lott
9c7345fed0 Redeem course prepaid code on /courses page 
Completes #54270566052118
 2015-10-06 11:20:57 -07:00
Scott Erickson
ee138660da Tweak level schema to get WebStorm to stop thinking it's bad syntax 2015-10-06 11:06:41 -07:00
Nick Winter
e0918ec631 Added mountain -> glacier completion link 2015-10-05 16:19:43 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a Add invite link and capacity info to CourseDetailsView 2015-10-05 16:01:32 -07:00
Nick Winter
d200ac4a32 Fix #2926: handle missing sub-code/spoken-languages in docs 2015-10-05 15:32:02 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files 
Removed some unused strings, an unnecessary style and an event
 2015-10-05 22:30:02 +01:00
tieskedh
6a34e5b813 Update nl-NL.coffee 2015-10-04 15:45:31 +02:00
Imperadeiro98
403cfe2f53 Fixed previous merge 2015-10-03 19:58:12 +01:00
Imperadeiro98
43476ed87f Merge pull request #3082 from etem/master 
Updated Bulgarian translation
 2015-10-03 19:55:59 +01:00
Etem Hyusnev
42056fafdf Translated action_cooldown 2015-10-03 17:05:05 +03:00
Etem Hyusnev
07a0fbf109 Updated Bulgarian translation 2015-10-03 17:01:22 +03:00
Imperadeiro98
a61655f6b8 Uncommented an header 2015-10-02 20:43:30 +01:00
tieskedh
122c9c2d4f added some dutch translations 2015-10-02 18:57:53 +02:00
Matt Lott
5095eac4ac Purchase prepaid on course instance creation 
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.

Completes #54270567235517
 2015-10-01 15:23:20 -07:00
Nick Winter
079e3a59f5 Update iPad app detection for iOS 9 2015-10-01 09:23:18 -07:00
Imperadeiro98
f3e791bcbd Update pt-PT.coffee 2015-09-30 20:24:28 +01:00
Imperadeiro98
0a658aa1c0 Merge pull request #3079 from javatlacati/patch-2 
Update es-419.coffee
 2015-09-30 19:41:11 +01:00
Imperadeiro98
3960c0911f Uncommented an header 2015-09-30 19:40:57 +01:00
RUSLAN LÓPEZ CARRO
2b9dbeafbf Update es-419.coffee 2015-09-30 12:02:30 -05:00
RUSLAN LÓPEZ CARRO
c466c80bf5 Update es-ES.coffee 
A translation for Thang has been proposed.
 2015-09-30 11:39:20 -05:00
Imperadeiro98
4f5f2c72c7 Uncommented some headers from nl-NL.coffee 2015-09-30 14:59:31 +01:00
Imperadeiro98
5c68bd6a10 Merge pull request #3076 from tieskedh/patch-1 
Update nl-NL.coffee
 2015-09-30 14:54:32 +01:00
RUSLAN LÓPEZ CARRO
0bb6b0d0dc Update es-419.coffee 
Finished translation?!!! :D
 2015-09-29 18:06:45 -05:00
tieskedh
dfdc601af8 Update nl-NL.coffee 
added new translations
 2015-09-30 00:58:59 +02:00
Imperadeiro98
42f6e5d151 Merge pull request #3075 from javatlacati/patch-3 
Update fr.coffee
 2015-09-29 20:13:36 +01:00
Imperadeiro98
b6753293a5 Uncommented an header from it.coffee 2015-09-29 20:12:22 +01:00
Imperadeiro98
71632554db Merge pull request #3074 from javatlacati/patch-2 
Update it.coffee
 2015-09-29 20:11:26 +01:00
RUSLAN LÓPEZ CARRO
93106d2f0c Update fr.coffee 
Je ne parle pas fraçaise mais...
 2015-09-29 13:44:22 -05:00
RUSLAN LÓPEZ CARRO
1ee7989b67 Update it.coffee 2015-09-29 12:40:12 -05:00
RUSLAN LÓPEZ CARRO
f74758ae31 Update es-419.coffee 
NOTE: review in spanish classes are grupos and lessons are clases. ( false cognate )
Nota: revisar; en inglés las classes significan grupos y las clases significan lessons ( es un cognado falso )
BTW... streamlined means that the groups have a chat and screen streamming with the professor?
 2015-09-29 11:01:06 -05:00
RUSLAN LÓPEZ CARRO
5c1c40a83b Update es-419.coffee 
ooops forgot to send yesterday :$
 2015-09-29 09:35:34 -05:00
Matt Lott
1557b7b442 🐛Fix jade i18n errors in courses pages 
Uncaught TypeError: Cannot read property 'i18n' of undefined
 2015-09-28 16:13:27 -07:00
Dmitry Suprun
75bc889f5a update courses section 2015-09-28 22:57:40 +03:00
Imperadeiro98
04a385c555 Uncommented two headers 2015-09-28 19:57:11 +01:00
RUSLAN LÓPEZ CARRO
2c2dd88505 es-419 Updated some courses translation 
title: "Título" #person title?
 2015-09-28 13:24:33 -05:00
Nick Winter
bf8ba8cbe1 Merge pull request #3064 from Driphter/master 
Fixed level/thang editor table for issue #3052
 2015-09-28 06:06:48 -07:00
Imperadeiro98
bae9e85ac2 Update pt-PT.coffee 2015-09-28 13:28:37 +01:00
Nick Winter
5ba607cac7 Fix invalid audio panning values 2015-09-27 20:34:00 -07:00
Nick Winter
88d11afb1d Propagate i18n 2015-09-27 19:57:57 -07:00
Nick Winter
26d9d20c26 Fix merge conflicts in es-ES.coffee 2015-09-27 19:56:41 -07:00
Nick Winter
4582a4499f Merge pull request #3059 from Imperadeiro98/master 
Added i18n to courses
 2015-09-27 19:52:52 -07:00
Imperadeiro98
350deee4f8 Uncommented an header from tr.coffee 2015-09-27 19:21:37 +01:00
Imperadeiro98
8ea5de0a88 Merge pull request #3061 from ecemm/patch-1 
Update tr.coffee
 2015-09-27 19:20:12 +01:00
Imperadeiro98
63e13a0222 Merge pull request #3067 from ilo/patch-2 
Changes for the Clan section
 2015-09-27 19:18:03 +01:00
duhow
d94eed98d4 Update es-ES.coffee 
Added some new translates and changes.
 2015-09-27 19:22:01 +02:00
Iñaki López
871a12e4ba Changes for the Clan section 
Translated clan section page strings, and fixed a typo.
 2015-09-27 23:09:25 +10:00
Iñaki López
040d075cac Update es-ES.coffee 
Some visible strings on the UI to a free account.
 2015-09-27 20:56:55 +10:00
Driphter
3b0bafd325 Fixed level/thang editor table for issue #3052 2015-09-26 20:07:36 -04:00
Imperadeiro98
ea96ff1383 Merge pull request #3060 from javatlacati/patch-1 
Update es-419.coffee
 2015-09-26 12:59:07 +01:00
Matt Lott
95319ecc3e Redirect /careers to Lever page 2015-09-25 15:49:00 -07:00
Matt Lott
686d7ac0a8 Fix course schema typo 2015-09-25 15:28:43 -07:00
Matt Lott
5eadd926b3 Move redeem prepaid code UI out of modal 2015-09-25 15:21:51 -07:00
Nick Winter
f9b9ac8f86 Fix error in playing victory sound 2015-09-25 15:19:44 -07:00
ecemm
3a07c6a257 Update tr.coffee 2015-09-26 00:32:57 +03:00
RUSLAN LÓPEZ CARRO
4060a1b029 Update es-419.coffee 2015-09-25 16:32:15 -05:00
Imperadeiro98
4cb885faf3 Small change 2015-09-25 20:54:21 +01:00
Imperadeiro98
446b193f8c Added i18n to courses 2015-09-25 20:51:51 +01:00
Imperadeiro98
17a24bbcba Merge pull request #3057 from christotsvetanov/master 
Bulgarian translation
 2015-09-25 19:51:39 +01:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
jpss256
ab97c1d5d4 Bulgarian translation 2015-09-25 19:19:34 +03:00
Matt Lott
18d64e64fb Merge pull request #3009 from Imperadeiro98/master 
Use playSound across the code
 2015-09-25 06:21:08 -07:00
Imperadeiro98
4f054fa31a Fixed issue with string interpolation 2015-09-25 14:00:03 +01:00
Imperadeiro98
4cd8d95c72 Removed an unnecessary console log 2015-09-25 13:12:06 +01:00
Matt Lott
71538b0ac9 Remove 'do not localize' comment from courses UI 
It’s ok to localize / i18n these now.
 2015-09-24 17:56:12 -07:00
Matt Lott
feef9c0ac6 🐛Fix instance selection on /courses page 2015-09-24 17:52:00 -07:00
Matt Lott
d7d6694ee9 Update course level routing 2015-09-24 17:12:18 -07:00
Matt Lott
b4d59ced3e Update course details progress level cell popups 2015-09-24 14:48:54 -07:00
Matt Lott
238ea49090 Add stats to course details page 2015-09-24 07:28:43 -07:00
Matt Lott
cbaac98556 Course details page no instances selected UI 2015-09-23 16:27:49 -07:00
Imperadeiro98
4cd872091e Uncommented an header 2015-09-23 20:00:38 +01:00
rohmunhoz
0e149e84e1 Translate and correct 
Translate some strings and correted the translation of some other ones
 2015-09-23 15:49:56 -03:00
Cat Sync
dcfc5726e9 Added Librarian name 2015-09-23 13:56:25 -04:00
Nick Winter
3253ae456e Fix #3050: undefined simulation debugging tooltips 2015-09-23 08:24:35 -07:00
Imperadeiro98
0492d455b0 Merge pull request #3041 from tuomastanner/patch-1 
A few tip translations
 2015-09-23 14:08:27 +01:00
Imperadeiro98
1a08730ae7 Uncommented an header 2015-09-23 14:05:09 +01:00
Imperadeiro98
4efd1eeb1a Merge pull request #3048 from mads232/patch-1 
Update da.coffee
 2015-09-23 14:04:04 +01:00
Nick Winter
3dd36ebe6e Fixed merge conflicts. 2015-09-22 13:13:12 -07:00
mads232
ca629e383f Update da.coffee 2015-09-22 17:16:45 +02:00
Nick Winter
144d6cfb32 Further disable social services in ladder 2015-09-21 14:16:23 -07:00
Nick Winter
49279367d1 Fix facebook.coffee linting issue 2015-09-21 14:16:08 -07:00
Imperadeiro98
8cee4d8baf Update pt-PT.coffee 2015-09-21 21:30:59 +01:00
Imperadeiro98
7b183e3ae5 Removed some old 'changed' from en.coffee 2015-09-21 21:03:55 +01:00
Nick Winter
3ac8a32be8 Propagate i18n 2015-09-21 12:41:16 -07:00
Nick Winter
c2c3ae4c4c Add /careers and Ace of Coders links to home page 2015-09-21 12:40:33 -07:00
Imperadeiro98
83f6f8f5d4 Uncommented headers from last merge 2015-09-21 16:36:06 +01:00
Imperadeiro98
d0ba986ba4 Merge pull request #3037 from Mephisto07/patch-1 
Labels translated to portuguese
 2015-09-21 16:33:52 +01:00
Imperadeiro98
30c54639a0 Merge pull request #3043 from giaba90/patch-1 
Update it.coffee
 2015-09-19 22:23:36 +01:00
Imperadeiro98
6863e77c42 Merge pull request #3040 from AkaKaras/translation 
update the tournament translation
 2015-09-19 22:20:16 +01:00
giaba90
03da5d06f4 Update it.coffee 
i have translated some string
 2015-09-19 12:01:11 +02:00
Nick Winter
1819911551 A/B/C test the first subscription prompt level 2015-09-18 08:28:04 -07:00
Nick Winter
dc10dc3b61 Add skip button to Bloc offer 2015-09-18 08:27:37 -07:00
Tuomas Tanner
c5ac99f4c9 A few tip translations 2015-09-18 17:16:47 +03:00
Nick Winter
cae95f5952 Tweak /careers copy 2015-09-18 05:31:03 -07:00
AkaKaras
c667ecef7b eh just find some typos 2015-09-17 21:25:41 -04:00
AkaKaras
cd4230002b add the new translations 
add the tournament translation
 2015-09-17 21:22:47 -04:00
AkaKaras
f2e1da53ac Update zh-HANT.coffee 2015-09-17 21:20:07 -04:00
AkaKaras
b271fd60ee new zh-hans translation 
add the the tournament translation
 2015-09-17 21:18:41 -04:00
Nick Winter
7a56ecfe4d Disabled auto-submit for Ace of Coders ranking. 2015-09-17 14:42:13 -07:00
Nicolas Segeti
03af6bee8e Labels translated to portuguese 
I added some translated texts to the project.
 2015-09-17 15:32:58 -03:00
Imperadeiro98
6506b95bad Merge pull request #3033 from kerradus/ru-translation 
RU translation
 2015-09-16 19:50:22 +01:00
Imperadeiro98
8d4af16e2d Fixed indentation 2015-09-16 19:43:15 +01:00
Imperadeiro98
979d9d35fc Merge pull request #3036 from javatlacati/patch-2 
Update es-419.coffee
 2015-09-16 19:41:47 +01:00
RUSLAN LÓPEZ CARRO
e8b137398f Update es-419.coffee 
Some word mispell and auto-translated fixing.
 2015-09-16 13:31:50 -05:00
RUSLAN LÓPEZ CARRO
810cbb954e Update es-ES.coffee 2015-09-16 13:11:40 -05:00
Dmitry Suprun
222878454a add ru translation 2015-09-16 19:27:48 +03:00
Nicholas Winter
5151ab9091 Describe Ace of Coders tournament 2015-09-15 16:36:50 -07:00
Ikuyadeu
d791736420 Update ja.coffee 2015-09-15 15:46:29 +09:00
Matt Lott
3ad13c9a0d Add /careers page 2015-09-14 17:38:18 -07:00
Imperadeiro98
3268440b9d Fixed last merge 2015-09-14 12:23:46 +01:00
Liubov Derevianko
f5642f3f08 add ru and uk locales 2015-09-14 11:01:02 +03:00
Imperadeiro98
ee612daaa6 Merge pull request #3025 from javatlacati/patch-1 
Update es-419.coffee
 2015-09-13 21:14:16 +01:00
RUSLAN LÓPEZ CARRO
3ce32837ce Update es-419.coffee 
Finished! :D
 2015-09-13 12:46:39 -05:00
Ikuyadeu
14f9ac4d71 Update ja.coffee 2015-09-13 17:11:39 +09:00
Matt Lott
b68e5e209b Update course details page 2015-09-12 22:02:03 -07:00
Imperadeiro98
bdc1dea168 Merge pull request #3019 from javatlacati/patch-1 
Update es-419.coffee
 2015-09-12 21:07:59 +01:00
Imperadeiro98
a52ff3a94c Merge pull request #3014 from AkaKaras/translation 
new translation
 2015-09-12 20:58:22 +01:00
RUSLAN LÓPEZ CARRO
ecd7c24014 Update es-419.coffee 
Changed to formal language for teachers survey.
$120 dollars? D: OMG perhaps a little expensive for third worlders like me.
Is it finally done? :D
 2015-09-12 13:56:13 -05:00
Nicholas Winter
a4c1a599da Merge branch 'master' of https://github.com/codecombat/codecombat 2015-09-12 06:54:32 -07:00
Nicholas Winter
3eeb9a6a26 Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas. 2015-09-12 06:54:14 -07:00
AkaKaras
c04e347543 add new translation 
same reason as zh-HANS
 2015-09-11 18:25:09 -04:00
AkaKaras
672bfa1417 added new translation 
added new translation that i found from en
 2015-09-11 18:23:16 -04:00
Imperadeiro98
31587b9aa7 Uncommented some translations 2015-09-11 19:51:02 +01:00
albenarammou
7be5dd0d14 Update bg.coffee 2015-09-11 19:31:47 +03:00
RUSLAN LÓPEZ CARRO
45cd6f5411 Update es-419.coffee 
Addeded spanish slang for Thang.
Amigos hispanohablantes, favor de opinar. ( A los mexicanos seguros nos encantará )
 2015-09-10 19:15:13 -05:00
Imperadeiro98
bad15ddcdc Uncommented an header 2015-09-10 22:18:24 +01:00
RUSLAN LÓPEZ CARRO
b819a3f166 Update es-419.coffee 
Thangs is the slang for Things?
 2015-09-10 15:57:45 -05:00
Matt Lott
a2577cc521 Update courses landing page 2015-09-10 10:39:21 -07:00
Imperadeiro98
bd4063ed3a Use playSound across the code 2015-09-09 22:36:05 +01:00
David Liu
3266bd4621 Fix karma tests 
* "Shim" StripeCheckout
* Fix loadDependenciesForSession test
* Update karma coverage for better perf
 2015-09-09 14:02:03 -07:00
Imperadeiro98
25c693eed4 Update pt-PT.coffee 2015-09-09 21:59:25 +01:00
Matt Lott
9041646ecc Update teacher copy 2015-09-09 13:20:23 -07:00
Imperadeiro98
d7d7e8db9c Merge pull request #3008 from cwmaia/master 
Changes to pt-BR 300-400
 2015-09-09 20:04:29 +01:00
Carlos Maia
b1d520ade7 Changes to pt-BR 300-400 
Minor fixes to lines 300-400
 2015-09-09 15:02:25 -03:00
Nick Winter
cc255086f1 Cleaned up a couple things in LayerAdapter. 2015-09-09 08:59:33 -07:00
Imperadeiro98
769a02eeeb Merge pull request #3004 from kchz/master 
Update pt-BR.coffee
 2015-09-09 09:46:46 +01:00
Gabriel Maus
ad96233d72 Update pt-BR.coffee 
title changes
 2015-09-09 04:27:19 -03:00
Nick Winter
35ef48b108 Mirror ladder levels now copy source code to other side, too, not just transpiled code. Mirror sessions don't submit if there's a user code error. 2015-09-08 16:34:20 -07:00
Nick Winter
0153f8078d Disabled Io language choice until/unless someone finishes its parser. 2015-09-08 14:50:07 -07:00
Imperadeiro98
99241fc1f5 Merge pull request #3003 from cwmaia/master 
Changes to pt-BT 100-300
 2015-09-08 21:54:21 +01:00
Carlos Maia
b33504b2e7 Changes to pt-BT 100-300 
Minor changes and fixes.
 2015-09-08 17:38:53 -03:00
Nick Winter
b1fd171a27 Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards. 2015-09-08 06:44:26 -07:00
Nick Winter
6d5ddb65ea Not automatically showing melee ranges on action docs. 2015-09-08 06:31:19 -07:00
Imperadeiro98
3473893e8f Merge pull request #3000 from NicolasHuang/master 
Just fixed some wrong punctuation
 2015-09-08 11:41:43 +01:00
NicolasHuang
ea976751cf Update zh-HANT.coffee 2015-09-08 13:37:23 +08:00
NicolasHuang
1fae431773 Update zh-HANT.coffee 2015-09-08 10:50:11 +08:00
Nick Winter
0d2d1ddad0 A couple mirror match ladder tweaks. Made programmableMethods other code languages use proper code formatting. 2015-09-07 18:00:48 -07:00
NicolasHuang
bbcab626cc Update zh-HANT.coffee 2015-09-08 00:26:37 +08:00
Imperadeiro98
0549994693 Uncommented some translations 2015-09-07 14:47:33 +01:00
Imperadeiro98
912647872f Merge pull request #2997 from albenarammou/patch-1 
Update bg.coffee
 2015-09-07 14:41:59 +01:00
Imperadeiro98
a1b0e78ebd Merge pull request #2996 from kchz/master 
Little changes for the pt-BR translation
 2015-09-07 11:05:03 +01:00
Gabriel Maus
01f3b6dc84 Update pt-BR.coffee 
Little changes for the pt-BR translation
 2015-09-07 00:29:26 -03:00
albenarammou
010fc1834d Update bg.coffee 2015-09-06 14:37:39 +03:00
Eero Penttilä
06bbe338bd fi.coffee few consistency fixes 2015-09-05 15:30:55 +03:00
Eero Penttilä
abbeffbae0 fi.coffee translated: loading error 2015-09-05 15:15:06 +03:00
Eero Penttilä
88ea77e22c fi.coffee translated: account_invoices 2015-09-05 15:10:25 +03:00
Eero Penttilä
8fcdbebd04 fi.coffee translated: account 2015-09-05 15:05:59 +03:00
Eero Penttilä
65bd6bbdf0 fi.coffee translated: achievements 2015-09-05 14:55:04 +03:00
Nick Winter
3768783ceb Don't be making LadderSubmissionViews in the CastButtonView unless it's a mirror match. 2015-09-04 18:11:19 -07:00
Nick Winter
a13ccb7360 Fixed DuelStatsView power totals including future units. 2015-09-04 17:21:33 -07:00
Nick Winter
b3496cbf6b A couple tweaks for the duel stats view. 2015-09-04 17:01:06 -07:00
Nick Winter
73f3e7cdd9 League now preserved throughout ladder navigation flow. Mirror match support for submitting to both sides at once. 2015-09-04 16:21:45 -07:00
AkaKaras
73f83d3096 new translation 
zh-HANT was helped by @lazydoyP
 2015-09-04 11:42:09 -04:00
Nick Winter
d92ca389d6 Switched ladder views to display red/blue team instead of humans/ogres. 2015-09-03 15:46:56 -07:00
Nick Winter
89c644e084 Spectate mode starts paused until loading is done, and starts at time 1, so there is less stuttering during playback. 2015-09-03 15:22:25 -07:00
Nick Winter
98b0bcfc75 Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs. 2015-09-03 15:05:10 -07:00
Nick Winter
df60ecd09c Added multiplayer win/loss notice at end of level. 2015-09-03 13:32:20 -07:00
Imperadeiro98
454f66e10b Update pt-PT.coffee 2015-09-03 21:29:48 +01:00
Matt Lott
9131d8668f Course enroll page 
Will add a prepaid purchase once the prepaid-v2 branch is merged into
master.
 2015-09-03 11:04:52 -07:00
Nick Winter
46ee12ff9d Updated some timestamps. 2015-09-03 08:33:48 -07:00
Imperadeiro98
84363bc99f Merge pull request #2992 from Pena86/FIN_translation 
Merged Fin translations
 2015-09-03 16:04:21 +01:00
Imperadeiro98
0b5301d13a Merge pull request #2991 from cwmaia/master 
First changes to pt-BR translation
 2015-09-03 16:02:19 +01:00
Eero Penttilä
929f529509 Merge remote-tracking branch 'codecombat/master' into FIN_translation 2015-09-03 17:37:11 +03:00
Eero Penttilä
34b69daf1b Added fix for #2988 2015-09-03 17:36:39 +03:00
Imperadeiro98
4d6c888370 Update pt-PT.coffee 2015-09-03 15:29:51 +01:00
Carlos Maia
a5ebfce022 First changes to pt-BR translation 
Lines 1-100
 2015-09-03 11:28:30 -03:00
Eero Penttilä
91035cf957 fi.coffee translated newly added lines 2015-09-03 17:13:06 +03:00
Eero Penttilä
71b71fa19d Merge remote-tracking branch 'codecombat/master' into patch-1 
Conflicts:
	app/locale/fi.coffee
 2015-09-03 16:42:13 +03:00
Nick Winter
02676dc59f Fixed #2988. 2015-09-03 05:10:06 -07:00
Eero Penttilä
d5c46226bb fi.coffee, Few corrections along the way 2015-09-03 14:54:23 +03:00
Nick Winter
dcfa65213e Propagated i18n. 2015-09-03 04:47:48 -07:00
Nick Winter
4ad12a139a Cleaned up an i18n section header typo from #2971. 2015-09-03 04:45:16 -07:00
Eero Penttilä
bc00d4fc78 fi.coffee translated: keyboard_shortcuts 2015-09-03 14:43:15 +03:00
Nick Winter
fbc70435fb Merge pull request #2971 from AkaKaras/translation 
Translation
 2015-09-03 04:39:42 -07:00
Eero Penttilä
bbfa9a1c17 fi.coffee translated: account settings 
Some new, some fixed
 2015-09-03 14:31:57 +03:00
Nick Winter
1a6c3ad8c0 Updated level counts in en.coffee. 2015-09-03 04:27:36 -07:00
Eero Penttilä
b5573169b5 fi.coffee translated: contact 2015-09-03 14:10:24 +03:00
Eero Penttilä
4413c0d859 fi.coffee translated: teachers_survey 2015-09-03 13:52:12 +03:00
Eero Penttilä
0f1a854750 fi.coffee translated: teachers 2015-09-03 11:08:45 +03:00
Eero Penttilä
25863b729d fi.coffee translated: options 
Some new, some fixes
 2015-09-03 09:54:50 +03:00
Nick Winter
e6f61b545e ControlBarView handling playing non-latest versions of levels. 2015-09-02 14:54:44 -07:00
Imperadeiro98
bb119541da Merge pull request #2987 from sake12/master 
pl.coffee - another update
 2015-09-02 21:11:43 +01:00