Nick Winter
|
995459e1d5
|
Merge pull request #3156 from Imperadeiro98/some-updates
Remove a lot of unused strings
|
2015-11-05 08:25:32 -08:00 |
|
Rob
|
fcf0bc85fe
|
Don't allow loading users sessions for non premium dashboards.
Hoist memberLimit variable
Don't sort member's on the server side, let the client handle it
Use mongo limits instead of breaking server side.
|
2015-11-04 17:01:05 -08:00 |
|
Rob
|
cde3b252da
|
Don't load user sessions on non premium dashboards.
|
2015-11-04 16:57:48 -08:00 |
|
Scott Erickson
|
00ce821939
|
Add InviteToClassroomModal, begin join class in StudentCoursesView
|
2015-11-04 16:54:13 -08:00 |
|
Rob
|
75532e3a79
|
Use generated member count instead of pulling a list of all members from mongo when we get the public clans list.
|
2015-11-04 16:00:54 -08:00 |
|
Scott Erickson
|
222b0b28e1
|
Adjust POST /db/classroom/:id/members to not need an actual id
Since students need to be able to join with just the code.
|
2015-11-04 15:33:19 -08:00 |
|
Imperadeiro98
|
424bea90b6
|
Reverted resources strings removal
|
2015-11-04 22:44:46 +00:00 |
|
Nick Winter
|
6cd846a39c
|
Merge branch 'master' into production
|
2015-11-04 14:04:30 -08:00 |
|
Imperadeiro98
|
89521e2dbe
|
Remove a lot of unused strings
|
2015-11-04 21:45:15 +00:00 |
|
Nick Winter
|
34715befcc
|
Increment user's concept stats on level completion
|
2015-11-04 13:42:09 -08:00 |
|
Rob
|
45e5e975f1
|
Uglify in //
|
2015-11-04 13:41:13 -08:00 |
|
Scott Erickson
|
9a2bfee5a7
|
Add GET /db/classrooms?ownerID=:id to server endpoints
|
2015-11-04 12:41:13 -08: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 |
|
Scott Erickson
|
66432990f4
|
Add framework for new courses pages
|
2015-11-03 16:41:06 -08:00 |
|
Nick Winter
|
964b3f534c
|
Remove Bloc offer
|
2015-11-03 15:45:05 -08:00 |
|
Scott Erickson
|
aafdce6fbe
|
Add POST /db/classroom/:id/invite-members
|
2015-11-03 14:46:13 -08:00 |
|
Scott Erickson
|
0e2305bc3d
|
Add POST /db/course_instance/:id/members
|
2015-11-03 14:00:51 -08:00 |
|
Scott Erickson
|
429f50e1c6
|
Untie CourseInstance creation from prepaids, tie them to classrooms instead
|
2015-11-03 11:18:44 -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 |
|
Scott Erickson
|
27d423a410
|
Add Classroom server model and endpoints
|
2015-11-02 17:07:23 -08:00 |
|
Nick Winter
|
7d14758854
|
Merge branch 'master' into production
|
2015-11-02 16:16:01 -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 |
|
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 |
|