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

8340 commits

Author SHA1 Message Date
sake12
9a52185e77 Update pl.coffee 2016-03-19 20:13:30 +01:00
Krzysztof Pomarański
1e9f950717 update pl.coffee 2016-03-19 12:25:56 +01:00
Matt Lott
5d71acba05 Replace HipChat with Slack 2016-03-18 17:05:21 -07:00
Nick Winter
905c9cdb93 Use victory text and next level data on level completion. Update picoCTF logo. 2016-03-18 14:18:41 -07:00
Nick Winter
dc3ba40a45 One more change from #3483 2016-03-18 11:35:56 -07:00
Nick Winter
c42f2512e9 Merge nl-NL.coffee 2016-03-18 11:35:04 -07:00
Nick Winter
13928884b0 Merge iDEAL link for nl on home 2016-03-18 11:16:28 -07:00
Nick Winter
4a737d3045 Merge iDEAL link for nl on home 2016-03-18 11:14:10 -07:00
Scott Erickson
d6a46826e6 Add top margin to base-flat footer 2016-03-18 11:03:55 -07:00
Scott Erickson
461fb14f37 TestView styling and responsive tweaks 2016-03-18 11:03:55 -07:00
Scott Erickson
ecfb148b3c Add spacing classes to style-flat 2016-03-18 11:03:55 -07:00
Scott Erickson
2a399e71fa Add CocoView.scrollToTop 2016-03-18 11:03:55 -07:00
Scott Erickson
e6593dea8d Refactor FacebookHandler and GPlusHandler 
* Move api loading to FacebookHandler
* Use success callbacks
* Use same, properly named events
* Use same functions and property names
* Refactor related social button, out of use rendering system
* Remove the now unnecessary form split from CreateAccountModal
 2016-03-18 11:03:55 -07:00
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Scott Erickson
1c629a3181 Fix options in forms.objectToForm 2016-03-18 11:03:55 -07:00
Scott Erickson
f21baa7af5 Migrate /db/trial.request for #3469 2016-03-18 11:03:55 -07:00
Scott Erickson
356523dd4b Add .btn-burgandy 2016-03-18 11:03:54 -07:00
Scott Erickson
46afe40637 Fix forms.scrollToFirstError when there is no error to scroll to 2016-03-18 11:03:54 -07:00
Scott Erickson
2e96a387e9 Add User.logout to client 2016-03-18 11:03:54 -07:00
Matt Lott
255ebbc048 Ads for free campaign players 
Display leaderboard ads on campaign and play views.
Do no show ads in classroom, picoCTF, or to teachers.
Add no ads blurb to subscription features matrix.
Scale game UI for ads on short screens.

Closes #3491
 2016-03-18 10:29:31 -07:00
Matt Lott
f14575ece6 Update subscribe modal level counts 2016-03-17 17:29:47 -07:00
Maikel Langezaal
49d7028e2e Cleanup 2016-03-17 11:30:19 +01:00
Imperadeiro98
9a36267ba7 Cleanup i18n in some files 2016-03-16 21:49:19 +00:00
Zeldaretter
d565d5bc0b Update de-DE.coffee 
i added and translated all lines that where missing from the original English en.coffee

I would like to Copy my changes to the Austrian German version, because it is nearly the same and if some Austrian Translator finds an error or a better word than he can edit it, but its like british and american English and both understand each others well and here I think its better to have German than English, what do you think?
 2016-03-16 18:36:53 +01:00
Imperadeiro98
e6b0eb6401 Merge pull request #3492 from JurianLock/patch-7 
Update nl-NL.coffee
 2016-03-16 12:59:22 +00:00
Imperadeiro98
1b1ac3028f Merge pull request #3490 from Zeldaretter/patch-1 
Update de-DE.coffee
 2016-03-16 12:58:26 +00:00
JurianLock
3a46ada802 Update nl-NL.coffee 
Another set of updates.
 2016-03-16 13:02:20 +01:00
Zeldaretter
10dc03bc7e Update de-DE.coffee 
Added some new strings from the English original
 2016-03-16 10:12:35 +01:00
Zeldaretter
0ec23f025c Update de-DE.coffee 
new updated strings, I finished translating. Next I will check if all strings are correct by comparing with the English original because some strings were allready translated and may not fit with the new layout.
Greetings and Thank you for a great game
 2016-03-16 09:09:21 +01:00
