Commit graph

11748 commits

Author SHA1 Message Date
Imperadeiro98
5a1d1e93dd Fix build 2016-01-30 10:21:36 +00:00
Imperadeiro98
a50d11321d Merge pull request #3370 from Ivanmateja/patch-2
Update sr.coffee
2016-01-30 10:19:23 +00:00
Ivan
b441161edb Update sr.coffee
Little more translation for today.
Best regards
2016-01-29 21:29:13 +01:00
Josh Callebaut
14ef28b658 Merge pull request #3369 from Zerrien/master
Editor Changes (Task tab, pre-initialize tasks, Artisan nurturing, level submission)
2016-01-29 09:42:04 -08:00
Imperadeiro98
546fdfa2b6 Fix build 2016-01-29 14:58:08 +00:00
Imperadeiro98
734797cc17 Merge pull request #3368 from Ivanmateja/patch-2
Update sr.coffee
2016-01-29 14:51:37 +00:00
Ivanmateja
4962c17107 Update sr.coffee
I have removed hashtags and signed CLA.  Hope that everything will work fine now. Sory for mistakes this Github is a little confusing at beginning.
Greetings
2016-01-29 15:21:22 +01:00
Imperadeiro98
6923491e45 Merge pull request #3367 from a1ip/patch-4
Update ru.coffee
2016-01-29 12:23:29 +00:00
Ivanmateja
ab681252e4 Update sr.coffee 2016-01-29 12:46:19 +01:00
Scott Erickson
57596d7c46 Merge pull request #3363 from codecombat/quote-request
Quote request
2016-01-28 17:29:14 -08:00
Scott Erickson
e62e497543 Replace TeachersFreeTrialView with RequestQuoteView 2016-01-28 17:21:36 -08:00
Scott Erickson
f657669dbc Extend forms
* formToObject handles checkboxes and radio buttons
* applyErrorsToForms handles required fields
* setErrorToField sets helpblock according to new forms best practices: before input and any help blocks
2016-01-28 17:18:24 -08:00
Philippe Rigovanov
ce05659ab5 Update ru.coffee 2016-01-29 01:26:24 +03:00
Josh Callebaut
7b5b4ca898 Uses @$ instead of @.find, method to convert dom into jQuery objects, and superior CoCoModel's getOwner() instead of trawling through the permissions list 2016-01-28 14:05:04 -08:00
Josh Callebaut
4a2d5c2e59 Fixes level ownership check 2016-01-28 14:05:04 -08:00
Josh Callebaut
bd825d3108 Includes the level name in the email and makes it clickable 2016-01-28 14:05:04 -08:00
Josh Callebaut
42efe6264b Sticks the level submission data into the contact form's message attribute 2016-01-28 14:05:04 -08:00
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Imperadeiro98
e61d9e5594 Merge pull request #3366 from a1ip/patch-3
Update ru.coffee
2016-01-28 21:54:10 +00:00
Philippe Rigovanov
94c0c27a03 Update ru.coffee 2016-01-29 00:45:16 +03:00
Matt Lott
0d9b7a634b Add homepage to Mixpanel page view tracking 2016-01-28 09:25:30 -08:00
Imperadeiro98
b25e947263 Merge pull request #3364 from a1ip/patch-2
Update ru.coffee
2016-01-27 20:21:59 +00:00
Philippe Rigovanov
dd6f9711a4 Update ru.coffee 2016-01-27 23:15:52 +03:00
Scott Erickson
4ef5f40fa1 Network error handling fixes
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
3dda5710de Move demo border to TestView to be used generally 2016-01-27 10:42:02 -08:00
Scott Erickson
d00f8344be Add demo controls to TestView 2016-01-27 10:42:02 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Imperadeiro98
cef0ed0185 Fix build 2016-01-27 18:12:34 +00:00
Imperadeiro98
0ad18fae88 Merge pull request #3361 from MatiasOlivera/master
Update es-419.coffee
2016-01-27 18:11:45 +00:00
Matías Olivera
a009b4aae6 Fix strings with the 'change' label 2016-01-27 13:34:50 -03:00
Nick Winter
3a5573cfe0 Merge pull request #3359 from binary-idiot/master
Add names for #53
2016-01-26 17:14:50 -08:00
Binary-idiot
0ab7f48611 Add names for #53 2016-01-26 19:46:04 -05:00
Nick Winter
03143d47cc Ask for email scope in Facebook login for #3310 2016-01-26 15:05:27 -08:00
Matt Lott
78c86eb979 Add furthest course table to analytics page 2016-01-26 14:37:25 -08:00
Nick Winter
729ebfec8f Add script to export all trial requests 2016-01-26 13:20:35 -08:00
Nick Winter
4ae8eacd90 Treat Elemental Wars like Ace of Coders for mirror match and hero equipment 2016-01-26 13:20:23 -08:00
Nick Winter
aa18e71388 Remove a log 2016-01-26 13:20:04 -08:00
Matías Olivera
6e7b34c4fd Translate new strings 2016-01-26 18:14:24 -03:00
Matt Lott
b3e5d8f650 Add explicit track event for viewing teacher trial
We want to explicitly track views before submit.
2016-01-26 10:32:39 -08:00
Nick Winter
80466f5e9d Ran ImageOptim to losslessly compress our images by 28.7% overall 2016-01-26 07:48:51 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Scott Erickson
57cf264880 Add img-prize, label-banner and well-parchment to design elements 2016-01-25 13:03:29 -08:00
Scott Erickson
6a9342dcd7 Upgrade to jasmine 2.4.1 2016-01-25 13:03:29 -08:00
Nick Winter
a7e6c14688 Also recognize classroom and VR floors 2016-01-25 12:35:45 -08:00
Nick Winter
87ceb36a6f Recognize classroom walls as wall obstacles visually 2016-01-25 12:29:22 -08:00
Matt Lott
8b4e59da5c Update analytics traits
Adding school name and course prepaid info.
2016-01-22 14:55:18 -08:00
Robin Yang
28f378f92f Update Course 2 Guide to Correct Shield Rush
Javascript solution was missing a parenthesis.
2016-01-22 14:18:41 -08:00
Robin Yang
750e22ae05 Merge remote-tracking branch 'codecombat/master' 2016-01-22 14:12:43 -08:00
Josh Callebaut
6dfc02980a Fixes non-existant task array, bad focus, adds a button to add default tasks. 2016-01-22 13:54:20 -08:00
Rob Blanckaert
28d085f6d3 Merge pull request #3349 from ryang217/master
Add additional formatting tags to Tome popup
2016-01-22 13:22:56 -08:00