34 Commits

Author	SHA1	Message	Date
Skud	45935c6e38	connect to flickr	2013-04-30 23:01:18 +10:00
Skud	c6f34d387a	Merge pull request #185 from attlebish/fix-email-formatting ... Fix email formatting	2013-04-28 23:30:25 -07:00
Lilly	c0c7b5f93c	Added full stop to end of link to gravatar.com	2013-04-29 16:16:20 +10:00
Skud	2418be18d3	added connections to settings page, fixed tests	2013-04-18 23:41:04 +10:00
Samuel Cochran	41135f3869	Fix some email formatting issues	2013-04-15 11:32:26 +10:00
Lilly	5ae524baad	Put avatar on settings page with link to gravatar.com	2013-04-04 13:59:05 +11:00
Skud	7be6ee3d69	a few small tweaks to email notification views	2013-03-27 23:53:54 +11:00
Miles Gould	bba8b1b092	Added email notification checkbox to settings	2013-03-27 12:26:29 +00:00
Skud	dcd7df7f47	Made the password reset email friendlier. ... Also did the same for the unlock instructions, while I was in there.	2013-03-26 19:26:29 +11:00
Skud	cc987b443f	fixes the blank form when resetting password	2013-03-26 16:00:55 +11:00
Cesy Avon	f3cb251180	Merge branch 'standardise_buttons' of https://github.com/phazel/growstuff into dev	2013-03-24 01:56:24 -07:00
Skud	b4faba7182	various tweaks based on comments on phazel's work	2013-03-21 12:37:57 +11:00
gnattery	d26b3d42ed	standardise button styles	2013-03-21 00:37:46 +11:00
Skud	e3a33a66cb	add more verbiage to confirmation email	2013-03-20 17:27:42 +11:00
gnattery	f6ad4fec75	Rearranging password fields	2013-02-13 12:14:36 +11:00
Gnat	41fcc5bd06	Attempted rearranging settings page, broke something	2013-02-13 12:14:36 +11:00
Skud	879bf0ca2c	add location fields to member settings page	2013-02-12 11:45:26 +11:00
Skud	d5327ebbf3	show_email checkbox on settings page	2013-02-06 16:31:11 +11:00
Skud	9b458070e0	Settings form now works (and is prettified) ... Had to add some Devise crud based on advice on their wiki, otherwise you couldn't change your settings without changing your password. Also had to make a hidden field for tos_agreement. I don't really love it but nobody seems to be able to recommend a better way.	2013-02-06 15:54:43 +11:00
Skud	dfac54d936	Added hidden TOS field to edit settings page so it works	2013-02-06 15:31:14 +11:00
Skud	e5d380729e	we more or less have a settings page. doesn't WORK though.	2013-02-06 12:46:45 +11:00
Maia Sauren	5d362a8882	made login page look like the signup page	2013-01-28 22:01:07 +11:00
Skud	689448f87c	renamed Member.username to login_name	2013-01-13 19:14:46 +11:00
Gnat	e39ec4c5f8	Added Tos field to the signup form	2012-12-03 05:02:35 +00:00
Gnat	9f1adae238	Made the signup form look better using bootstrap	2012-12-03 04:17:37 +00:00
Skud	140852afed	You can now reconfirm using email or username. ... Also, cleaned up the standard devise links that show up everywhere, removing signup/signin as they duplicate what's in our header.	2012-10-06 14:53:50 +01:00
Skud	617feb457e	Make email work in production	2012-10-06 13:42:16 +01:00
Miles Gould	622ddf620a	Refactor h2s into content_for :title ... Now the alert and notice are shown below the subtitle, and the browser title bar tells you something useful.	2012-10-02 11:32:56 +01:00
Miles Gould	25a0c0caeb	Finish Hamlifying Devise-generated views.	2012-09-14 23:47:49 +01:00
Miles Gould	318a0afb35	HAMLify some pages.	2012-09-13 17:02:36 +01:00
Cesy Avon	0c3bcbdb1e	HAML-ify new session	2012-09-12 11:52:38 -07:00
Miles Gould	583d075ce5	Port passwords forms to HAML.	2012-09-09 21:26:05 +01:00
Skud	dcd4f79bdc	You can now login using either username or email	2012-09-03 12:38:58 +01:00
Skud	89cb3c276f	added devise and rspec, set up very basic login/signup links on homepage	2012-09-03 10:49:45 +01:00