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
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
b7f3634615
redirect to post after deleting comment
2013-02-08 17:37:37 +11:00
Skud
f45434ff83
redirect to post after new/edit comment
2013-02-08 16:40:27 +11:00
Skud
93edede4da
Merged from mistaken branch on G/g
2013-02-08 16:11:38 +11:00
Skud
3b3f9d261f
can't create a new post without a post_id
2013-02-08 15:02:21 +11:00
Skud
ae59b1e18d
pass post_id through to comment
2013-02-08 14:37:57 +11:00
gnattery
3cff543184
rails g scaffold Comment
2013-02-06 14:49:49 +11:00
Skud
e5d380729e
we more or less have a settings page. doesn't WORK though.
2013-02-06 12:46:45 +11:00
Skud
e41293c121
fixed placement of curly braces. tests now pass.
2013-02-05 22:30:28 +11:00
Skud
1ccaab3085
Don't allow members to be accessible with JSON
...
One of the tests is failing and I can't for the life of me figure out
why. Everything looks fine when I try it with curl from the command
line. Hmm.
2013-02-02 23:37:24 +11:00
Skud
58e5d04d50
controller tests for plantings now pass
2013-02-01 22:55:48 +11:00
Skud
21960a5494
Tried to get controller tests passing.
...
All are fine except for plantings. I'm pretty sure hte problem is to do
with these two lines in app/model/ability.rb
can :update, Planting, :garden => { :owner_id => member.id }
can :destroy, Planting, :garden => { :owner_id => member.id }
I'm pretty sure that's the right syntax (according to
https://github.com/ryanb/cancan/wiki/Defining-Abilities ) but since it's
the update and delete actions that are failing, I guess I must have it
wrong somehow. Any hints?
2013-02-01 13:25:06 +11:00
Amy
0d84f0dde1
Added recent_plantings variable
...
Wrote tests for recent_plantings, recent_posts, new_crops
2013-01-28 19:30:23 -05:00
gnattery
9f788ba8df
added friendly IDs for plantings, and tests
2013-01-18 16:06:20 +11:00
Skud
8da9a13eae
Changed garden.member_id to garden.owner_id
2013-01-13 21:29:28 +11:00
Skud
df76f2497a
renamed Post.member_id to Post.author
2013-01-13 20:57:28 +11:00
Skud
689448f87c
renamed Member.username to login_name
2013-01-13 19:14:46 +11:00
Skud
edb59e07ee
s/users/members/g -- all tests pass
...
There's still probably stuff broken, but this seemed like a good spot to
commit. Sorry for the enormous chunk of code. I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
2013-01-13 18:33:43 +11:00
Skud
fdb309cdd2
s/users/members/g -- controllers and their tests
2013-01-13 17:53:24 +11:00
Skud
48d8b39b0a
s/update/post in members controller, plus tests
2013-01-13 16:40:07 +11:00
Skud
21f0f39bf9
Model and controller spec files pass.
...
Views are another matter (and will explode badly at this point)
2013-01-13 16:12:45 +11:00
pozorvlak
42683d733b
Merge pull request #72 from gnattery/unconfirmed
...
Unconfirmed
2012-12-28 07:26:43 -08:00
Skud
dd301d1777
improved crop/garden pre-selection in planting form
2012-12-23 10:20:51 +11:00
Skud
02daab4fc1
added crop_id and garden_id params to controller
2012-12-23 10:01:19 +11:00
Gnat
20df5538ca
No profile for unconfirmed members
2012-12-21 01:00:56 +00:00
Gnat
183dc71b76
Unconfirmed users don't show on members index page
2012-12-21 00:30:01 +00:00
Skud
0af986021e
Generated scaffold for plantings
2012-12-19 13:30:40 +11:00
Miles Gould
febd78d77a
Use username-yyyymmdd-subject-line slugs.
2012-12-17 12:50:51 +00:00
Miles Gould
b02eced9b7
Include dates in update URLs.
...
/update/:slug still works, though.
2012-12-15 00:18:53 +00:00
Miles Gould
bf58ff22a6
Give each user a default garden, called "Garden"
...
- created by an after_create callback on the user object
- added test on model object
- changed test of GET /gardens to expect Garden.all
2012-12-11 15:50:28 +00:00
Skud
760cf03b2c
Fixed tests by getting rid of valid_session
2012-11-26 19:04:43 +11:00
Norman Ancajas
b39ee792b4
give each user a garden. note: tests broken!
2012-11-05 14:29:04 +08:00
Norman Ancajas
77c2e83c64
wrote migration to add test users, fixed tests
2012-11-05 13:03:19 +08:00
Norman Ancajas
f89815b6b3
added gardens table
2012-11-05 11:45:56 +08:00
Miles Gould
3419a559e1
Require a system name for crops.
2012-10-03 20:38:39 +01:00
