Commit Graph

25 Commits

Author SHA1 Message Date
Miles Gould
2421126825 Put locations in geolocated_member factory names. 2013-04-25 23:27:52 +01:00
Skud
efb3c1cf50 Added a display of interesting members to the homepage.
Also merged in the latest dev (hence some minor changes to non-homepage,
non-member stuff).  I think I messed up the merge a bit :-/
2013-04-02 13:59:34 +11:00
Skud
05d1a8807a moved Member.confirmed to a scope 2013-03-31 20:28:29 +11:00
gnattery
886c57b908 sort members by login name 2013-03-20 14:57:09 +11:00
Joseph Caudle
ddf29d6a21 Merge branch 'restrict_usernames' into dev
* restrict_usernames:
  make login names remember case (so I can have Skud)
  Added validations for member names:

Conflicts:
	spec/factories/member.rb
2013-03-18 08:11:40 -04:00
Skud
68a36310b7 make login names remember case (so I can have Skud)
... but don't let anyone take "skud" if I'm "Skud"

don't allow 'staff' as a login_name either
2013-03-18 20:48:06 +11:00
Skud
5378e7344d Added validations for member names:
2-25 chars long
alphanumeric and underscores only
disallowed: "growstuff", "admin", "moderator"

removed everything that was there to handle/truncate long usernames
since it's no longer needed.
2013-03-18 17:36:54 +11:00
Skud
84a730ddcb limit crop wrangling to crop wranglers 2013-03-18 17:02:22 +11:00
Skud
3c0e467da1 prettified signed-in homepage; tests still needed 2013-03-05 22:20:13 +11:00
Joseph Caudle
9e29aec14a Merge branch 'dev' into unique_usernames
* dev: (28 commits)
  Upgrade bootstrap by running `rails g bootstrap:install`
  added .to_i to times to attempt to pass tests on travis
  stubbed Time.now to prevent test failures
  Added friendly IDs for forum and role
  General prettification and making it look nice.
  show forum name in post meta
  Added a rake task to create an admin user.
  hooked roles up to cancan
  Added roles, but haven't yet hooked them up to CanCan
  PT story 41985889, Hides 'new garden' tab on other member's pages
  Add forums to top nav
  Display posts in summary on forum page
  tests for markdown
  post in (or not in) a forum
  prettifying forum views
  added associations between forums, posts, and members
  rails g scaffold Forum
  Rearranging password fields
  Attempted rearranging settings page, broke something
  Upgrade to Rails 3.2.12, after *another* security flaw.
  ...

Conflicts:
	spec/models/member_spec.rb
2013-02-21 22:19:45 -05:00
Joseph Caudle
434d06ad83 Add test to ensure uniqueness of login_name 2013-02-21 22:08:25 -05:00
Joseph Caudle
728f8ec9ce Update factory for members and specs about members
We have added a sequence for login_name which is similar to the one for
emails in which the member name is incremented each time a new member is
saved.

In addition, we have updated all specs which asked for an explicit
login_name of member1 to use a regex looking only for member and some
digit.
2013-02-21 21:57:39 -05:00
Skud
f12941576c hooked roles up to cancan
Now only admins can create/edit forums, or mess with roles.

To add an admin user:

rails c
m = Member.find('skud')
r = Role.create(:name => 'admin')
r.members << m

We'll have to do this on the server to bootstrap the admin stuff.
Though actually, we should really write a rake task to generalise this.
2013-02-20 14:53:11 +11:00
Skud
0bc2ff25fe Added roles, but haven't yet hooked them up to CanCan 2013-02-19 12:29:22 +11:00
gnattery
de85a6dcce added associations between forums, posts, and members 2013-02-13 15:17:40 +11:00
Skud
192196ae8e added map to profile.
also making sure lat/long are zeroed if location is blanked
2013-02-12 22:38:48 +11:00
Skud
c50a652eb7 geocode locations when saved, using google API 2013-02-12 11:36:33 +11:00
Skud
93edede4da Merged from mistaken branch on G/g 2013-02-08 16:11:38 +11:00
Skud
363502a807 add show_email field to members 2013-02-06 16:25:17 +11:00
gnattery
6da3e4fae5 Added associations and tested them 2013-02-06 15:20:44 +11:00
Skud
501cad39f9 Plantings now show up on members and gardens pages 2013-01-17 15:12:37 +11:00
Skud
8da9a13eae Changed garden.member_id to garden.owner_id 2013-01-13 21:29:28 +11:00
Skud
df76f2497a renamed Post.member_id to Post.author 2013-01-13 20:57:28 +11:00
Skud
689448f87c renamed Member.username to login_name 2013-01-13 19:14:46 +11:00
Skud
657ccf7cd8 s/users/members/g -- models and tests for them 2013-01-13 17:24:46 +11:00