Imperadeiro98
|
89521e2dbe
|
Remove a lot of unused strings
|
2015-11-04 21:45:15 +00:00 |
|
Matt Lott
|
722540f3be
|
Remove old user analytics page
|
2015-11-04 10:59:10 -08:00 |
|
Matt Lott
|
d445024cb6
|
Add admin analytics page with MAUs
Includes updating analytics insert script used to inject aggregated
data into production database.
|
2015-11-04 10:59:10 -08:00 |
|
Scott Erickson
|
d987b644a9
|
Merge remote-tracking branch 'origin/master'
|
2015-11-04 10:54:59 -08:00 |
|
Nick Winter
|
02e32755b1
|
Delete singlecore.coffee
|
2015-11-04 10:53:50 -08:00 |
|
Scott Erickson
|
7752757888
|
Merge branch 'JordanLittell-email-validation'
|
2015-11-04 10:53:47 -08:00 |
|
Scott Erickson
|
669ab416e5
|
Fix SubscriptionView to keep emails when emails are erroneous
|
2015-11-04 10:52:47 -08:00 |
|
Scott Erickson
|
05bd12e8cc
|
Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
# Conflicts:
# app/views/account/SubscriptionView.coffee
|
2015-11-04 10:47:39 -08:00 |
|
Nick Winter
|
1b4f6262cb
|
Exclude non-selected code language documentation blocks from level guides
|
2015-11-04 10:46:16 -08:00 |
|
Nick Winter
|
0caf9c3547
|
Fix avatars not showing up in HUD.
Asana 54271591170319
|
2015-11-04 10:26:54 -08:00 |
|
Imperadeiro98
|
dbd9e325d4
|
Merge pull request #3155 from mads232/patch-2
Update da.coffee
|
2015-11-04 18:04:24 +00:00 |
|
Imperadeiro98
|
b0908524c4
|
Merge pull request #3153 from snarkota/patch-4
Update lt.coffee
|
2015-11-04 17:52:58 +00:00 |
|
Imperadeiro98
|
81e68ca795
|
Merge pull request #3152 from abdalim/msmy-home
Add Bahasa Melayu translations for Home
|
2015-11-04 17:50:45 +00:00 |
|
Imperadeiro98
|
7dacacf232
|
Merge pull request #3151 from poshus1984/patch-1
Update lt.coffee
|
2015-11-04 17:50:11 +00:00 |
|
Rob
|
361b5229e6
|
Use an newer, official build of ace instead of just copying the files into our source tree.
|
2015-11-03 17:33:35 -08:00 |
|
Nick Winter
|
964b3f534c
|
Remove Bloc offer
|
2015-11-03 15:45:05 -08:00 |
|
Rob
|
a2feec730c
|
Add npm script to start mutlicore server.
|
2015-11-03 10:30:39 -08:00 |
|
mads232
|
841412a87d
|
Update da.coffee
|
2015-11-03 18:43:55 +01:00 |
|
Nick Winter
|
6773f1e876
|
Check all languages instead of just first for country servers
|
2015-11-03 09:42:17 -08:00 |
|
Nick Winter
|
c6bb5b5329
|
Improve indexing for /editor/level and editor/thang
|
2015-11-03 09:32:59 -08:00 |
|
Rob
|
3dae9aac88
|
Add env var to put brunch in production mode.
|
2015-11-02 19:04:38 -08:00 |
|
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 |
|
Josh Callebaut
|
c0ddbd2df1
|
Uniquifies the i18n tag for Josh C
|
2015-11-02 15:26:03 -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 |
|
Nick Winter
|
80ecf1aa1d
|
Make webworker-threads an optional dependency
|
2015-11-02 13:23:38 -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 |
|