mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-25 02:05:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
812 Commits 64 Branches 76 Tags
abcba35a71eb46bb669beb877b36a8af3d09bf9e
Commit Graph

466 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
c95e722f99 added planting counts to crop pages 2013-05-03 15:09:29 +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
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
Skud
c2dbebb046 Merge pull request #189 from pozorvlak/nearby 
Find users within a given distance; allow specification of units.
 2013-04-30 03:04:29 -07:00
Miles Gould
a41c60b7de Be even more paranoid about params[:units] 
And save a to_s call while we're at it.
 2013-04-30 10:54:52 +01:00
Miles Gould
40b9104094 Make units dropdown wide enough to contain "miles". 
It's now "miles" wide. Hehehe.
 2013-04-30 10:43:40 +01:00
Skud
9ba92e580d Merge pull request #187 from pozorvlak/show_comments 
Show existing comments when creating or editing a comment on a post
 2013-04-30 02:19:38 -07:00
Cesy
56181144b3 Merge pull request #178 from Skud/faq-tweak 
removed Courtney from about section
 2013-04-30 00:27:50 -07:00
Cesy
fc8edb3efa Merge pull request #177 from Skud/contact 
added contact link to footer
 2013-04-30 00:25:57 -07:00
Miles Gould
c53dd6797f Show other comments on post when editing a comment. 2013-04-29 21:44:30 +01:00
Miles Gould
2b84fa8bad Show previous comments when creating a comment. 
- Move "show previous comments" into a partial
 - invoke said partial from the new comment form
 - add tests.
 2013-04-29 21:30:26 +01:00
Skud
11f979313a Added reply link to notification email. 
Note: this breaks DRY but we couldn't figure out how to put it in a
helper and make it useable by both the controller and the mailer.
Suggestions/help much appreciated!
 2013-04-29 18:55:13 +10:00
Skud
844f2c845e removed unused random crop code 2013-04-29 18:26:22 +10:00
Skud
36290c82ed Added a reply link to the notifications/show page 
- sets subject "Re: whatever" for PMs
- also removed "sender=N" from PM link (wtf! -- it wasn't doing anything
    but it looked bad.)
 2013-04-29 18:09:55 +10:00
Skud
c6f34d387a Merge pull request #185 from attlebish/fix-email-formatting 
Fix email formatting
 2013-04-28 23:30:25 -07:00
Lilly
c0c7b5f93c Added full stop to end of link to gravatar.com 2013-04-29 16:16:20 +10:00