Skud
abcba35a71
Converted prices to integers/cents to avoid floating point trouble
2013-05-15 23:09:35 +10:00
Skud
2955ca1559
delete order items if order is deleted
2013-05-15 15:51:51 +10:00
Skud
8a35f3401b
removed unwanted methods from orders
2013-05-15 14:33:40 +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
95a2007683
fix up existing gardens with blank names.
2013-05-13 17:36:37 -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
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
Miles Gould
7be173eea9
Store name with authentications
2013-04-09 17:38:17 +01:00
Miles Gould
0db5826898
Remove unused methods on authentications.
2013-04-09 17:26:47 +01:00
Miles Gould
0697d5a5ea
Restrict ability to create authentications.
2013-04-09 17:19:38 +01:00
Miles Gould
087a0cf176
Store token on creating a new authentication.
2013-04-09 16:46:31 +01:00
Miles Gould
82998ddfd4
Create an authentication object on successful callback.
2013-04-09 16:39:46 +01:00
Miles Gould
8647cd5315
Fix typo in models/member.rb
2013-04-09 16:39:46 +01:00
Miles Gould
a3ad8c7bf9
Stub "authentications#create" method.
2013-04-09 16:39:45 +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
6ddc0a5e15
Minor tweaks, mostly to formatting
...
... because I'm picky ;) I particularly wasn't keen on the search link
on the logged in homepage, which didn't really fit in there. I also
made the link display on *all* profiles (not just your own), and changed
the way the headings/titles were formatted.
I also changed CanCan to not specify who can search nearby members, but
to skip it in the controller instead. It just didn't really make sense
in ability.rb.
2013-04-03 15:28:11 +11:00
Miles Gould
fde8d163a9
Allow non-logged-in folk to search for members near a location.
2013-04-02 15:48:58 +01:00
Miles Gould
0f22fbf4aa
Merge branch 'dev' into members_nearby
...
Conflicts:
spec/factories/member.rb
2013-04-02 13:10:38 +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
Miles Gould
fbab9f517d
Remove unused restriction on "nearby members" access.
2013-03-29 17:56:08 +00:00
Miles Gould
7120b16f46
Ban the username "nearby", to Avoid Confusion.
2013-03-29 15:40:33 +00: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
be2c2626f7
Allow updating of send_notification_email.
...
Needed to stop the edit profile page breaking.
2013-03-28 12:22:51 +00:00
