Commit Graph

47 Commits

Author SHA1 Message Date
Skud
e4dd0cba5b added flickr link to profile page 2013-04-30 23:07:21 +10:00
Miles Gould
70fa93ab42 Replace tabs with spaces. 2013-04-26 14:27:35 +01:00
Miles Gould
38246bd00b Add a dropdown to select units on members/nearby. 2013-04-25 23:48:25 +01:00
Miles Gould
2421126825 Put locations in geolocated_member factory names. 2013-04-25 23:27:52 +01:00
Cesy Avon
6caf8e4160 Writing tests first 2013-04-23 09:05:12 -07:00
Skud
f05a8f9ce6 added twitter link to profile page 2013-04-19 00:00:56 +10:00
Skud
6ddc0a5e15 Minor tweaks, mostly to formatting
... because I'm picky ;)  I particularly wasn't keen on the search link
on the logged in homepage, which didn't really fit in there.  I also
made the link display on *all* profiles (not just your own), and changed
the way the headings/titles were formatted.

I also changed CanCan to not specify who can search nearby members, but
to skip it in the controller instead.  It just didn't really make sense
in ability.rb.
2013-04-03 15:28:11 +11:00
Miles Gould
fde8d163a9 Allow non-logged-in folk to search for members near a location. 2013-04-02 15:48:58 +01:00
Miles Gould
0f22fbf4aa Merge branch 'dev' into members_nearby
Conflicts:
	spec/factories/member.rb
2013-04-02 13:10:38 +01:00
pozorvlak
195055365d Merge pull request #161 from phazel/private_message
Private message
2013-04-02 04:21:19 -07: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
Miles Gould
400fa98d35 Basic controller and view tests for "nearby members" 2013-03-29 15:36:34 +00:00
gnattery
ac7b48406b Members can send each other private messages.
Problems:
Notifications controller test fails on redirecting, but seems to work fine in practice
Send Message button doesn't look nice on page
2013-03-25 17:52:50 +11:00
gnattery
bdcaee9b79 profile has link to edit settings 2013-03-23 18:57:43 +11:00
gnattery
793b25e3dd Paginate and sort members.
We've decided to remove tests for pagination display because we trust will_paginate
2013-03-20 15:17:10 +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
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
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
Cathy Sullivan
86f7d25411 PT story 41985889, Hides 'new garden' tab on other member's pages 2013-02-18 12:18:45 -08: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
8ded8eb0c3 display location as text on profile 2013-02-12 11:56:56 +11:00
Skud
09727d99b2 show email on profile if wanted 2013-02-06 16:54:15 +11:00
Skud
75e8ea1119 I'd rather not use Member.new 2013-02-01 13:37:33 +11:00
Skud
87f14247e0 modified views to use CanCan 2013-02-01 13:24:32 +11:00
gnattery
d1e3f8ce32 Added description field to gardens 2013-01-18 15:11:11 +11:00
Skud
a0b74562f5 remote "Note" about random selection of crops 2013-01-17 15:16:38 +11:00
Skud
501cad39f9 Plantings now show up on members and gardens pages 2013-01-17 15:12:37 +11:00
Skud
c4cac871d5 Fixed up tests for garden display
These were just wrong wrongety wrong. I think they were from before we
were auto-creating a garden for new members.  Fixed now.
2013-01-13 21:43:20 +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
edb59e07ee s/users/members/g -- all tests pass
There's still probably stuff broken, but this seemed like a good spot to
commit.  Sorry for the enormous chunk of code.  I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
2013-01-13 18:33:43 +11:00
Skud
801a3d0f6c Added some basic tests for RSS feeds. 2013-01-13 17:06:36 +11:00
Skud
72bb1a641f Made the :user factory be confirmed by default.
We hardly ever actually need an unconfirmed user, but if we do, there is
now :unconfirmed_user for that purpose.
2013-01-13 13:10:24 +11:00
Skud
7aac659749 FGified and generally improved members/show tests 2013-01-13 11:38:54 +11:00
Skud
007c7e5fae FGified views/members/index
Note that all users need different email addresses otherwise you get
"email address is already taken" problems if you try to create two at
once.
2013-01-13 11:15:07 +11:00
Miles Gould
75eb0ab02f Fix garden tabs in profile; embed "new garden" form. 2012-12-20 12:13:58 +00:00
Gnat
d6f55f9b0b Wrote some tests for Skud's gravatar code 2012-12-17 03:40:16 +00:00
cephLpod
2f36e9a0cc Added member count to Members page 2012-12-14 16:11:37 -06:00
Miles Gould
05a09ac428 Merged "mygarden". 2012-12-09 15:22:20 +00:00
Miles Gould
19f8d70f94 Fix size of boxes on /members; truncate long names 2012-12-06 13:00:14 +00:00
Skud
18f25a5217 Fixed broken tests. 2012-12-05 21:45:37 +11:00
Skud
59083882d6 Merging in changes from dev to mygarden branch 2012-12-05 21:05:40 +11:00
Skud
91e24e4ac2 fixed broken tests 2012-11-26 22:36:50 +11:00
Skud
760cf03b2c Fixed tests by getting rid of valid_session 2012-11-26 19:04:43 +11:00
Miles Gould
26e4699812 Merged "bootstrap". 2012-11-15 23:22:40 +00:00
Skud
cdc356fc73 Added RSS auto-discovery to the <head> of each page
Note: no tests because we haven't yet figured out how to test things
that appear in the HEAD section. Suggestions welcome.
2012-11-12 16:57:37 +11:00
Maia Sauren
af47daa1a4 changed profile URL to members (#38934935) 2012-11-06 20:59:14 +11:00