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
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
pozorvlak
9da60fe4b2
Merge pull request #163 from Skud/betterhomepage
...
Better homepage
2013-04-02 04:05:01 -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
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
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
afa5b7a72f
Find nearby members back-end (hardcoded to 100mi).
2013-03-29 16:03:00 +00: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
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
Skud
0e9b4caf58
added sunniness field to plantings
2013-03-29 16:33:37 +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
91acf9f878
Only send email notifications to members who want them.
2013-03-27 12:17:46 +00:00
Miles Gould
64b957db20
Actually send email on creating notifications.
2013-03-27 11:58:05 +00:00
Miles Gould
f21df1dbb9
Method to send email notifications.
2013-03-27 11:23:52 +00:00
Miles Gould
61fb83456d
Generate skeleton notifier.
2013-03-27 10:30:21 +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
Skud
7b065a0092
fixed pozorvlak's date-picker branch
...
- tweaked javascript to specify date format (this fixed the javascript
problems)
- converted planted_at to a date field, rather than datetime
- made tests pass even in non-UTC timezones
2013-03-26 20:54:12 +11: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
Miles Gould
3a11982ecd
Allow free-form input of dates in plantings form.
...
See http://railscasts.com/episodes/32-time-in-text-field?view=asciicast
If an existing date has been set, it's pre-filled in ISO format.
2013-03-26 19:27:45 +11:00
Skud
dcd7df7f47
Made the password reset email friendlier.
...
Also did the same for the unlock instructions, while I was in there.
2013-03-26 19:26:29 +11:00
Skud
7f7db12f9f
added analytics tracking code w/ per-env config
2013-03-26 13:23:35 +11:00
