Ryan Clark
e9dd18d977
Added tradable and tradable_to to seeds
2013-07-17 18:25:55 -07:00
Ryan Clark
973567bfdc
Remane use_by to plant_before to humor Skud
2013-07-17 18:24:12 -07:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
b71ac3decb
added planted_from (eg seed, seedling)
2013-07-05 20:53:11 +10:00
Skud
cb3e0fb526
added optional recommended price to products
2013-06-07 09:53:40 +10:00
Skud
8046790bc7
converted product description to text (not string)
2013-06-07 09:16:18 +10:00
Miles Gould
9d624902e8
Fix string/integer conversions in migrations.
2013-06-04 13:25:23 +01:00
Skud
89a5a777e6
Merge branch 'dev' into payments-new
...
Conflicts:
.gitignore
app/models/ability.rb
app/models/member.rb
db/schema.rb
2013-06-04 19:42:00 +10:00
Skud
77bb008083
changed flickr_photo_id to string
...
... because integer worked fine in dev (on sqlite3) but broke on staging
(with postgres). Turns out flickr photo IDs are quite LARGE integers.
But really they could be anything, so string seems safest.
2013-06-01 11:21:17 +10:00
Miles Gould
c734f62189
Plantings HABTM photos.
2013-05-31 13:10:54 +01:00
Miles Gould
20eeec43ca
Merge branch 'dev' into photos
...
Conflicts:
db/schema.rb
2013-05-31 11:24:19 +01:00
Skud
b60790c8ad
record paypal token/payer id on completion, for reference
2013-05-29 13:41:34 +10:00
Skud
f138c99846
Merge branch 'dev' into payments-new
...
Conflicts:
db/schema.rb
2013-05-22 10:21:43 +10:00
Skud
3aaf344951
rename account details to just account
2013-05-18 10:50:36 +10:00
Skud
8b7f8faae6
added account type and paid months columns to product
2013-05-18 10:27:08 +10:00
Skud
daa46d7acb
seed account types; require name too
2013-05-18 09:49:00 +10:00
Skud
c595b2181d
added account_types, fixed a bunch of tests
2013-05-17 16:07:46 +10:00
Skud
df5ee9cf4b
give each member an account_detail entry
2013-05-17 15:28:22 +10:00
Skud
0157229936
added account_details table, set up abilities
...
also tweaked some order/order_item related abilities
2013-05-17 13:05:46 +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
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
Ryan Clark