Miles Gould
26f8367430
Fix version of Twitter bootstrap to avoid dependency hell.
...
Bootstrap 2.1.9 depends on therubyracer 0.11 which depends on native v8
which requires root access.
2013-01-04 12:45:00 +00:00
Miles Gould
03fd77b03e
Upgrade to Rails 3.2.10
...
- there was a SQL injection bug in 3.2.8
- also fixed the version of therubyracer, to avoid dependency on native
v8.
- we need therubyracer to build bootstrap stuff.
2013-01-04 12:33:22 +00:00
Skud
e58b470c16
Merge pull request #76 from pozorvlak/clickable_avatars
...
Clickable avatars
2013-01-03 03:50:22 -08:00
Miles Gould
9ece3e9864
Make user pictures into clickable links.
2013-01-02 13:21:11 +00:00
Miles Gould
a481ea25b1
Factor out gravatar + name into a partial.
2013-01-02 13:21:11 +00:00
pozorvlak
42683d733b
Merge pull request #72 from gnattery/unconfirmed
...
Unconfirmed
2012-12-28 07:26:43 -08:00
gnattery
f5adf601cb
Merge pull request #1 from pozorvlak/unconfirmed
...
Move "is user confirmed" checks into model.
2012-12-28 07:25:45 -08:00
Miles Gould
5d4ba46ce4
Move "is user confirmed" checks into model.
2012-12-28 13:29:46 +00:00
pozorvlak
898b41d656
Merge pull request #74 from Skud/plantsomething
...
Plantsomething
2012-12-22 15:29:41 -08:00
Skud
dd301d1777
improved crop/garden pre-selection in planting form
2012-12-23 10:20:51 +11:00
Skud
02daab4fc1
added crop_id and garden_id params to controller
2012-12-23 10:01:19 +11:00
pozorvlak
e5e3bfa93a
Merge pull request #71 from pozorvlak/creategarden
...
Links and forms to create new gardens
2012-12-21 06:09:29 -08:00
Miles Gould
30fc533748
Document the need for @garden in MembersController#show
2012-12-21 14:07:00 +00:00
Miles Gould
2978a18d4f
Add title to "New garden" tab on profile.
2012-12-21 11:02:39 +00:00
Miles Gould
8cd97deea2
Use Bootstrap formatting on "new garden" form.
2012-12-21 10:36:34 +00:00
pozorvlak
600d27429b
Merge pull request #73 from Skud/planting_markdown
...
render markdown in planting descriptions
2012-12-21 02:14:02 -08:00
Skud
626fc55f37
render markdown in planting descriptions
2012-12-21 13:45:22 +11:00
Skud
bf2b1d6596
select garden/crop based on params - BROKEN TESTSwq
2012-12-21 13:32:32 +11:00
Skud
f9394291ff
show plant something link on garden page
2012-12-21 12:51:30 +11:00
Skud
f3e624dd8d
crops page links to planting the right crop
2012-12-21 12:45:16 +11:00
Skud
d6d7892513
Plant something link in header
2012-12-21 12:27:46 +11:00
Gnat
20df5538ca
No profile for unconfirmed members
2012-12-21 01:00:56 +00:00
Gnat
183dc71b76
Unconfirmed users don't show on members index page
2012-12-21 00:30:01 +00: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
75eb0ab02f
Fix garden tabs in profile; embed "new garden" form.
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
a4fd3ac5d4
Tabbify gardens on members page; add "New garden" link.
2012-12-20 12:13:58 +00:00
Juliet
35cb44c312
ignoring vim backups
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
pozorvlak
ccc1dcdc4e
Merge pull request #70 from Skud/planting
...
Planting
2012-12-19 04:38:02 -08:00
Skud
4168aec523
removed extraneous h2
2012-12-19 21:34:30 +11:00
Skud
5f13567dd1
Added stringification for crops
...
to prevent plantings from having to know too much about the crop model
2012-12-19 21:31:17 +11:00
Skud
a52b677058
bootstrapified the save button
2012-12-19 21:25:59 +11:00
Skud
c4daa4396e
Made the planting form friendlier
...
and removed an extraneous title that wasn't meant to be there
2012-12-19 21:24:58 +11:00
Skud
b2d276a2e6
Fixed titles for planting pages
2012-12-19 21:20:22 +11:00
Skud
0b75494c50
added owner for gardens, and to_s for users
2012-12-19 21:08:32 +11:00
Skud
785aa8b178
Added accessor for 'owner'
2012-12-19 20:52:00 +11:00
Skud
f0b0b79906
made the plantings/ page look less crap
2012-12-19 15:45:57 +11:00
Skud
60db9e2e05
only the owner can edit their plantings
2012-12-19 14:47:39 +11:00
Skud
69b7a14c79
prettified garden display, showed names instead of ids
2012-12-19 14:28:58 +11:00
Skud
1711305ee8
Made the form prettier using Bootstrap's horizontal form css
2012-12-19 14:14:41 +11:00
Skud
47790b36a4
Added dropdowns for garden and crop.
2012-12-19 13:56:29 +11:00
Skud
a578375be5
Seeds weren't working because of tos_agreement
2012-12-19 13:50:03 +11:00
Skud
0af986021e
Generated scaffold for plantings
2012-12-19 13:30:40 +11:00
Skud
c0cdfdfb86
Merge pull request #68 from pozorvlak/friendly_updates
...
Include username and date in update slugs
2012-12-17 15:36:14 -08:00
Miles Gould
1fc2170a10
Fix Y10K bug in update tests, at @zoeimogen's insistence.
...
See https://twitter.com/zoeimogen/status/280699989674577921
2012-12-17 17:05:31 +00:00
Miles Gould
febd78d77a
Use username-yyyymmdd-subject-line slugs.
2012-12-17 12:50:51 +00:00
Skud
8060a7f214
Merge pull request #69 from gnattery/gravatar
...
Gravatar
2012-12-16 21:32:57 -08:00
Gnat
1dffa879c2
Added 'identicons' for people who don't have a gravatar
2012-12-17 05:15:18 +00:00
