mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-20 23:37:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
791 Commits 57 Branches 76 Tags
c2ef94de8a60a1f3e9c30ebd63b503f2cb6c257a
Commit Graph

122 Commits

Author SHA1 Message Date
Skud
c7efe512aa Merge pull request #193 from pozorvlak/replylink 
Replylink
 2013-05-13 17:45:39 -07:00
pozorvlak
42b5f387d2 Merge pull request #199 from Skud/cropwrangling 
Make life easier for crop wranglers
 2013-05-09 07:04:10 -07:00
Lilly
14021a4fae Redirect to Garden after deleting planting 2013-05-09 13:39:31 +10:00
Skud
536cf21e3e make it easier to wrangle scientific names 2013-05-09 11:39:22 +10:00
Miles Gould
6ab098c015 Move reply_link into a helper. 
- keep @reply_link as an instance var, for testability
 - always use fully-qualified URLs, to reduce code duplication
 2013-05-01 23:45:07 +01:00
Skud
45935c6e38 connect to flickr 2013-04-30 23:01:18 +10:00
Skud
c2dbebb046 Merge pull request #189 from pozorvlak/nearby 
Find users within a given distance; allow specification of units.
 2013-04-30 03:04:29 -07:00
Miles Gould
a41c60b7de Be even more paranoid about params[:units] 
And save a to_s call while we're at it.
 2013-04-30 10:54:52 +01:00
Skud
9ba92e580d Merge pull request #187 from pozorvlak/show_comments 
Show existing comments when creating or editing a comment on a post
 2013-04-30 02:19:38 -07:00
Miles Gould
c53dd6797f Show other comments on post when editing a comment. 2013-04-29 21:44:30 +01:00
Miles Gould
2b84fa8bad Show previous comments when creating a comment. 
- Move "show previous comments" into a partial
 - invoke said partial from the new comment form
 - add tests.
 2013-04-29 21:30:26 +01:00
Skud
36290c82ed Added a reply link to the notifications/show page 
- sets subject "Re: whatever" for PMs
- also removed "sender=N" from PM link (wtf! -- it wasn't doing anything
    but it looked bad.)
 2013-04-29 18:09:55 +10:00
Skud
58482bfbc9 added contact link to footer 2013-04-29 09:39:30 +10:00
Miles Gould
70fa93ab42 Replace tabs with spaces. 2013-04-26 14:27:35 +01:00
Miles Gould
a8fd75492a Units: be less trusting of user input. 2013-04-25 23:05:08 +01:00
Miles Gould
a16d07cfef Fix tests for units in Members#nearby 2013-04-25 22:53:07 +01:00
Cesy Avon
cebd49271a Finding nearby members by distance 
Distance is now configurable
Units framework is there but it's not working yet
 2013-04-23 10:13:21 -07:00
Skud
f05a8f9ce6 added twitter link to profile page 2013-04-19 00:00:56 +10:00
Skud
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Miles Gould
612b966678 Disallow duplicate authentications. 
You can authenticate multiple times against a server, but you must
supply different uids each time.
 2013-04-09 17:56:48 +01:00
Miles Gould
7be173eea9 Store name with authentications 2013-04-09 17:38:17 +01:00
Miles Gould
0db5826898 Remove unused methods on authentications. 2013-04-09 17:26:47 +01:00
Miles Gould
a3ac6343c7 Only show current member's authentications on index. 2013-04-09 17:20:40 +01:00
Miles Gould
087a0cf176 Store token on creating a new authentication. 2013-04-09 16:46:31 +01:00
Miles Gould
82998ddfd4 Create an authentication object on successful callback. 2013-04-09 16:39:46 +01:00
Miles Gould
b3154b8592 Fix stub authentications#create method 
As per comment at
http://railscasts.com/episodes/235-omniauth-part-1?view=comments#comment_153390
 2013-04-09 16:39:46 +01:00
Miles Gould
a3ad8c7bf9 Stub "authentications#create" method. 2013-04-09 16:39:45 +01:00
Miles Gould
5ea91bf56a Added an Authentications table. 
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1

In addition, we store "token" and "secret" fields.
 2013-04-09 16:39:09 +01: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
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
gnattery
2ecd996e8a Merge branch 'dev' of github.com:phazel/growstuff into private_message 2013-04-01 13:42:09 +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
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
afa5b7a72f Find nearby members back-end (hardcoded to 100mi). 2013-03-29 16:03:00 +00:00
Miles Gould
5866cc5bbc Document current_user vs current_member usage. 2013-03-29 15:19:01 +00:00
Miles Gould
fed8ce2c17 Allow setting location in members/:id/nearby 
It currently doesn't actually do anything, but the thought's there.
 2013-03-28 12:40:18 +00:00
Miles Gould
9a3badea63 Skeleton "members near me". 2013-03-28 11:51:55 +00:00
Miles Gould
c9cc7be0d1 Refactor model code out of view in posts/show. 2013-03-28 10:57:30 +00:00
Miles Gould
b87bd202f6 Create new plantings with planted_at set to today. 
There may be issues with time zones: can someone not on UTC test this?
 2013-03-26 19:27:45 +11: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
Cesy Avon
c586990329 Merge branch 'paginate' of https://github.com/phazel/growstuff into dev 
Conflicts:
	Gemfile.lock
 2013-03-21 05:17:14 -07:00
Cesy
4bacd06a11 Merge pull request #135 from phazel/delete_gardens 
Delete gardens
 2013-03-21 05:11:44 -07:00
Skud
d42c7cc2c6 Merge pull request #141 from Skud/support 
added support/faq page
 2013-03-21 04:36:14 -07:00
Skud
7352d5a8ed added support/faq page 2013-03-21 22:34:04 +11:00
Skud
10f8e363b1 two small improvements/bugfixes to post form 
- fixed bug with "will be posted in /forums" when no forum specified
- changed wording of "what's happening..." when posting in forum
 2013-03-20 22:25:15 +11:00