mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-17 12:38:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 59 Branches 82 Tags
Layout/HashAlignment
Commit Graph

2432 Commits

Author SHA1 Message Date
Skud
af399311b2 validate order_item.price must be > product.min_price 2013-05-15 23:17:05 +10:00
Skud
abcba35a71 Converted prices to integers/cents to avoid floating point trouble 2013-05-15 23:09:35 +10:00
Skud
c96876feeb prettify order display 2013-05-15 21:26:01 +10:00
Skud
3e1202cd62 prettify display of orders 2013-05-15 15:52:10 +10:00
Skud
8626702544 Fixed type for member_id (should be integer) 2013-05-15 15:51:20 +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
ebd2446a33 added crop hierarchy basics 2013-05-14 23:24:06 +10:00
Skud
c7efe512aa Merge pull request #193 from pozorvlak/replylink 
Replylink
 2013-05-13 17:45:39 -07: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
Miles Gould
746386731a Add metadata to photos and display it on photos/show. 2013-05-09 14:51:38 +01:00
Miles Gould
536760ccae Show image on photos/show. 
Placeholder text for metadata.
 2013-05-09 13:24:23 +01:00
Miles Gould
6fa94e321a Save photos. 2013-05-09 13:12:54 +01:00
Lilly
14021a4fae Redirect to Garden after deleting planting 2013-05-09 13:39:31 +10:00
Ryan Clark
6ddfeb8f41 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-05-08 20:23:20 -07:00
Skud
536cf21e3e make it easier to wrangle scientific names 2013-05-09 11:39:22 +10:00
Ryan Clark
1348a2a492 Add validation for name in garden model with test. 2013-05-08 13:15:09 -07:00
Miles Gould
ae785c6f4b Move flickr code into Member model. 2013-05-08 16:44:21 +01:00
Miles Gould
016172f0e1 Delete @flickr_login var in photos controller. 
We didn't need any data from it that couldn't be got from @flickr_auth,
and eliminating it makes login_to_flickr less side-effecting and easier
to move around.
 2013-05-08 16:23:54 +01:00
Miles Gould
2fb8c38019 Removed obsolete test from views/photos/edit 
We should consider just deleting this action entirely.
 2013-05-08 15:39:17 +01:00
Miles Gould
8af105fad7 Test for photo thumbnails; stub Flickr username/id. 2013-05-08 15:27:10 +01:00
Miles Gould
ce3de63a46 Factor out flickr controller code, for easier stubbing. 2013-05-08 14:59:08 +01:00
Skud
acf164990d tell user to connect to flickr 2013-05-08 21:17:03 +10:00
Skud
ffb5d6e7f8 only members can manage photos 2013-05-08 20:54:48 +10:00
Skud
5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +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
85a121c739 only let signed in members buy stuff 2013-05-08 15:05:55 +10:00
Skud
5c96bf1541 added basic index page for shop 2013-05-08 15:05:38 +10:00
Skud
42ea14a8e5 added shop page at /shop 2013-05-08 14:02:33 +10:00
Skud
42cfa17b7e order HABTM product 2013-05-07 22:10:23 +10:00
Skud
2d444423e4 moved member post feed to HAML 2013-05-07 22:09:48 +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
Lilly
4d372ab8f8 Added crop wrangling hints to crops form. 2013-05-02 12:13:28 +10:00
Miles Gould
6ab098c015 Move reply_link into a helper. 
- keep @reply_link as an instance var, for testability
 - always use fully-qualified URLs, to reduce code duplication
 2013-05-01 23:45:07 +01:00
Miles Gould
c46ba2f16b Delete unused helpers. 2013-05-01 16:27:29 +01:00
Skud
e4dd0cba5b added flickr link to profile page 2013-04-30 23:07:21 +10:00
Skud
45935c6e38 connect to flickr 2013-04-30 23:01:18 +10:00
Skud
e0782c2346 fixed failing notifications tests 
(our non-DRY code, which we just pasted into the mailer, was breaking
this in a roundabout way. this is a quick and not very nice fix. The
whole problem is resolved by @pozorvlak's recent "no subject" fix for
notifications, anyway.)
 2013-04-30 21:56:42 +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