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

11468 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
05e95923c2 Add Carlos to /about 2015-11-02 16:15:43 -08:00
Nick Winter
e245041bed Merge pull request #3154 from Zerrien/master 
Adds Josh Callebaut to the about.jade file.
 2015-11-02 16:11:45 -08:00
Josh Callebaut
f885a0e45d This updates the en.coffee file to account for josh_c's blurb and title. 2015-11-02 16:08:03 -08:00
Josh Callebaut
8b26c8a8b5 Merge remote-tracking branch 'upstream/master' 2015-11-02 16:03:32 -08:00
Scott Erickson
d6b57f0e76 Disabling redeem at once test, as it appears to be causing errors 2015-11-02 15:27:13 -08:00
Josh Callebaut
c0ddbd2df1 Uniquifies the i18n tag for Josh C 2015-11-02 15:26:03 -08:00
Scott Erickson
513c7e7a07 Add POST /db/prepaid/:id/redeemers 2015-11-02 15:23:08 -08:00
Josh Callebaut
05f74a2fcd Adds Josh Callebaut to the about.jade file. 2015-11-02 15:21:05 -08:00
Nick Winter
b1ae9075ff Updated README to include a few new avatars. 2015-11-02 15:19:54 -08:00
Rob
0a603a8e26 Warn people who try to run the headless client, but webworkers didn't install. 2015-11-02 14:20:44 -08:00
Scott Erickson
7a237d27c2 Add redeemers.userID index to prepaids collection 2015-11-02 13:35:47 -08:00
Nick Winter
80ecf1aa1d Make webworker-threads an optional dependency 2015-11-02 13:23:38 -08:00
Scott Erickson
c3735ba0eb Add exhausted property to prepaid model 
It is true when redeemers.length >= maxRedeemers
 2015-11-02 13:06:58 -08:00
Scott Erickson
e98d60fa7d Add jasmine-node to package scripts 2015-11-02 12:50:39 -08:00
Nick Winter
5106bd5390 Fix sortThangComponents corner case in course levels with Plans attaching twice 
Fixes https://app.asana.com/0/54276215890539/62515742172177/f
 2015-11-02 12:35:28 -08:00
Nick Winter
caab006c5e Merge pull request #3149 from dillonforrest/master 
Change visible references of 'HipChat' to 'Slack'.
 2015-11-02 10:32:48 -08:00
snarkota
ce376564a9 Update lt.coffee 2015-11-02 16:55:14 +02:00
Alim
0b156242d9 Add Bahasa Melayu translations for Home 2015-11-01 13:57:19 +08:00
Sigitas Mockus
20017691d3 Update lt.coffee 2015-10-31 19:10:43 +02:00
Imperadeiro98
1cdb598350 Fixes to last merge 2015-10-31 14:06:13 +00:00
Imperadeiro98
02b4b68ccd Merge pull request #3150 from albenarammou/patch-3 
Update bg.coffee
 2015-10-31 14:02:57 +00:00
albenarammou
94cb1075e8 Update bg.coffee 2015-10-31 09:24:05 +02:00
Scott Erickson
fa4355f946 Add programming language to options in course instances 2015-10-30 15:56:43 -07:00
dillon
b5d92d5c26 Change 'Slack' back to 'HipChat' in multicore and server. 2015-10-30 15:26:18 -07:00
Scott Erickson
0da66bd468 Refactor CourseEnrollView to use view in template 2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4 Make redeem coupon network errors on /courses happen within modal 2015-10-30 11:05:24 -07:00
Scott Erickson
429f2c2839 Fix renderSelectors to handle selectors with multiple targets 2015-10-30 11:05:24 -07:00
Nick Winter
da9567f85f Add Wakka Maul to simulation rotation 2015-10-30 09:45:07 -07:00
Nick Winter
504e65ec27 Commit client-side code for acdfe7c 2015-10-30 09:43:05 -07:00
Nick Winter
acdfe7c1c4 Use level instead of levelID for getHistogramData to hit the index we already have 2015-10-30 09:25:58 -07:00
Rob
cea412c0a9 Fix indentation. 2015-10-30 11:16:48 -04:00
Imperadeiro98
6e01f367d9 Fixes to last merge 2015-10-30 14:37:05 +00:00
Imperadeiro98
08e9d682d0 Merge pull request #3143 from RobertLukowski/patch-3 
Update de-DE.coffee
 2015-10-30 14:35:05 +00:00
dillon
493d302a0d Change visible references of 'HipChat' to 'Slack'. 2015-10-30 00:07:58 -07:00
Nick Winter
f100d6dba6 Merge pull request #3118 from codecombat/soffes/ipad 
[WIP] Changes for iPad app
 2015-10-29 16:24:39 -07:00
Rob
e048848d6b Add 50% more room for fingers in the autocomplete box. 2015-10-29 18:16:58 -04:00
Rob
75c63a0ace When pressing enter with an active selection, just make a new line under it. 2015-10-29 18:16:23 -04:00
Imperadeiro98
bf1ef72a15 Merge pull request #3148 from javatlacati/patch-1 
Update es-419.coffee
 2015-10-29 21:42:05 +00:00
Matt Lott
8b254164c9 Free course enrollment for admins 2015-10-29 14:09:19 -07:00
Rob
9b704b5f15 Update vagrant configs. 2015-10-29 16:48:27 -04:00
Scott Erickson
19185db63e Deprecate coco-brunch and coco-dev-server in favor of npm scripts 2015-10-29 13:35:25 -07:00
Scott Erickson
8cde8b2c20 Delete old dev setup scripts 2015-10-29 13:35:25 -07:00
RUSLAN LÓPEZ CARRO
9283492cb8 Update es-419.coffee 
Some already translated strings appear as untranslated :S
 2015-10-29 14:32:15 -06:00
Rob
f0e1fc1f77 Let API properties declare their return values should be captured. 
Auto complete will know when to add a variable asingment.
 2015-10-29 15:07:19 -04:00
Scott Erickson
6a28de7c05 Make sure server tests don't run when production variables are in the environment 2015-10-29 12:05:56 -07:00
Matt Lott
93c51baea0 Add new course 2 campaign to update script 2015-10-29 11:26:37 -07:00
Imperadeiro98
1e18c7f131 Merge pull request #3146 from Imperadeiro98/my-branch 
Updates to i18n
 2015-10-29 16:01:21 +00:00
Nick Winter
426d632ce4 Add Slack status to README 2015-10-29 08:59:20 -07:00
Imperadeiro98
f2ca1dbd63 Updates to i18n 2015-10-29 15:57:22 +00:00
Nick Winter
c29851d470 Update README to point to Slack channel instead of HipChat 2015-10-29 08:41:24 -07:00