Skud
ffb5d6e7f8
only members can manage photos
2013-05-08 20:54:48 +10:00
Skud
5ae5e0f959
rails g scaffold Photo...
2013-05-08 20:52:35 +10:00
Skud
5c96bf1541
added basic index page for shop
2013-05-08 15:05:38 +10:00
Skud
245115fd7f
rails g scaffold Order...
2013-05-07 21:14:08 +10:00
Skud
af38f8574e
rails g scaffold Product...
2013-05-07 21:13:23 +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
e0782c2346
fixed failing notifications tests
...
(our non-DRY code, which we just pasted into the mailer, was breaking
this in a roundabout way. this is a quick and not very nice fix. The
whole problem is resolved by @pozorvlak's recent "no subject" fix for
notifications, anyway.)
2013-04-30 21:56:42 +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
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
Miles Gould
2421126825
Put locations in geolocated_member factory names.
2013-04-25 23:27:52 +01:00
Miles Gould
643c8f0917
Rename local vars in tests for greater clarity.
2013-04-25 23:17:29 +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
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
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
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
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
Miles Gould
64b957db20
Actually send email on creating notifications.
2013-03-27 11:58:05 +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
Miles Gould
98eabe097b
Fix test failure on redirect
...
The "create" method was never being called. Removing the sender_id
parameter fixed that. Routing problem, maybe?
2013-03-25 13:32:26 +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
Cesy
4bacd06a11
Merge pull request #135 from phazel/delete_gardens
...
Delete gardens
2013-03-21 05:11:44 -07: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
gnattery
349aecbb69
Delete gardens
2013-03-20 12:30:38 +11:00
Skud
84a730ddcb
limit crop wrangling to crop wranglers
2013-03-18 17:02:22 +11:00
Miles Gould
16605b82b6
Merge branch "notifications".
2013-02-22 13:40:58 +00:00
Skud
d3d0ff42b2
Show unread notifications as bold
...
The view here isn't as DRY as we'd like, but all the options were kind
of ugly, and this one was easiest.
2013-02-22 16:37:23 +11:00
Skud
f12941576c
hooked roles up to cancan
...
Now only admins can create/edit forums, or mess with roles.
To add an admin user:
rails c
m = Member.find('skud')
r = Role.create(:name => 'admin')
r.members << m
We'll have to do this on the server to bootstrap the admin stuff.
Though actually, we should really write a rake task to generalise this.
2013-02-20 14:53:11 +11:00
Skud
0bc2ff25fe
Added roles, but haven't yet hooked them up to CanCan
2013-02-19 12:29:22 +11:00
Skud
528a5ce32c
changed to/from to recipient/sender
2013-02-16 00:28:31 +11:00
Skud
eaa4e9bab9
removed unwanted methods from controller
2013-02-15 23:42:45 +11:00
Skud
a0955d2bfc
post in (or not in) a forum
2013-02-14 11:46:25 +11:00
gnattery
e10ea7f180
rails g scaffold Forum
2013-02-13 12:55:17 +11:00
Miles Gould
42d9034fc6
rails g scaffold notifications.
2013-02-12 13:17:14 +00:00
Skud
8caa4d12e8
limit to recent comments
2013-02-08 18:14:37 +11:00
Skud