11027 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nainufar	b9304f2350	Update ca.coffee ... Some translations more.	2015-12-16 16:39:44 -08:00
Nick Winter	9821195ec9	Turn off HoC homepage play redirect	2015-12-16 16:39:44 -08:00
Nick Winter	b39883209c	Remove a couple server logs	2015-12-16 16:39:44 -08:00
RUSLAN LÓPEZ CARRO	a91dc6d812	Update es-419.coffee	2015-12-16 16:39:43 -08:00
Nick Winter	3981c8887d	Parse numeric arguments in admin query condition URLs	2015-12-16 16:39:43 -08:00
Matt Lott	d369c0b47c	Update /schools contact us button styling	2015-12-16 16:39:43 -08:00
Matt Lott	8837d042ab	Update /schools fonts	2015-12-16 16:39:43 -08:00
Matt Lott	646aa56716	/schools page	2015-12-16 16:39:43 -08:00
Nick Winter	5cbb61c261	Change /about address to our office	2015-12-16 16:39:43 -08:00
Scott Erickson	59fcb22d01	Deprecate managed subscriptions, disallowing new ones	2015-12-16 16:39:43 -08:00
Scott Erickson	7c516c4d9f	Move product information to the db	2015-12-14 11:10:50 -08:00
Matt Lott	ae1621ea09	Update analytics aggregation to process classrooms	2015-12-13 15:35:53 -08:00
Imperadeiro98	9a1298a475	Merge pull request #3261 from Nainufar/patch-2 ... Update DiplomatView.coffee	2015-12-13 21:30:58 +00:00
Nainufar	16033f2a5e	Update DiplomatView.coffee	2015-12-13 22:28:48 +01:00
Imperadeiro98	64fbb373bd	Merge pull request #3259 from Nainufar/patch-1 ... Update ca.coffee	2015-12-13 21:01:26 +00:00
Imperadeiro98	61c8343fb5	Merge pull request #3260 from micman73/patch-7 ... Update el.coffee	2015-12-13 18:32:33 +00:00
micman73	f793e58a71	Update el.coffee ... Additions to cover hour of code section	2015-12-13 19:40:37 +02:00
Nainufar	a3a65e090e	Update ca.coffee ... some more translations and some corrections	2015-12-13 18:04:23 +01:00
Matt Lott	03bc785201	Merge branch 'master' into production	2015-12-12 13:16:38 -08:00
Matt Lott	939fd6865b	Update /courses default code language shown	2015-12-11 16:00:36 -08:00
Scott Erickson	d081f7553d	Fix FacebookHandler and its test	2015-12-11 15:39:07 -08:00
Scott Erickson	703671940f	Make Facebook login only happen when user explicitly clicks to do so	2015-12-11 14:47:42 -08:00
Scott Erickson	71bca28148	Have level list in CourseDetailsView include play buttons up through the last level completed and any levels started	2015-12-11 12:59:53 -08:00
Nick Winter	6d5d3d1091	Merge pull request #3258 from MonkStrom/master ... [Issue #2426]New account page layout	2015-12-11 10:14:21 -08:00
Nick Winter	c242317d91	Enhance logging for bad PUTs with 'undefined' slug ids	2015-12-11 10:09:53 -08:00
Imperadeiro98	70ed07e558	Update pt-PT.coffee	2015-12-11 12:59:39 +00:00
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