Nick Winter
42e1ab6c99 Fix wall collision coalescing code 2016-03-15 15:52:15 -07:00
Zeldaretter
07f21d44bd Update de-DE.coffee 
New strings translated. Nearly done, till Eastern I will finish this and start comparing with the english strings again.
 2016-03-15 22:01:03 +01:00
Nick Winter
ab29f7e10e Don't try to use Arvo for Cyrillic language headline fonts 2016-03-15 10:15:16 -07:00
Nick Winter
db813bd77e Merge zh-HANS.coffee 2016-03-15 08:47:20 -07:00
Imperadeiro98
c07b100712 Merge pull request #3489 from JurianLock/patch-6 
Update nl-NL.coffee
 2016-03-15 15:32:55 +00:00
Imperadeiro98
e5348e665c Merge pull request #3485 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-15 15:26:45 +00:00
Imperadeiro98
719e45a084 Merge pull request #3481 from Zeldaretter/patch-1 
Patch 1
 2016-03-15 15:23:30 +00:00
Imperadeiro98
f659d22fa5 Merge pull request #3480 from delftswa2016/Chinese-translation 
Chinese translation
 2016-03-15 15:20:31 +00:00
Nick Winter
8a93374a87 Fix silly ancient math mistake 2016-03-15 08:05:00 -07:00
JurianLock
c1fb0c53a9 Update nl-NL.coffee 
Another set of updates and tweaks.
 2016-03-15 01:22:02 +01:00
Nick Winter
e5dda556c6 Add Mandate configuration for session save delays 2016-03-14 16:39:05 -07:00
Scott Erickson
07aad0ca18 Merge pull request #3463 from delftswa2016/maximize-button-fix 
Fix the fullscreen-code button and beautiful-code button
 2016-03-14 10:45:08 -07:00
Jacob Boon
ce8f7f2c14 include iDeal offer for Dutch (nl) users 2016-03-14 16:39:16 +01:00
Zeldaretter
d9e271da4a Update de-DE.coffee 
Just did the changes. I don't know if it is good to translate the job benefits, because some of them don't work in Germany and I think if someone wants to work for you they have to at least speak enough English to understand this benefits.
 2016-03-14 07:05:01 +01:00
lazydogP
bdf59fe430 Update zh-HANS.coffee 2016-03-14 13:00:44 +08:00
Matías Olivera
d5b8f5c726 Update teachers_quote 2016-03-13 21:56:06 -03:00
Matías Olivera
147db289fb Update about 2016-03-13 21:06:11 -03:00
Chengxin Ma
d2cefce7da Update zh-HANS.coffee 2016-03-13 22:42:12 +01:00
Chengxin Ma
286b8161ca Update zh-HANS.coffee 2016-03-13 22:37:26 +01:00
Yu Liang
3dfb0c04b8 add margin-left for id 'create-account-btn' 2016-03-13 16:36:36 +01:00
Jan van den Berg
e449571139 Update nl-NL.coffee 
Minor language fixes
 2016-03-13 12:11:18 +01:00
yuliang123
c875c8c5ec fix misaligned login 2016-03-13 00:22:19 +01:00
Zeldaretter
37944f38d9 Update de-DE.coffee 
typo
 2016-03-12 22:18:31 +01:00
Zeldaretter
c968341cb4 Update de-DE.coffee 
6hours of translating, only some Classroom stuff needs to be translated now.
 2016-03-12 22:15:22 +01:00
yuliang123
1a11ade67b Update zh-HANS.coffee 2016-03-12 21:51:20 +01:00
yuliang123
b48e8eeecf Update zh-HANS.coffee 2016-03-12 21:39:26 +01:00
Nick Winter
96d0f4e7ee Merge nl-NL.coffee 2016-03-12 08:48:51 -08:00
Nick Winter
4f9932cd2f Merge pull request #3479 from delftswa2016/new-homepage-header-i18n 
updated new homepage header (i18n)
 2016-03-12 08:43:31 -08:00
Imperadeiro98
4b96cd272b Merge pull request #3477 from delftswa2016/update-Chinese-translation 
Update zh-HANS.coffee
 2016-03-12 14:12:03 +00:00
