Skud
abcba35a71
Converted prices to integers/cents to avoid floating point trouble
2013-05-15 23:09:35 +10:00
Skud
a047f60af3
added cancan rules for order items
2013-05-15 14:15:08 +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
4b91e12b2b
Merge pull request #201 from IAMRYO/garden_name
...
Garden name
2013-05-13 17:39:08 -07:00
Ryan Clark
5d03ffdf87
Added validation for garden names.
2013-05-13 17:28:37 -07:00
Ryan Clark
ee136666d5
Replace name validation with before_filter and add rake tast for empty names. Replace validation testing with before_filter tests.
2013-05-09 13:06:29 -07:00
pozorvlak
42b5f387d2
Merge pull request #199 from Skud/cropwrangling
...
Make life easier for crop wranglers
2013-05-09 07:04:10 -07:00
Ryan Clark
6ddfeb8f41
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
2013-05-08 20:23:20 -07:00
Ryan Clark
1348a2a492
Add validation for name in garden model with test.
2013-05-08 13:15:09 -07: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
85a121c739
only let signed in members buy stuff
2013-05-08 15:05:55 +10:00
Skud
42cfa17b7e
order HABTM product
2013-05-07 22:10:23 +10:00
Skud
26d16b9d86
only admins can mess with products/orders for now
2013-05-07 21:24:26 +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
e5526a3292
added validation for en_wikipedia_url
2013-05-02 13:27:12 +10:00
Miles Gould
aab0a438fd
Replace blank/nil notification subjects with (no subject)
2013-04-30 12:39:03 +01:00
gnattery
9d4caaa2b5
Do validation for empty and spaces-only strings
2013-04-30 12:23:17 +01:00
gnattery
939a10d2f4
Post subjects cannot be nil
2013-04-30 12:20:26 +01:00
Miles Gould
2421126825
Put locations in geolocated_member factory names.
2013-04-25 23:27:52 +01:00
Skud
2418be18d3
added connections to settings page, fixed tests
2013-04-18 23:41:04 +10: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
pozorvlak
195055365d
Merge pull request #161 from phazel/private_message
...
Private message
2013-04-02 04:21:19 -07:00
pozorvlak
9da60fe4b2
Merge pull request #163 from Skud/betterhomepage
...
Better homepage
2013-04-02 04:05:01 -07:00
Skud
c2a1e0853a
Fixed bug where blank planting date didn't work
2013-04-02 15:28:27 +11: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
93b173a272
delegate crop system name and url
2013-04-02 12:39:07 +11:00
gnattery
759903761d
sort plantings
2013-04-01 15:53:41 +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
Skud
e64776afc2
sort plantings by reverse creation date
2013-03-31 21:19:30 +11:00
Skud
05d1a8807a
moved Member.confirmed to a scope
2013-03-31 20:28:29 +11:00
Skud
2770b90e3a
allow blank sunniness value as well as nil
2013-03-29 17:01:14 +11:00
Skud
2bfe033a0a
generalised sunniness into a variable for later reuse
2013-03-29 16:58:16 +11: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
Miles Gould
64b957db20
Actually send email on creating notifications.
2013-03-27 11:58:05 +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
3a11982ecd
Allow free-form input of dates in plantings form.
...
See http://railscasts.com/episodes/32-time-in-text-field?view=asciicast
If an existing date has been set, it's pre-filled in ISO format.
2013-03-26 19:27:45 +11:00
gnattery
886c57b908
sort members by login name
2013-03-20 14:57:09 +11:00
gnattery
349aecbb69
Delete gardens
2013-03-20 12:30:38 +11:00
Joseph Caudle
ddf29d6a21
Merge branch 'restrict_usernames' into dev
...
* restrict_usernames:
make login names remember case (so I can have Skud)
Added validations for member names:
Conflicts:
spec/factories/member.rb
2013-03-18 08:11:40 -04:00
Skud
68a36310b7
make login names remember case (so I can have Skud)
...
... but don't let anyone take "skud" if I'm "Skud"
don't allow 'staff' as a login_name either
2013-03-18 20:48:06 +11:00
Skud
5378e7344d
Added validations for member names:
...
2-25 chars long
alphanumeric and underscores only
disallowed: "growstuff", "admin", "moderator"
removed everything that was there to handle/truncate long usernames
since it's no longer needed.
2013-03-18 17:36:54 +11:00
Skud
84a730ddcb
limit crop wrangling to crop wranglers
2013-03-18 17:02:22 +11:00
Skud
0bb6a68220
Merge branch 'dev' of https://github.com/Growstuff/growstuff into signed-in-homepage
2013-03-05 22:36:55 +11:00
Skud
3c0e467da1
prettified signed-in homepage; tests still needed
2013-03-05 22:20:13 +11:00
