Commit Graph
354 Commits
Author SHA1 Message Date
Skud 8626702544 Fixed type for member_id (should be integer) 2013-05-15 15:51:20 +10:00
Skud 7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00
Skud 1d54a63f5d Merge branch 'dev' into payments-new 2013-05-15 11:37:16 +10:00
Skud ebd2446a33 added crop hierarchy basics 2013-05-14 23:24:06 +10:00
Miles Gould 746386731a Add metadata to photos and display it on photos/show. 2013-05-09 14:51:38 +01:00
Skud 5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
Skud 2563787dc7 added Member.current_order method 2013-05-08 15:41:39 +10:00
Skud 42cfa17b7e order HABTM product 2013-05-07 22:10:23 +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
gnattery 939a10d2f4 Post subjects cannot be nil 2013-04-30 12:20:26 +01:00
Miles Gould ff80b63743 Add a "name" column to authentications. 2013-04-09 17:23:59 +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 0e9b4caf58 added sunniness field to plantings 2013-03-29 16:33:37 +11:00
Miles Gould 91acf9f878 Only send email notifications to members who want them. 2013-03-27 12:17:46 +00: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 16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud af9c1591ef added inbox link and count to nav 2013-02-22 17:20:25 +11:00
Skud b743fe9465 Added friendly IDs for forum and role 2013-02-20 15:51:31 +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 a2cfd44de4 Removed "notification type" since WAGNI (yet)
We figured that doing without it was more like the simplest thing that
could possibly work.

Note that we edited the migration in place after rolling back.  This
would cause problems if anyone had downloaded the code from pozorvlak's
repo the other day and run it, but we're assuming they didn't (since
they wouldn't have got anything interesting out of it anyway.)
2013-02-15 23:58:27 +11:00
gnattery de85a6dcce added associations between forums, posts, and members 2013-02-13 15:17:40 +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 807a840528 Added location and lat/long fields to Member 2013-02-12 11:26:13 +11:00
Skud 801347976e Added edit/delete buttons to comment display 2013-02-08 17:24:06 +11:00
Skud 93edede4da Merged from mistaken branch on G/g 2013-02-08 16:11:38 +11:00
Skud b6c759e521 edit comments 2013-02-08 14:49:07 +11:00
Skud 363502a807 add show_email field to members 2013-02-06 16:25:17 +11:00
gnattery 3cff543184 rails g scaffold Comment 2013-02-06 14:49:49 +11:00
gnattery dea5d2399c Migration for planting slugs 2013-01-18 15:37:36 +11:00
gnattery d1e3f8ce32 Added description field to gardens 2013-01-18 15:11:11 +11:00
Skud 47719709ad Remove broken migrations
It seems these should never have been migrations in the first place.
It's considered an anti-pattern to include model code in your migrations
(these referred to User and Update), and we can see why -- having
renamed the models, these migrations now fail.

Apparently the Right Thing is to write a rake task to do the work in
question, and then run it via whatever deployment mechanism you use.
Since these have already been run on our dev server, and they're not all
that important anyway (i.e. won't break people's local machines they're
developing on, etc), and on top of all that they're a couple of months
old so most active developers should have run them already... as I was
saying, considering all that, I'm just blowing them away.
2013-01-13 11:49:58 +00: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 657ccf7cd8 s/users/members/g -- models and tests for them 2013-01-13 17:24:46 +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
Skud 0af986021e Generated scaffold for plantings 2012-12-19 13:30:40 +11:00
Miles Gould d2de7bc6f2 Add slugs to updates.
- add column to Update table
 - add a slug to all old updates
 - use slugs in URLs
 - make update slugs unique (we'll need them for delete URLs)
2012-12-15 00:18:46 +00:00
Skud 59083882d6 Merging in changes from dev to mygarden branch 2012-12-05 21:05:40 +11:00
Skud 208afba8c9 'Garden' is a better name, I think 2012-11-26 23:11:16 +11: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
Skud 3b72a9ed17 Set up friendly IDs for crops aka slugs (eww!) 2012-10-27 15:08:30 +11:00
Miles Gould 3419a559e1 Require a system name for crops. 2012-10-03 20:38:39 +01:00