Commit graph

11388 commits

Author SHA1 Message Date
Matt Lott
f37e2ad93e Update code language usage script 2016-04-01 14:40:18 -07:00
Scott Erickson
b01ab2eab1 Merge pull request #3521 from Kinzeng/master
Thang names
2016-04-01 09:29:26 -07:00
Kevin Zhang
fc41c0c52a added Thang names 2016-04-01 01:12:35 -04:00
Kevin Zhang
8455bb2270 added Thang names 2016-04-01 01:07:39 -04:00
Imperadeiro98
b844fa034e Merge pull request #3520 from Ikuyadeu/patch-1
Update ja.coffee
2016-03-31 20:16:08 +01:00
Matt Lott
918915813f Rewrite updateCloseIoLeads.js
Moving user-specific information from customized fields to activity
notes
Lots of data reformatting and renaming
Lots of perf/readability improvements via async.parallel
2016-03-31 09:23:38 -07:00
Yuki Ueda
08fb5baf17 Update ja.coffee 2016-03-31 18:47:41 +09:00
phoenixeliot
719ff80b2f Ignore .editorconfig and coffeelint.json until we standardize them 2016-03-30 14:25:57 -07:00
Scott Erickson
c2f17edaea Rewrite concurrent prepaid test
This test has been unstable, possibly because it was using one request instance to fire off
requests for many users. Rewrote using generators and multiple request instances with
separate cookie jars. For #3469.
2016-03-30 12:00:12 -07: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
Kevin Zhang
7cf3e77b4c Testing branch commits 2016-03-29 14:18:41 -04:00
Keld Ølykke
87b66747e8 Update da.coffee
Added some glue words to make concatenated sentences flow.
2016-03-29 01:31:12 +02:00
Keld Ølykke
2163dfa115 Update da.coffee
Fixed wrong indentation of courses.length.
2016-03-29 00:56:19 +02:00
Keld Ølykke
c73e0326c8 Merge pull request #1 from KeldOelykke/KeldOelykke-update-da.coffee
Update da.coffee
2016-03-29 00:46:47 +02:00
Keld Ølykke
fbe1a817a9 Update da.coffee 2016-03-29 00:40:19 +02:00
Nick Winter
0c40d7fb65 Make addExternalSubs automatically fill in details for most common payment case 2016-03-28 15:34:33 -07:00
Nick Winter
8e3a7915de No more simulations for Elemental Wars 2016-03-28 15:34:19 -07: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
Nick Winter
2dc4b17b94 Adjust ladder simulations 2016-03-25 20:01:42 -07: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
JurianLock
7b05223037 Update nl-NL.coffee
Reduced some translations so they fit better in the menu.
2016-03-24 15:34:15 +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
Matt Lott
f53d46cb90 🐛Fix missing User reference in trial-requests 2016-03-22 13:57:04 -07:00
Rob
455dd813b1 Add image refrenced by OpenGraph. 2016-03-22 12:47:13 -07:00
Matt Lott
feeabf4f08 Turn off server Slack message unfurling
Also cleaning up some message URL formatting.
2016-03-22 09:51:18 -07:00
Matt Lott
b6ad388828 🐛Parse Slack API response JSON 2016-03-22 09:32:28 -07:00
Imperadeiro98
5676c6b2e4 Add i18n to new level loading strings 2016-03-22 12:02:36 +00:00
Matt Lott
ec50bbab40 Use correct Slack bot profile for server messages 2016-03-21 14:10:26 -07: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