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

235 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
Skud
536cf21e3e make it easier to wrangle scientific names 2013-05-09 11:39:22 +10:00
pozorvlak
6df9d8b09a Merge pull request #194 from Skud/empty_subjects 
*crosses fingers*
 2013-05-08 03:21:57 -07:00
Lilly
4d372ab8f8 Added crop wrangling hints to crops form. 2013-05-02 12:13:28 +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
e4dd0cba5b added flickr link to profile page 2013-04-30 23:07:21 +10:00
Skud
45935c6e38 connect to flickr 2013-04-30 23:01:18 +10:00
Miles Gould
aab0a438fd Replace blank/nil notification subjects with (no subject) 2013-04-30 12:39:03 +01: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
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
Cesy
56181144b3 Merge pull request #178 from Skud/faq-tweak 
removed Courtney from about section
 2013-04-30 00:27:50 -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
11f979313a Added reply link to notification email. 
Note: this breaks DRY but we couldn't figure out how to put it in a
helper and make it useable by both the controller and the mailer.
Suggestions/help much appreciated!
 2013-04-29 18:55:13 +10: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
b471ce7576 removed Courtney from about section 2013-04-29 09:43:50 +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
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
2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Miles Gould
f2b2f12f67 Delete specs for unused views and controller methods. 2013-04-09 17:56:34 +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
Lilly
9ed7a66c1c Fixed link to sender profile in notifications 2013-04-04 14:52:59 +11:00
Lilly
5ae524baad Put avatar on settings page with link to gravatar.com 2013-04-04 13:59:05 +11: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
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
gnattery
2ecd996e8a Merge branch 'dev' of github.com:phazel/growstuff into private_message 2013-04-01 13:42:09 +11:00
Skud
a5f6931e12 rewrote blurb 2013-03-31 21:00:57 +11:00
Miles Gould
400fa98d35 Basic controller and view tests for "nearby members" 2013-03-29 15:36:34 +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
b5fee57606 Merge pull request #158 from Skud/hotfix-analytics 
Hotfix analytics
 2013-03-28 18:28:20 -07:00
Skud
da4a86bd2c Hotfix: don't escape HTML for analytics script 2013-03-29 10:25:28 +11:00
Miles Gould
c9cc7be0d1 Refactor model code out of view in posts/show. 2013-03-28 10:57:30 +00:00
Miles Gould
bb1e8ede19 Fix misordered comments on post page bug. 
https://www.pivotaltracker.com/story/show/46799417
 2013-03-28 10:43:47 +00:00
Skud
1015257cc4 use fully qualified links in notification email 2013-03-28 12:18:33 +11:00
Miles Gould
bba8b1b092 Added email notification checkbox to settings 2013-03-27 12:26:29 +00:00
Miles Gould
f21df1dbb9 Method to send email notifications. 2013-03-27 11:23:52 +00:00
pozorvlak
37e406d112 Merge pull request #149 from pozorvlak/password-reset 
Password reset - make emails friendlier and fix blank page
 2013-03-27 03:23:10 -07:00
Miles Gould
5d09386cda Fix broken test for unlock instructions 
There were some extra assertions left over from Devise's use of mocks that no
longer make sense.
 2013-03-27 10:19:52 +00:00
Courtney Hazel
22b985b268 Merge pull request #148 from Skud/date-picker 
Date picker
 2013-03-27 00:14:12 -07:00