67 commits

Author	SHA1	Message	Date
laituan245	a588a3b2c8	Some updates to the PR #2359	2015-02-25 02:12:39 +09:00
Matt Lott	f6bcc94bf8	Fix oneTimes email schema ... Changing ‘targetEmail’ field to ‘email’.	2015-02-06 09:47:06 -08:00
Matt Lott	c842f45786	Update subscribe modal with parent help button	2015-02-04 13:54:38 -08:00
Scott Erickson	d0ee8cb7c7	Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.	2014-12-04 17:41:27 -08:00
Scott Erickson	7025f0a488	Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up.	2014-12-04 11:56:14 -08:00
Scott Erickson	cd3bb690f4	Created stripe subscription logic.	2014-12-02 20:02:35 -08:00
Scott Erickson	5dcdabfd62	Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.	2014-12-02 11:47:15 -08:00
Michael Schmatz	f84e92595b	Changed UDID to identifierForVendor	2014-11-20 20:03:24 -05:00
Scott Erickson	a18537b065	Added the ability to assign a user an iOS UDID, and login with it.	2014-11-20 15:54:15 -08:00
Scott Erickson	95dca575d1	Set up stripe on the server and site to allow purchases through the website.	2014-11-17 15:15:08 -08:00
Scott Erickson	33d14918b0	Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed.	2014-11-03 20:48:59 -08:00
Nick Winter	98fed4a277	Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.	2014-09-26 02:29:04 -07:00
Nick Winter	61aa2d8b6f	Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.	2014-09-25 13:29:20 -07:00
Nick Winter	a57cc0126e	A few more tweaks for #1584. Hero victory now always goes to world map.	2014-09-23 17:13:41 -07:00
David Beckley	2acebb54c6	Fix #1005	2014-09-21 23:02:06 -07:00
Nick Winter	ae14bd1ced	Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564.	2014-09-20 15:18:21 -07:00
Scott Erickson	f1bf160755	Fixed merge conflict.	2014-08-26 15:42:03 -07:00
Scott Erickson	5d804c6d9a	Fixed merge conflict.	2014-08-26 15:41:59 -07:00
Nick Winter	741139db59	Apparently GitHub ids are integers, not strings.	2014-08-26 11:34:33 -07:00
Scott Erickson	f92a665b8b	Merge conflicts.	2014-08-26 09:53:04 -07:00
Nick Winter	832402af6e	Merged/tweaked GitHub login.	2014-08-26 08:37:11 -07:00
Scott Erickson	1c5db3f2b7	First round of getting the site to use the new defaults system, in particular the job profile view.	2014-08-23 11:07:52 -07:00
Ruben Vereecken	40818fd7bc	GitHub Login implemented	2014-08-15 16:20:45 +02:00
Ruben Vereecken	871149b2bc	Rechecked and added cool stuff for achievements	2014-07-30 22:23:43 +02:00
Ruben Vereecken	30a6cf1cca	Merged in name changes from master	2014-07-29 17:28:13 +02:00
Ruben Vereecken	cde87e4fe5	Covered general patches with tests	2014-07-23 20:00:28 +02:00
Michael Schmatz	f100c4ebbe	Add filter alerts to employer page	2014-07-21 16:10:02 -07:00
Michael Schmatz	e8ffb8980f	Removed filterActive from filter alerts	2014-07-21 14:47:44 -07:00
Michael Schmatz	735a7082ee	Correction to filter schema	2014-07-21 10:01:49 -07:00
Michael Schmatz	6bc436aec2	Added saved employer filter alerts to schema	2014-07-21 09:44:40 -07:00
Ruben Vereecken	1c6da9711b	Added the Recently Played collection and endpoint	2014-07-21 14:36:10 +02:00
Michael Schmatz	bb3c583300	Add approved date to job profile	2014-07-16 10:51:45 -07:00
Ruben Vereecken	9c0353a2f0	Merged in master	2014-07-13 21:18:32 +02:00
Ruben Vereecken	ac95d775e6	Users can now be gotten by slug	2014-07-09 20:23:05 +02:00
Michael Schmatz	08b9a8fdaa	Various changes to education filter	2014-07-07 21:04:12 -07:00
Michael Schmatz	30745a25ca	Consolidated iOS and Android into Mobile	2014-07-07 20:24:29 -07:00
Michael Schmatz	285c7ff049	Added school changes to schema	2014-07-07 20:05:28 -07:00
Michael Schmatz	cef8fe074a	Add mobile developer to the schema	2014-07-07 20:03:02 -07:00
Michael Schmatz	30671d82f6	Removed PM and Management from filters	2014-07-07 19:52:31 -07:00
Michael Schmatz	05560662dd	Various fixes to employer page/profile view	2014-07-07 19:34:36 -07:00
Michael Schmatz	0305374580	Add featured field to curation	2014-07-07 10:42:16 -07:00
Ruben Vereecken	51bc8e5a7c	Merged master	2014-07-06 20:07:47 +02:00
Ruben Vereecken	601c4e2731	Merged with master	2014-07-05 16:47:16 +02:00
Tery Lim	a5476f90ed	Minor cleanup for convention and readability	2014-07-05 18:48:08 +08:00
Ruben Vereecken	fce9f0031b	All edits are now tracked ... intermediate intermediate	2014-07-04 19:27:38 +02:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Michael Schmatz	e54b190918	Added shortDescription	2014-07-03 10:02:42 -07:00
Michael Schmatz	1adefbb3b6	Update user schema (to avoid cherry picking)	2014-07-02 11:50:44 -07:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Michael Schmatz	2dd4ba6203	Increased max skills from 30 to 40	2014-06-30 16:43:31 -07:00