10751 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Barry	22022c1ef1	Fixed small merge issue for real this time	2015-12-10 19:29:02 -05:00
Barry	e6787c0fd2	Resolved small merge issue	2015-12-10 19:27:54 -05:00
Barry	3db216a341	Fetched from master repo	2015-12-10 19:25:42 -05:00
Nick Winter	a7b4a15253	Merge branch 'master' into production	2015-12-10 14:51:43 -08:00
Nick Winter	4458a57771	Save our MongoDB oplog	2015-12-10 14:51:34 -08:00
Imperadeiro98	c71975fd40	Merge pull request #3256 from javatlacati/patch-1 ... Update es-419.coffee	2015-12-10 21:25:33 +00:00
Matt Lott	3f9870b96e	Merge branch 'master' into production	2015-12-10 13:02:45 -08:00
Matt Lott	920444fa83	Merge branch 'master' into production	2015-12-10 12:27:08 -08:00
Scott Erickson	7e24cda7f8	Redirect logouts to /hoc always for now ... Generic solution to replace commit 77a8347. Will have all redirects go to / once HoC is over.	2015-12-10 12:26:03 -08:00
Matt Lott	0c34d06e70	🐛Remove join class refresh	2015-12-10 12:22:48 -08:00
Matt Lott	7f280a1b56	Remove submitted trial request hipchat msgs	2015-12-10 11:22:04 -08:00
Nick Winter	4a04a48f42	Got rid of testing ending line for indent visualizer	2015-12-10 11:11:12 -08:00
Nick Winter	67ac55de7f	Implement #3255 in the i18n tags instead	2015-12-10 10:57:24 -08:00
RUSLAN LÓPEZ CARRO	9ffd79f31d	Update es-419.coffee	2015-12-10 11:53:34 -06:00
Nick Winter	77a09c86e0	Merge branch 'master' into production	2015-12-10 09:06:58 -08:00
Nick Winter	608d45ba70	Don't do undefined slug collection scans	2015-12-10 09:05:34 -08:00
Scott Erickson	24aa11903f	Remove jasmine-node and jasmine-spec-reporter from package.json	2015-12-09 16:26:57 -08:00
Scott Erickson	d684ffd2bc	Deprecate old server test bin commands	2015-12-09 16:24:05 -08:00
Matt Lott	a3544ef417	Merge branch 'master' into production	2015-12-09 14:51:26 -08:00
Scott Erickson	23e3821e24	Switch from jasmine-node to jasmine, run server tests on a single process ... This collapses the difference between master and single-process-server-tests, to remove some larger fixtures files that were in that feature branch.	2015-12-09 14:27:10 -08:00
Scott Erickson	96c5a1a69a	Fix brunch build	2015-12-09 12:26:53 -08:00
Nick Winter	2db3145e19	Fix Mongoose 4 update change the right way for completing level achievement calculations	2015-12-09 12:08:16 -08:00
Nick Winter	7269dc85d4	Update our updates' callbacks' argument signature for Mongoose 4	2015-12-09 11:56:18 -08:00
Nick Winter	163a701188	Aad a schoolName index for later querying of our top schools	2015-12-09 11:55:46 -08:00
Nick Winter	0539f796a7	buildSchoolGraph script working well	2015-12-09 11:55:03 -08:00
Nick Winter	7076a23fe2	Merge pull request #3252 from themaka/staff-update ... Updating About page to include me	2015-12-09 08:45:21 -08:00
Maka	a11a7c38d4	Added maka_blurb + maka_title to en.coffee	2015-12-09 08:13:03 -08:00
Nick Winter	70c90d9bb5	Propagate i18n	2015-12-09 06:58:33 -08:00
Nick Winter	591749de15	Fix some button child click and duplicate tag issues with e284ec79	2015-12-09 06:57:33 -08:00
Nick Winter	0945e3ee90	Merge pull request #3250 from Imperadeiro98/master ... Courses i18n	2015-12-09 06:34:13 -08:00
Nick Winter	8230004962	Merge branch 'master' into production	2015-12-09 06:23:14 -08:00
Nick Winter	453c5759cc	Add simulation throughput counter	2015-12-09 06:22:40 -08:00
Imperadeiro98	475966fde7	Merge pull request #3254 from micman73/patch-6 ... Update el.coffee	2015-12-09 13:46:03 +00:00
micman73	df8658ced5	Update el.coffee	2015-12-09 15:39:32 +02:00
Maka	31a508842e	Updating About page to include me	2015-12-08 23:56:57 -08:00
Maka	6bc8fe08b2	Adding Browserstack to our web page as we promised	2015-12-08 21:38:28 -08:00
Nick Winter	324b2bca47	Add referrer grouping, trying to make it remember progress and run quickly	2015-12-08 17:17:33 -08:00
Matt Lott	041ca8ec3e	Update teacher guide course 1 pdf	2015-12-08 16:37:24 -08:00
Matt Lott	5a584b6325	Merge branch 'master' into production	2015-12-08 16:24:13 -08:00
Matt Lott	0254ca6bb7	Update course thumbnails	2015-12-08 16:23:40 -08:00
Matt Lott	5975bed348	Update teacher survey count script	2015-12-08 16:16:37 -08:00
Matt Lott	5ea9b6e8af	Update trial requests to be type course	2015-12-08 16:16:02 -08:00
Matt Lott	745b905813	Update HoC survey mail end date to a string	2015-12-08 15:23:35 -08:00
Matt Lott	8269113efc	Add paid access end date to HoC approved survey mail	2015-12-08 15:16:28 -08:00
Nick Winter	ce9127c7f6	More progress on school graph script.	2015-12-08 14:42:33 -08:00
Matt Lott	238cccd00a	Merge branch 'master' into production	2015-12-08 14:24:56 -08:00
Matt Lott	cf1637ba01	Add reference poster pdf	2015-12-08 14:24:39 -08:00
Matt Lott	f64f209c99	Latest class owners script	2015-12-08 14:24:39 -08:00
Rob	24a43f2be8	Don't show visual indent for comment ace things are blocks.	2015-12-08 14:20:23 -08:00
Imperadeiro98	95efdcac1c	Added a line I removed	2015-12-08 20:58:53 +00:00