mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-23 18:26:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
811 Commits 64 Branches 76 Tags
afb4e21adc19fc3ac553d8b963d4456882be61ef
Commit Graph

811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
afb4e21adc Merge branch 'dev' of https://github.com/Growstuff/growstuff into payments-new 2013-05-15 22:02:16 +10:00
Skud
c2ef94de8a Merge pull request #204 from pozorvlak/quiet_rake 
Stop Rake from telling us every spec it's about to run.
 2013-05-15 05:01:19 -07:00
Miles Gould
bc400a1483 Stop Rake from telling us every spec it's about to run. 
As per
https://github.com/rspec/rspec-core/issues/266#issuecomment-1866898
 2013-05-15 12:58:41 +01: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
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
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
pozorvlak
507074d9dd Merge pull request #200 from attlebish/plantingredirect 
Redirect to Garden after deleting planting
 2013-05-09 07:01:17 -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
8daefa7b5e Merge pull request #197 from Skud/empty_subjects 
fixed linebreak causing syntax error
 2013-05-08 03:33:40 -07:00
Skud
d4e5f0e32a fixed linebreak causing syntax error 2013-05-08 20:23:55 +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
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
3eef44cce7 added products to seeds.rb in dev/test environments 2013-05-07 21:00:10 +10:00
Skud
cad5f453fa rails g scaffold Product... 2013-05-07 20:56:10 +10:00
pozorvlak
5ee8f216a4 Merge pull request #192 from Skud/roleseeds 
create admin and wrangler users in dev environment
 2013-05-07 03:08:33 -07:00
pozorvlak
e01cd33b3b Merge pull request #195 from Skud/plantingcounts 
added planting counts to crop pages
 2013-05-07 03:04:59 -07:00
Skud
c95e722f99 added planting counts to crop pages 2013-05-03 15:09:29 +10:00
Skud
ad8a0110c5 One-off rake task to clean up empty notification subjects 
Also fixed admin_user task to use login_name (case sensitive) rather
than the id-like stub generated by friendlyid (always lowercase).
 2013-05-03 12:35:02 +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
Skud
949821a947 create admin and wrangler users in dev environment 2013-05-02 11:18:46 +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
Cesy
7869e29682 Merge pull request #191 from Skud/flickr-connect 
Flickr connect
 2013-04-30 08:20:09 -07: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
d006854a6c added omniauth-flickr gem 2013-04-30 22:55:40 +10:00
Skud
df1cded83c added flickr key/secret 2013-04-30 22:10:05 +10:00