Imperadeiro98
7bce51c06b Small fixes to previous merge 2016-03-12 14:11:14 +00:00
Imperadeiro98
546ced6816 Merge pull request #3474 from mqrelly/master 
Update hu.coffee: Translate new home page to Hungarian.
 2016-03-12 14:09:33 +00:00
Imperadeiro98
820aeb0b04 Merge pull request #3467 from delftswa2016/NL-translation 
NL translation
 2016-03-12 14:07:56 +00:00
Imperadeiro98
e4ab59ef65 Added a diplomat 2016-03-12 14:03:59 +00:00
Imperadeiro98
551ec13743 Rearranged quotation marks in es-419.coffee 2016-03-12 14:02:45 +00:00
Imperadeiro98
d8ffcb355c Merge pull request #3464 from MatiasOlivera/master 
Update es-419.coffee
 2016-03-12 13:59:47 +00:00
Imperadeiro98
200d91a8a6 Merge pull request #3461 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-12 13:58:55 +00:00
Chengxin Ma
6ff7c562a8 updated new homepage header (i18n) 2016-03-12 12:19:21 +01:00
Chengxin Ma
db52cd0c83 updated new_home in zh-HANS.coffee 2016-03-12 02:26:42 +01:00
Chengxin Ma
e02083214a updated new_home in zh-HANS.coffee 2016-03-12 02:19:20 +01:00
Matt Lott
3a1627682d Update homepage logged out copy 2016-03-11 15:44:37 -08:00
Szabadkia Márk
ba266eae5c Update hu.coffee: Translate new home page to Hungarian. 
Also fix minor spelling errors.
 2016-03-12 00:14:51 +01:00
Scott Erickson
464430200c Fix AccountSettingsView to only try to change permissions in development 2016-03-11 15:00:55 -08:00
JurianLock
1d7d9c76b6 Update nl-NL.coffee 
Another set of updates and tweaks
 2016-03-12 00:00:51 +01:00
Scott Erickson
9d315a4848 Fix "students enrolled" to "students assigned" in TeacherCoursesView 2016-03-11 14:13:44 -08:00
Maikel Langezaal
5aff988ec5 Cleaned up code 2016-03-11 21:08:13 +01:00
Maikel Langezaal
e07d2561bd Made the treema visible to be build, but disabled and hidden the buttons 2016-03-11 21:01:06 +01:00
Maikel Langezaal
b4c8948f6e small typo 2016-03-11 19:33:59 +01:00
Matías Olivera
e614e5a76c Update play_level's tips 2016-03-11 14:05:23 -03:00
Martijn Cligge
550cec9cd1 NL. Coffee _ Added more translations 
Added more translations and corrected old ones
 2016-03-11 18:00:13 +01:00
Matías Olivera
d3323fc9c7 Update nav 2016-03-11 13:56:42 -03:00
Matías Olivera
cba4fbcad6 Update new home 2016-03-11 13:54:21 -03:00
yuliang123
457d6bbc6c Fix the fullscreen-code button and beautiful-code button 2016-03-11 16:59:45 +01:00
Maikel Langezaal
bee812149b Additions to dutch translation 2016-03-11 15:58:40 +01:00
Matt Lott
acba838db4 🐛Request demo Ux bugs 
Only ask about login if not logged in
Add missing set up a class i18n string
 2016-03-10 14:40:16 -08:00
Scott Erickson
84cdf1e2ce Add showRequiredError and showSignupRationale alerts and tests to CreateAccountModal 2016-03-10 11:37:31 -08:00
Scott Erickson
a59e96f277 Tweak invalid class code behavior, fix hide modal button test 2016-03-10 11:23:09 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Zeldaretter
5006fa8df3 Update de-DEcoffee 
new translations.
please add me to the diplomatpages if you like my work, that would be a great honour.
Thanks^^
 2016-03-10 16:47:26 +01:00
Imperadeiro98
910953d383 Fix build (part 2) 2016-03-10 14:47:45 +00:00
Imperadeiro98
a0b52aca49 Fix build 2016-03-10 14:37:38 +00:00
Imperadeiro98
60f0522192 Uncomment header in nl-NL.coffee 2016-03-10 14:36:48 +00:00
Imperadeiro98
b9e7417b07 Merge pull request #3460 from JurianLock/patch-4 
Update nl-NL.coffee
 2016-03-10 14:35:45 +00:00
