Skud
77bb008083
changed flickr_photo_id to string
...
... because integer worked fine in dev (on sqlite3) but broke on staging
(with postgres). Turns out flickr photo IDs are quite LARGE integers.
But really they could be anything, so string seems safest.
2013-06-01 11:21:17 +10:00
Skud
2667c4aa93
Merge pull request #210 from Skud/photos
...
Photos
2013-05-31 07:38:11 -07:00
Skud
cd111f4cc2
added alt tag
2013-05-31 23:37:48 +10:00
Skud
c63eb64565
photo and planting owners must match
2013-05-31 23:35:07 +10:00
Skud
cab7348a35
show plantings on photo page
2013-05-31 23:13:47 +10:00
Skud
d635d58bf1
show photos on planting page
2013-05-31 22:56:32 +10:00
Miles Gould
e072883bb9
Connect plantings to photos.
2013-05-31 13:10:54 +01:00
Miles Gould
c734f62189
Plantings HABTM photos.
2013-05-31 13:10:54 +01:00
Miles Gould
44a236d90d
Display all photos on index page.
2013-05-31 12:05:09 +01:00
Miles Gould
b2916e28f3
Don't recreate photos, but update metadata.
2013-05-31 11:48:24 +01:00
Miles Gould
b1b24c4323
Delete unused photos_helper.
2013-05-31 11:28:59 +01:00
Miles Gould
20eeec43ca
Merge branch 'dev' into photos
...
Conflicts:
db/schema.rb
2013-05-31 11:24:19 +01:00
pozorvlak
ab951ab999
Merge pull request #209 from Skud/comments-rss
...
Comments rss
2013-05-24 04:09:23 -07:00
Skud
29cbd5d21e
added Craig to contributors list
2013-05-24 14:58:23 +10:00
Skud
5b2fe1b415
Merge branch 'dev' of https://github.com/Growstuff/growstuff into comments-rss
...
Conflicts:
db/schema.rb
2013-05-24 14:57:17 +10:00
Skud
078f89ecbe
Merge pull request #206 from Skud/contributors
...
Added list of contributors
2013-05-23 21:55:59 -07:00
Skud
18b92b133b
Added titles to comment items in RSS
2013-05-24 14:43:45 +10:00
Skud
e17dcf8671
Reordered comments: they are now DESC by default
...
Added scope "post_order" to order them ASC for display on post page.
Also tweaked post/comment views a bit.
2013-05-24 14:36:58 +10:00
Skud
425a2b03fd
Added RSS feed for comments on a single post
2013-05-24 13:43:06 +10:00
Skud
0d3588535e
Added RSS feed for all comments
2013-05-24 13:29:17 +10:00
Skud
57f8575ab9
removed unwanted @recent_comments, replaced w pagination
2013-05-24 12:54:57 +10:00
Craig Read
9437e65763
Replaced plantings RSS with HAML
...
Removed the redundant @recent_plantings variable and added pagination
2013-05-24 12:43:51 +10:00
Craig Read
d563f0ceae
Converting crops RSS to HAML
...
Added spec for crops RSS
Removed redundant @new_crops instance variable (not needed as we now
have pagination).
2013-05-24 12:22:41 +10:00
Craig Read
9c2fed461d
Removed redundant @recent_posts instance variable
...
Not required, as we have pagination by default
2013-05-24 12:05:47 +10:00
Craig Read
bc03a5c488
Converted Posts RSS to HAML
2013-05-24 11:58:40 +10:00
Skud
1ad27fc885
Broke out "committers" and "contributors"
...
I figured this would make it easier to show who's a good person to ask
for help or information, while still crediting everyone who's
contributed.
2013-05-20 15:00:29 +10:00
Skud
e588b312f9
Added list of contributors
...
I know git(hub) gives us much of this, but it doesn't credit the
"copilot" from pairing, so this is a way to list *everyone* who's
contributed to our code, even if they didn't do the actual commit with
their own github account.
2013-05-20 14:56:53 +10:00
Skud
4515167f90
Merge pull request #203 from Skud/crop-hierarchy
...
added crop hierarchy basics
2013-05-19 20:31:19 -07:00
Skud
1b9b1875b8
Merge pull request #205 from pozorvlak/km_miles
...
Fix "km miles of" typo.
2013-05-19 18:16:08 -07:00
Skud
923e298e7b
Merge pull request #202 from Skud/social-icons
...
Added flickr icon, updated twitter icon
2013-05-19 18:15:56 -07:00
Miles Gould
2d3b594ae1
Test for expanded-markdown rendering.
2013-05-16 18:24:22 +01:00
Miles Gould
d5c781a97f
Tests for Haml::Filters::EscapedMarkdown.
2013-05-16 18:00:00 +01:00
Miles Gould
6b487ab1f6
Escaped_Markdown HAML filter, for use in RSS.
...
I tried to do this using Haml::Filters::Markdown so it would be
independent of our Markdown renderer, but I couldn't get
Haml::Filters::Markdown.render to work programmatically - whatever I
did, it returned its input unchanged. So I hardcoded a dependence on
bluecloth.
2013-05-16 15:08:50 +01:00
Miles Gould
bf9521b98b
Fix "km miles of" typo.
2013-05-16 13:25:14 +01:00
Skud
65431ed41f
some improvements to the HAML RSS
2013-05-16 21:39:17 +10:00
Skud
739e7cfd48
Merge branch 'dev' into rss-markdown
2013-05-16 21:14:44 +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
ebd2446a33
added crop hierarchy basics
2013-05-14 23:24:06 +10:00
Skud
c227c11794
Added flickr icon, updated twitter icon
2013-05-14 22:33:55 +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
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
Skud