Commit Graph

36 Commits

Author SHA1 Message Date
Skud
b4faba7182 various tweaks based on comments on phazel's work 2013-03-21 12:37:57 +11:00
gnattery
d26b3d42ed standardise button styles 2013-03-21 00:37:46 +11:00
gnattery
349aecbb69 Delete gardens 2013-03-20 12:30:38 +11:00
Skud
29016c3211 Tweaked member avatars
The member's name (in text) is no longer part of the avatar itself, as
it looks pretty awful and/or redundant in some places where it's used.
2013-03-11 14:32:34 +11:00
Miles Gould
627c373c41 Simplified some code using Garden.to_s. 2013-02-26 00:05:32 +00:00
Skud
87f14247e0 modified views to use CanCan 2013-02-01 13:24:32 +11:00
Skud
4448468ee7 fixed problems with tab display on member profile 2013-01-20 21:46:53 +11:00
pozorvlak
73d1eb0879 Merge pull request #89 from Skud/planting-links
Planting links
2013-01-18 13:06:57 -08:00
Skud
9e4e1746e1 Link to the planting, not the crop.
Also, a subheading for the gardens page.
2013-01-18 15:14:40 +11:00
gnattery
d1e3f8ce32 Added description field to gardens 2013-01-18 15:11:11 +11:00
Skud
1503cbddad Plantings show on members, gardens, and crops pages
Created a thumbnail to standardise the display.  It's not pretty but it
has the basic info.
2013-01-18 13:40:30 +11:00
Skud
a0b74562f5 remote "Note" about random selection of crops 2013-01-17 15:16:38 +11:00
Skud
501cad39f9 Plantings now show up on members and gardens pages 2013-01-17 15:12:37 +11:00
Skud
8da9a13eae Changed garden.member_id to garden.owner_id 2013-01-13 21:29:28 +11:00
Skud
edb59e07ee s/users/members/g -- all tests pass
There's still probably stuff broken, but this seemed like a good spot to
commit.  Sorry for the enormous chunk of code.  I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
2013-01-13 18:33:43 +11:00
Skud
dc9b8b8aa9 All spec tests now pass with s/update/post
Haven't done a full runthrough of the site yet, so will probably need to
make a few more changes.
2013-01-13 16:33:08 +11:00
Miles Gould
a481ea25b1 Factor out gravatar + name into a partial. 2013-01-02 13:21:11 +00:00
pozorvlak
898b41d656 Merge pull request #74 from Skud/plantsomething
Plantsomething
2012-12-22 15:29:41 -08:00
Miles Gould
8cd97deea2 Use Bootstrap formatting on "new garden" form. 2012-12-21 10:36:34 +00:00
Skud
f9394291ff show plant something link on garden page 2012-12-21 12:51:30 +11:00
Miles Gould
cfb300bbad Stop the current garden from being a link on gardens/show. 2012-12-20 12:13:58 +00:00
Miles Gould
b118c6181f "New garden" button on gardens page. 2012-12-20 12:13:58 +00:00
Miles Gould
75cca77470 Show user's actual garden list. 2012-12-20 12:13:58 +00:00
Juliet
c5b606e9d6 Adding new garden; updating new garden page to ask only for garden name. Story
40983821 https://www.pivotaltracker.com/projects/646869#!/stories/40983821

Committing test for changes
2012-12-20 12:13:58 +00:00
Skud
0b75494c50 added owner for gardens, and to_s for users 2012-12-19 21:08:32 +11:00
Skud
3548d8f4ee Added edit button to garden page 2012-12-05 21:54:29 +11:00
Skud
18f25a5217 Fixed broken tests. 2012-12-05 21:45:37 +11:00
Skud
ea4c2b028f Made the form require login and look slightly prettier. 2012-12-05 21:11:48 +11:00
Skud
59083882d6 Merging in changes from dev to mygarden branch 2012-12-05 21:05:40 +11:00
Skud
cd72350e9e refactor: remove unneeded %div in HAML 2012-12-02 11:59:31 +11:00
Skud
496a76d635 things flow better with posessive apostrophes 2012-11-26 23:15:49 +11:00
Skud
32061e889b link member page from garden page 2012-11-26 22:59:59 +11:00
Skud
e4e150d4be tabbed interface for plantings/updates 2012-11-26 22:54:50 +11:00
Skud
08302a4864 Randomly display 8 crops on the garden page 2012-11-26 21:34:23 +11:00
Skud
6d3a4e6be6 Reformatted this page to use bootstrap and look nicer 2012-11-26 20:49:41 +11:00
Norman Ancajas
f89815b6b3 added gardens table 2012-11-05 11:45:56 +08:00