Imperadeiro98
ed926ff799 Merge pull request #3459 from Zeldaretter/patch-3 
Update De-de-coffee
 2016-03-10 14:34:15 +00:00
Imperadeiro98
d3d408c5c6 Merge pull request #3455 from Agalondia/patch-1 
Update id.coffee
 2016-03-10 14:32:37 +00:00
Galandre Athalon
cbf8ebd98c Update id.coffee 
There, i've got rid of the # in the translated bits, and change some things and translated a lot of others :D
 2016-03-10 19:35:22 +08:00
JurianLock
aeec7a8e9c Update nl-NL.coffee 
Another set of tweaks and updates
 2016-03-10 11:37:47 +01:00
Zeldaretter
4d72fbeb63 Update De-de-coffee 
New translations
 2016-03-10 11:33:48 +01:00
Imperadeiro98
84ffdc8df2 Merge pull request #3446 from vellrya/patch-1 
Update ru.coffee
 2016-03-09 20:23:58 +00:00
Agalondia
6fec94ffbd Update id.coffee 
Here's my translation for Indonesian, please consider it guys!
 2016-03-09 22:17:29 +08:00
Chengxin Ma
a8e72aac70 fix Chinese grammar 2016-03-09 11:04:46 +01:00
Matt Lott
eb7bebe293 Add DAU 30-day avg and daily total to dashboard 2016-03-08 15:27:57 -08:00
JurianLock
25f598934d Update nl-NL.coffee 
Few tweaks and some general updates.
 2016-03-08 23:44:08 +01:00
Matt Lott
bce9862be2 Update request demo Ux 
Renaming request quote to request demo
Changing create class wording to set up class
Showing different UI if teacher or not
Adding gameplay screenshots to homepage
Update request demo email

Closes #3449
 2016-03-08 09:30:50 -08:00
Robin Yang
ee331cc9c5 Change request quote headings H1/H2 to H3/H4 2016-03-07 13:56:34 -08:00
Imperadeiro98
86e10d0c34 Fix previous merge 2016-03-07 19:22:52 +00:00
Imperadeiro98
1577dc5708 Merge pull request #3444 from JurianLock/patch-2 
Update nl-NL.coffee
 2016-03-07 19:22:17 +00:00
Nick Winter
6a9a36b1eb Don't show misc achievements in picoCTF mode 2016-03-07 09:54:29 -08:00
Nick Winter
78379f2e6a Merge pull request #3440 from Imperadeiro98/master 
Remove i18n from admin pages
 2016-03-07 09:16:07 -08:00
Nick Winter
6d246129de Make languages fall sideways if needed (ex: nl-BE using nl-NL instead of en) 2016-03-07 08:13:49 -08:00
Nick Winter
9dc6a04f5e Fix #3447 2016-03-07 07:02:01 -08:00
vellrya
eb32320b6f Update ru.coffee 2016-03-07 15:25:29 +03:00
JurianLock
b6f1a5046d Update nl-NL.coffee 2016-03-06 23:16:14 +01:00
Imperadeiro98
ba12f0b7f4 Fix previous merge 2016-03-06 21:39:43 +00:00
JurianLock
01d250caf3 Update nl-NL.coffee 2016-03-06 22:30:09 +01:00
sake12
44cf0931c4 Update pl.coffee 2016-03-06 12:10:53 +01:00
Imperadeiro98
773c640ced Fix build 2016-03-05 15:25:12 +00:00
Imperadeiro98
2442115892 Remove i18n from admin pages 2016-03-05 15:08:27 +00:00
Imperadeiro98
88091cf166 Update pt-PT.coffee 2016-03-05 14:15:52 +00:00
Nick Winter
fb9b169c62 Propagate a big i18n 2016-03-04 15:51:16 -08:00
Nick Winter
1ccad78782 Submit picoCTF solutions, show progress, disable sound 2016-03-04 11:44:43 -08:00
Scott Erickson
0b6390795a Tweak text on admin page 2016-03-04 11:14:18 -08:00
Scott Erickson
a2249f8df1 Add return-to-admin (turn off espionage mode) 2016-03-04 10:43:17 -08:00
Nick Winter
59e8c42ddb Client-side support for beating picoCTF levels 2016-03-03 17:18:24 -08:00
Scott Erickson
47f3223be1 Fix and improve new errors system 
* Fix error property name -> errorName
* showNotyError can handle Backbone error callbacks where jqxhr is second param
* showNotyError correctly shows JSON error message or name
* Add timeout to showNotyError
 2016-03-03 13:59:17 -08:00
