10847 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rob	846fb987d2	Merge commit '129d3b793d97ea32e6f42b4ca1f33bb0860157e0' into production	2015-12-16 16:46:00 -08:00
Rob	4f6203b1e1	Remove /db from .gitignore	2015-12-16 16:42:31 -08:00
Nick Winter	82ec29247b	Fix error handling callback	2015-12-16 16:39:46 -08:00
Scott Erickson	e1130ff1e8	Clean up legal string interpolation	2015-12-16 16:39:46 -08:00
Scott Erickson	e9b59d62d6	Remove replaced string	2015-12-16 16:39:46 -08:00
Nainufar	5c4e415ead	Update ca.coffee ... more translations	2015-12-16 16:39:46 -08:00
Matt Lott	fa25d12e67	Total managed subscriptions script	2015-12-16 16:39:46 -08:00
Nick Winter	129d3b793d	Add Mandate for modifying simulation throughput on the fly, other things later	2015-12-16 16:39:45 -08:00
Nick Winter	7d7513eb3f	Improvements to buildSchoolGraph to open a spreadsheet	2015-12-16 16:39:45 -08:00
Matt Lott	e0c88cf146	Update campaign analytics scripts	2015-12-16 16:39:45 -08:00
Nick Winter	68f2a169dd	Improve school suggestion rankings	2015-12-16 16:39:45 -08:00
Nick Winter	31eb6e6045	Fix #3017	2015-12-16 16:39:45 -08:00
Aleksey Klimenko	895e9194e4	Translate some lines.	2015-12-16 16:39:45 -08:00
Nick Winter	a9b800251e	Some buildSchoolGraph improvements	2015-12-16 16:39:45 -08:00
RUSLAN LÓPEZ CARRO	938744a580	Update es-419.coffee	2015-12-16 16:39:45 -08:00
Scott Erickson	3f6afa6580	Interpolate discount in year sub description	2015-12-16 16:39:45 -08:00
Scott Erickson	96e6920722	Update some copy to use db products	2015-12-16 16:39:44 -08:00
Scott Erickson	ef3f847932	Remove SubscriptionSaleView	2015-12-16 16:39:44 -08:00
Scott Erickson	a28e7bde2c	Update tests for db products, some cleanup	2015-12-16 16:39:44 -08:00
Nick Winter	0eecda7b40	Fix logged-in /schools call to action	2015-12-16 16:39:44 -08:00
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