Skud
f574bbb11f
Merge pull request #169 from attlebish/fixsenderlink
...
Fixed link to sender profile in notifications
2013-04-03 21:02:14 -07:00
Lilly
9ed7a66c1c
Fixed link to sender profile in notifications
2013-04-04 14:52:59 +11:00
Skud
8a82fa1655
Merge pull request #168 from attlebish/gravatarlink
...
Put avatar on settings page with link to gravatar.com
2013-04-03 20:15:03 -07:00
Lilly
5ae524baad
Put avatar on settings page with link to gravatar.com
2013-04-04 13:59:05 +11:00
Skud
ef91cc30b7
Merge pull request #167 from attlebish/signupswap
...
Swapped "sign up" and "sign in" links on navbar
2013-04-03 18:34:49 -07:00
Lilly
6a07b12da1
Swapped "sign up" and "sign in" links on navbar
2013-04-04 12:28:53 +11:00
Skud
9beec9000c
Merge pull request #166 from Skud/members_nearby
...
Nearby members - minor formatting tweaks
2013-04-02 21:34:04 -07:00
Skud
4d44b7750b
Merge pull request #160 from pozorvlak/members_nearby
...
"Find nearby members" page
2013-04-02 21:33:50 -07: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
7cdfec3d4c
Harmonise "find members near you" language.
2013-04-02 15:55:58 +01: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
2e3febb1d6
Change route to "search/members/nearby" for consistency.
2013-04-02 14:17:00 +01:00
Miles Gould
8afb826a65
Use members thumbnail on members/near page.
2013-04-02 13:54:37 +01:00
Miles Gould
0f22fbf4aa
Merge branch 'dev' into members_nearby
...
Conflicts:
spec/factories/member.rb
2013-04-02 13:10:38 +01:00
Miles Gould
6e83a632a9
Wrap various things in <p> tags; test "can update location".
2013-04-02 13:09:13 +01:00
Miles Gould
ae4b0cca2b
Remove extra route to notifications/new.
2013-04-02 12:29:29 +01:00
pozorvlak
195055365d
Merge pull request #161 from phazel/private_message
...
Private message
2013-04-02 04:21:19 -07:00
pozorvlak
9da60fe4b2
Merge pull request #163 from Skud/betterhomepage
...
Better homepage
2013-04-02 04:05:01 -07:00
Joseph Caudle
5431cdcd71
Merge pull request #164 from Skud/blankplantingtime
...
Fixed bug where blank planting date didn't work
2013-04-01 23:51:05 -07:00
Skud
c2a1e0853a
Fixed bug where blank planting date didn't work
2013-04-02 15:28:27 +11: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
93b173a272
delegate crop system name and url
2013-04-02 12:39:07 +11:00
Skud
0ec01ab259
improved date/time formatting
...
we set defaults for date and time formatting (and override them in a few
places)
2013-04-02 12:30:05 +11:00
Skud
2373bbf5c9
Broke recent plantings/posts out into partial
...
... which is now displayed on both the signed in and signed out
homepages.
2013-04-02 12:15:08 +11:00
Skud
910f478e12
Merge pull request #162 from phazel/sorted_plantings
...
sort plantings
2013-03-31 22:07:31 -07:00
gnattery
759903761d
sort plantings
2013-04-01 15:53:41 +11:00
gnattery
615c478fa6
Merge branch 'private_message' of github.com:phazel/growstuff into private_message
...
Conflicts:
spec/controllers/notifications_controller_spec.rb
2013-04-01 13:43:51 +11:00
gnattery
2ecd996e8a
Merge branch 'dev' of github.com:phazel/growstuff into private_message
2013-04-01 13:42:09 +11:00
gnattery
b2198101fa
using cancan more correctly, fixed broken tests
2013-04-01 12:26:22 +11:00
gnattery
ceef39e846
Cleaned up controller for notifications.
...
Removed json from notification, since it's a bit risky and we don't really need it.
2013-04-01 11:44:14 +11:00
gnattery
fe895562f5
a few small tweaks to the views
2013-04-01 11:34:05 +11:00
Cesy
b2b7686112
Merge pull request #159 from Skud/sunshade
...
Sun or shade?
2013-03-31 12:16:33 -07:00
Skud
e64776afc2
sort plantings by reverse creation date
2013-03-31 21:19:30 +11:00
Skud
a5f6931e12
rewrote blurb
2013-03-31 21:00:57 +11:00
Skud
05d1a8807a
moved Member.confirmed to a scope
2013-03-31 20:28:29 +11:00
Miles Gould
56be8e84e9
Add more links to "find nearby members"
2013-03-29 18:03:59 +00:00
Miles Gould
fbab9f517d
Remove unused restriction on "nearby members" access.
2013-03-29 17:56:08 +00:00
Miles Gould
6e3b14e979
Show member thumbnails on search/members/near.
2013-03-29 17:49:38 +00:00
Miles Gould
2d93e3a370
Prettify "nearby members" page
...
- show search form elements inline
- add an h3 to make it clear where the results start
2013-03-29 17:45:25 +00:00
Miles Gould
f08a5249e5
Change route of "nearby members" page.
2013-03-29 17:28:11 +00:00
Miles Gould
b21b2e58e0
Fix bug in nearby members view.
2013-03-29 17:28:00 +00:00
Miles Gould
5b6e51273d
Stub out geocoder calls in test environment.
2013-03-29 17:14:55 +00:00
Miles Gould
afa5b7a72f
Find nearby members back-end (hardcoded to 100mi).
2013-03-29 16:03:00 +00:00
Miles Gould
7120b16f46
Ban the username "nearby", to Avoid Confusion.
2013-03-29 15:40:33 +00:00
Miles Gould
400fa98d35
Basic controller and view tests for "nearby members"
2013-03-29 15:36:34 +00:00
Miles Gould
5866cc5bbc
Document current_user vs current_member usage.
2013-03-29 15:19:01 +00:00
Skud
8140671525
display sunniness on planting page
2013-03-29 17:13:28 +11:00
Skud
9b179553ce
added sunniness to the planting form
2013-03-29 17:02:01 +11:00
Skud
2770b90e3a
allow blank sunniness value as well as nil
2013-03-29 17:01:14 +11:00
Skud
2bfe033a0a
generalised sunniness into a variable for later reuse
2013-03-29 16:58:16 +11:00
