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

8328 commits

Author SHA1 Message Date
LawrenceFebs
d83395c4d8 Update it.coffee 2016-04-03 11:40:58 +02:00
Yuki Ueda
476b26fca2 Update ja.coffee 2016-04-02 18:14:30 +09:00
Scott Erickson
b01ab2eab1 Merge pull request #3521 from Kinzeng/master 
Thang names
 2016-04-01 09:29:26 -07:00
Kevin Zhang
8455bb2270 added Thang names 2016-04-01 01:07:39 -04:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09:00
Scott Erickson
43389ac9b6 Merge pull request #3471 from delftswa2016/loggedIn-achievement-error 
Error when accessing achievement without being logged in
 2016-03-30 09:41:01 -07:00
Rob
f10bcd632c Add esper support 2016-03-29 23:27:27 -07:00
Rob
e40b952ef2 Do something slightly better for loged in students. 2016-03-29 21:44:59 -07:00
Imperadeiro98
dfdfbf620c Uncomment an header from sk.coffee 2016-03-29 20:24:55 +01:00
Imperadeiro98
322037f47d Merge pull request #3512 from cundamic/patch-20 
Update sk.coffee
 2016-03-29 20:24:12 +01:00
Imperadeiro98
b65e0d5031 Merge pull request #3511 from cundamic/patch-19 
Update sk.coffee
 2016-03-29 20:23:20 +01:00
Scott Erickson
996200220f Merge pull request #3508 from codecombat/fix-teacher-quote-scroll 
Fix teacher quote page having lots of blank space at the bottom (after submitting the form)
 2016-03-28 11:59:56 -07:00
Scott Erickson
6e16248cd8 Merge pull request #3509 from codecombat/header-avatar 
Add small avatar to header
 2016-03-28 11:17:58 -07:00
cundamic
0b22b6aa93 Update sk.coffee 
Translation new_home finished.
 2016-03-28 19:04:32 +02:00
cundamic
45b9395c3d Update sk.coffee 
Translation new_home II
 2016-03-28 11:39:54 +02:00
UltCombo
8326b5e182 JS beautifier: fix loop construct, fixes #3510 
As JavaScript is the only language supported by the beautifier, and [CodeCombat is in the process of converting things to while (true)](https://github.com/codecombat/codecombat/issues/3510#issuecomment-201965310), I guess adding this quick hack to the view's code should suffice for now. Hopefully, the non-standard `loop` construct will be removed from other languages before they receive beautifier support.

If this doesn't seem good, I can move  this hack to `aether.beautify`, where it is possible to perform this substitution in a language-aware way (i.e. inside Aether's JavaScript implementation's [`beautify` method](418ccf2414/src/languages/javascript.coffee (L137))). Seeing as the `loop` construct is specific to CodeCombat, I'm not sure if that would be a good idea. Passing an options object with a flag to support the `loop` construct seems a bit overkill.

Let me know what works best for you.
 2016-03-28 00:00:40 -03:00
Imperadeiro98
539d0b01cc Update pt-PT.coffee 2016-03-26 21:38:59 +00:00
cundamic
ba2e92043a Update sk.coffee 
translated new _home 1
 2016-03-26 17:48:44 +01:00
cundamic
85b2d42cc6 Update sk.coffee 
tips translations
 2016-03-26 15:49:04 +01:00
Rob Blanckaert
9da65cdcff New homepage variations. 2016-03-25 17:09:58 -07:00
phoenixeliot
0355ea3e1a Add small avatar to header 2016-03-25 16:25:51 -07:00
phoenixeliot
8d254c700a Fix teacher quote page having lots of blank space at the bottom. 
This is due to "flying-focus" taking up space at the bottom of the page. This solution is a bandaid. Ideally we have view-swapping logic that contains this type of thing and we just swap out views using one function.
 2016-03-25 13:57:26 -07:00
Nick Winter
914e7eb487 Propagate i18n 2016-03-25 10:54:28 -07:00
rafaelkan
da01d7fdba Update es-ES.coffee 
Traslate
 2016-03-25 01:25:09 +01:00
Maikel Langezaal
3be8220e0a read only message 2016-03-24 14:10:09 +01:00
Imperadeiro98
87a30b74af Merge pull request #3500 from Ikuyadeu/patch-1 
Update ja.coffee
 2016-03-24 11:21:23 +00:00
Imperadeiro98
5c8d6cc876 Merge pull request #3498 from sake12/master 
update pl.coffee
 2016-03-24 11:19:15 +00:00
Nick Winter
b208fddabb Fix #3484 2016-03-23 15:56:45 -07:00
Nick Winter
00bd983590 Fix #3387 2016-03-23 15:24:38 -07:00
Rob
455dd813b1 Add image refrenced by OpenGraph. 2016-03-22 12:47:13 -07:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Matt Lott
50171a5b02 🐛Fix admin trial requests page 
Server refactoring exposed incorrect server parameters.
 2016-03-21 11:39:15 -07:00
Nick Winter
eec50c8e44 Only collapse collision shapes for walls 2016-03-21 10:57:38 -07:00
Matt Lott
6a4132e057 Update campaign ads test groups 2016-03-21 08:07:22 -07:00
Yuki Ueda
27f5cb5e45 Update ja.coffee 2016-03-21 20:06:09 +09:00
Matt Lott
d1ae4adfbb Merge pull request #3499 from IC-Induja/master 
Added 9 new loading screen comments
 2016-03-20 05:40:17 -07:00
Matt Lott
2bf028cc4a Update /about page team section 2016-03-20 05:30:52 -07:00
IC-Induja
57bd7ab5f8 Update level_loading.jade 2016-03-20 01:20:42 -04:00
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