Commit Graph

59 Commits

Author SHA1 Message Date
Cesy
12a1484a26 Merge pull request #800 from CloCkWeRX/fix_all_checkbox_labels
Fix more checkbox labels in registration and email editing
2015-08-11 09:51:05 +01:00
Daniel O'Connor
97cf1347d5 Fix clickable area for checkboxes in email editing 2015-08-11 13:45:47 +09:30
Daniel O'Connor
367e298d48 Fix clickable area for checkboxes in registration 2015-08-11 13:44:17 +09:30
Daniel O'Connor
b788cb44ef Remember that we're working in haml, not slim. 2015-08-11 10:23:50 +09:30
Daniel O'Connor
f61e2438e8 Style checkbox for 'remember me' and allow it to be clickable (minor usability/mobile UI annoyance) 2015-08-10 16:08:09 +09:30
Skud
4a62add88e Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
Conflicts:
	spec/models/planting_spec.rb
2014-09-28 15:32:53 +10:00
Skud
1b1f1d33e0 Add planting reminder checkbox to email settings 2014-09-28 14:35:32 +10:00
Skud
919cc45d13 Merge pull request #401 from Skud/moreb3
Quick and dirty fix for layout of settings tabs
2014-09-01 23:06:55 +10:00
Skud
0687625049 Quick and dirty fix for layout of settings tabs 2014-09-01 22:30:08 +10:00
Skud
474b56cf6b Updated devise tokens in emails for devise 3.2 2014-08-31 17:54:07 +10:00
Skud
e3627f6dcd Fixed devise forms to make them b3ish and pretty 2014-08-29 10:02:56 +10:00
Skud
f02f2ae77e b3ify the signup/signin pages 2014-08-11 14:49:05 +10:00
Skud
561b7c45ac b3ify and improve design of edit profile page 2014-08-11 14:42:00 +10:00
Amy Hendrix
db9ef0bc83 Full-width form elements 2014-07-13 20:28:20 -04:00
Amy Hendrix
b7fbe60b83 Bootstrap3: form control groups 2014-07-13 18:45:56 -04:00
Skud
2cd5b1d2ed Changed one config setting (site name) over to figaro
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
2014-04-29 12:57:16 +10:00
Skud
411c5bcd04 split the difference: pre-checked newsletter signup + friendly text 2013-08-27 23:09:15 +10:00
Skud
1433a51b91 Add text to show we're lovely people and not spammers 2013-08-27 22:54:30 +10:00
Skud
290535b557 Add newsletter subscription checkbox 2013-08-27 21:22:35 +10:00
Skud
5a87ecfeeb Merge branch 'dev' of https://github.com/Growstuff/growstuff into location-autocomplete 2013-08-22 15:09:31 +10:00
martyhines
07efe0dc8d Added bio to the member profile 2013-08-08 22:18:18 -04:00
martyhines
80b628ed89 Add autocomplete=off to location field 2013-08-08 20:58:00 -04:00
Skud
1c7a81cd2b added some nicer wording to signup form 2013-08-07 13:21:27 +10:00
Skud
40c734a8b5 fixed(?) firefox bug with email address in location field 2013-08-05 11:14:30 +10:00
Skud
c227c11794 Added flickr icon, updated twitter icon 2013-05-14 22:33:55 +10:00
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