Commit graph

4601 commits

Author SHA1 Message Date
Nick Winter
9fc7c4c78a Merge branch 'master' into production 2014-06-20 21:36:11 -07:00
Nick Winter
dde71485bf A bit of cleanup. 2014-06-20 20:52:50 -07:00
Nick Winter
b0eb839cf4 Merge pull request #1193 from kumabotz/remove-coffee-extension
Remove coffee extension
2014-06-20 20:50:11 -07:00
Nick Winter
17366af245 Merge pull request #1188 from a1ip/master
Update ru.coffee
2014-06-20 20:49:19 -07:00
Nick Winter
d8e1fa880c Merge pull request #1181 from djsmith85/patch-1
Update de.coffee
2014-06-20 20:45:27 -07:00
Nick Winter
d3d9908ef2 Merge pull request #1180 from djsmith85/patch-2
Update de-DE.coffee
2014-06-20 20:45:02 -07:00
Nick Winter
0a1199f382 Merge branch 'ProgramadorLucas-patch-1' 2014-06-20 20:41:43 -07:00
Nick Winter
ac0f6e74aa Merged. 2014-06-20 20:41:34 -07:00
Nick Winter
60ca6e46d3 Ooops, that's a function. 2014-06-20 18:45:57 -07:00
Nick Winter
c9dcc290cb Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes. 2014-06-20 17:19:18 -07:00
Dominik Maier
b1f139aaa3 Merge remote-tracking branch 'upstream/master' into feature/upscript 2014-06-20 15:55:56 +02:00
Fergus Leen
88aa8d234c Facebook friends patch 2014-06-20 02:18:40 +01:00
Nick Winter
0d53e603fd Merge branch 'master' into production 2014-06-19 18:17:14 -07:00
Nick Winter
bb8b9b2e93 bid -> makeBid. 2014-06-19 17:27:41 -07:00
Michael Schmatz
34f5377754 Increased infinite loop timeout 2014-06-19 17:16:08 -07:00
Michael Schmatz
40fd1674ad Temporary fix for bid function in hover debugger 2014-06-19 17:09:45 -07:00
Nick Winter
ef855e7bb2 Merge branch 'master' into production 2014-06-19 16:25:25 -07:00
Nick Winter
7b59c42f5d Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps. 2014-06-19 15:41:35 -07:00
thanosme
625750614a Update el.coffee
Added some tranlations with minor corrections
2014-06-20 01:14:30 +03:00
Nick Winter
1e9b403ce5 More zazz for home page code language selection. 2014-06-19 14:55:16 -07:00
Nick Winter
c090103126 Fixed employer email address deliverability issue. 2014-06-19 13:42:51 -07:00
Nick Winter
cf57411b5c Added another logging message for more easily seeing when transpiled code might be misfiring. 2014-06-19 13:42:38 -07:00
Nick Winter
666c020389 Switching code language based on selection now. 2014-06-19 13:42:25 -07:00
Scott Erickson
20589db6be Fixed a bug with logging missing documentation. 2014-06-19 16:15:38 -04:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Michael Schmatz
531001fc7c Merge pull request #1194 from codecombat/master
Master into production
2014-06-19 10:51:14 -07:00
Michael Schmatz
51923459e0 Changed autocomplete to on by default 2014-06-19 10:44:44 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master
Initial Autocomplete Version
2014-06-19 10:10:26 -07:00
Tery Lim
1942b51caf Remove .coffee extension for code consistency 2014-06-19 23:49:11 +08:00
Nick Winter
cb160fa3e9 Merge pull request #1191 from rubenvereecken/quickfix
efficient fetching of level sessions
2014-06-19 08:38:31 -07:00
Tery Lim
6dd7edadd2 Remove coffee extension 2014-06-19 23:38:07 +08:00
Michael Schmatz
1535f36d87 Merge pull request #1192 from codecombat/master
Master into production
2014-06-19 08:36:59 -07:00
Michael Schmatz
a1b7025730 Emergency linkedin hot fix 2014-06-19 08:36:22 -07:00
Ruben Vereecken
a1667a0d5e efficient fetching of level sessions 2014-06-19 17:24:07 +02:00
Nick Winter
aa4832791e Made public version of a user's LevelSessions available via endpoint. 2014-06-19 08:07:47 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Philippe Rigovanov
ebaeac7e80 Some translations 2014-06-19 05:42:15 +04:00
Dominik Kundel
7e8845332e updated Ace minified 2014-06-18 23:27:05 +02:00
Dominik Kundel
69959b6b05 updated Ace 2014-06-18 23:18:58 +02:00
Michael Schmatz
548eaefae1 Add debug variable inspection progress bar 2014-06-18 13:43:04 -07:00
Dominik Kundel
33d68fab6e Merge remote-tracking branch 'upstream/master' 2014-06-18 21:50:55 +02:00
Nick Winter
416cd3b894 Merge branch 'master' into production 2014-06-18 12:06:16 -07:00
Nick Winter
ac6c7292c8 Fixed Gridmancer session linking on profile view. 2014-06-18 12:05:40 -07:00
Dominik Kundel
083a9f6d02 added zatanna to bower 2014-06-18 18:20:34 +02:00
Scott Erickson
50fea7e937 Added a method for returning all requests in mock-ajax. 2014-06-18 12:04:39 -04:00
Scott Erickson
d651885524 Maybe fixing the toggleModal system once and for all. 2014-06-18 12:04:38 -04:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
greyhusky
6fe9623244 Update de-CH.coffee
Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)
2014-06-18 11:09:10 +02:00
Nick Winter
59654da24b Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce. 2014-06-17 22:17:44 -07:00