Nick Winter
bada484445 Fix fetchPatchesWithStatus for non-versioned models 2016-03-02 16:19:33 -08:00
Imperadeiro98
defade9824 Merge pull request #3435 from Zeldaretter/patch-1 
Update de-DEcoffee
 2016-03-01 21:26:21 +00:00
phoenixeliot
939265a119 Fix supermodel.trackModel 2016-03-01 10:33:45 -08:00
Matt Lott
9e8e865049 Remove old homepage 
Turning off homepage a/b testing for now, but leaving the plumbing in
because we’ll be iterating on that shortly.
 2016-03-01 09:48:53 -08:00
Yuki Ueda
bfe45cbb88 Update ja.coffee 2016-03-01 20:47:09 +09:00
Matt Lott
19b7fe7295 Remove iOS position from /about careers section 2016-02-29 15:16:09 -08:00
Matt Lott
2e2bf95ff7 Remove classroom MAUs from KPI graphs 
Covered by active classes, and doesn’t make sense to have separate MAU
scales between classroom and campaign.
 2016-02-29 13:58:00 -08:00
Zeldaretter
84f28b15c2 Update de-DEcoffee 
New lines and some typos fixed
 2016-02-29 19:49:05 +01:00
Mario Catuogno
b9379c9984 Update it.coffee 2016-02-29 13:56:37 +01:00
Imperadeiro98
4b20258cef Merge pull request #3432 from MarioCatuogno/patch-1 
Update it.coffee
 2016-02-29 12:44:53 +00:00
Imperadeiro98
5f74bef303 Merge pull request #3431 from mqrelly/master 
Update hu.coffee
 2016-02-29 12:39:11 +00:00
Mario Catuogno
bddf849f1e Update it.coffee 
Tried to translate some new lines to help.
 2016-02-29 02:18:10 +01:00
Matt Lott
e56efe5921 Fix analytics MAUs and campaign paid users 2016-02-28 15:24:35 -08:00
Szabadkia Márk
e81fc634b2 Update hu.coffee 2016-02-28 21:58:17 +01:00
Imperadeiro98
a8f1ca7c7e Fix build 2016-02-28 18:11:59 +00:00
Zeldaretter
1fabe3224e Update de-DEcoffee 
New strings translated into german. Please add this strings soon. Thanks a lot
 2016-02-28 18:41:52 +01:00
Nick Winter
859e127e14 Merge pull request #3422 from blorente/master 
Added some lines for #710
 2016-02-27 16:58:47 -08:00
Imperadeiro98
5c4f9b6947 Small fixes to new-home-view.jade 2016-02-27 08:25:57 +00:00
Imperadeiro98
02a91642fc Merge master 2016-02-27 08:07:59 +00:00
Maikel Langezaal
b2aef32699 Trailling spaces removed, typo fixed and added 1 tag 2016-02-26 23:28:39 +01:00
Nick Winter
a6333cf739 Propagate SpriteParser's auto-insignificant-tween skipping fix to SpriteBuilder too 2016-02-26 11:42:32 -08:00
Matt Lott
1f7489970e Remove auto-refresh from subs dashboard 2016-02-26 10:36:04 -08:00
Scott Erickson
b64a212a17 Merge branch 'master' of https://github.com/Imperadeiro98/codecombat into Imperadeiro98-master 2016-02-26 09:38:09 -08:00
Matt Lott
7bd0936c93 Import approved trial requests into Close.io 2016-02-26 06:21:31 -08:00
Maikel Langezaal
40ed5618b8 Added i18n tags for new HomePage Issue #3413 2016-02-26 11:43:38 +01:00
minwook shin
d816b4388f 2/26 ko update. 2016-02-26 11:59:44 +09:00
Scott Erickson
e7366040f3 Add full screen button to tutorial videos in Safari 2016-02-25 17:13:42 -08:00