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
..
account-prepaid-view.sass	Refactor PrepaidView to use new event callback naming guideline	2015-10-21 14:16:44 -07:00
account-settings-view.sass	Some styling updates to account-settings-view.sass	2015-03-17 18:57:16 +00:00
invoices-view.sass	Add custom payments	2015-03-04 15:40:53 -08:00
main-account-view.sass	Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit.	2014-11-25 10:39:53 -08:00
profile-view.sass	Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views.	2014-11-29 15:31:56 -08:00
subscription-sale-view.sass	Extend terminal sub with year sub purchase	2015-08-27 09:45:10 -07:00
subscription-view.sass	1. email validation when subscribing other users	2015-10-08 21:59:12 -07:00
unsubscribe-view.sass	Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views.	2014-11-29 15:31:56 -08:00