Skud
65431ed41f
some improvements to the HAML RSS
2013-05-16 21:39:17 +10:00
Skud
abcba35a71
Converted prices to integers/cents to avoid floating point trouble
2013-05-15 23:09:35 +10:00
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
Lilly
14021a4fae
Redirect to Garden after deleting planting
2013-05-09 13:39:31 +10:00
Skud
5ae5e0f959
rails g scaffold Photo...
2013-05-08 20:52:35 +10:00
pozorvlak
8daefa7b5e
Merge pull request #197 from Skud/empty_subjects
...
fixed linebreak causing syntax error
2013-05-08 03:33:40 -07:00
Skud
d4e5f0e32a
fixed linebreak causing syntax error
2013-05-08 20:23:55 +10:00
pozorvlak
6df9d8b09a
Merge pull request #194 from Skud/empty_subjects
...
*crosses fingers*
2013-05-08 03:21:57 -07:00
Skud
2563787dc7
added Member.current_order method
2013-05-08 15:41:39 +10:00
Skud
ddfafa032a
added completed_at field to Order
2013-05-08 15:11:20 +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
Skud
3eef44cce7
added products to seeds.rb in dev/test environments
2013-05-07 21:00:10 +10:00
Skud
cad5f453fa
rails g scaffold Product...
2013-05-07 20:56:10 +10:00
Skud
949821a947
create admin and wrangler users in dev environment
2013-05-02 11:18:46 +10:00
gnattery
939a10d2f4
Post subjects cannot be nil
2013-04-30 12:20:26 +01:00
Skud
2418be18d3
added connections to settings page, fixed tests
2013-04-18 23:41:04 +10: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
Miles Gould
0f22fbf4aa
Merge branch 'dev' into members_nearby
...
Conflicts:
spec/factories/member.rb
2013-04-02 13:10:38 +01: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
gnattery
759903761d
sort plantings
2013-04-01 15:53:41 +11:00
Miles Gould
7120b16f46
Ban the username "nearby", to Avoid Confusion.
2013-03-29 15:40:33 +00:00
Skud
0e9b4caf58
added sunniness field to plantings
2013-03-29 16:33:37 +11:00
Skud
7be6ee3d69
a few small tweaks to email notification views
2013-03-27 23:53:54 +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
Skud
cc64139a4d
added 'where' to planting info (incl. location if known)
2013-02-25 21:47:57 +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
Skud
cc2c63b2eb
added cancan abilities for reading notifications
2013-02-15 23:17:52 +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
Miles Gould
6f104b0eeb
Death to Spork! Death! Death!
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
