Skud
b913ca7a19
tiny test fixes to bring things up to date with reality
2013-08-20 14:48:17 +10:00
Skud
68cdb2b50c
moved model access from controller to views to help caching
2013-08-19 20:35:00 +10:00
Skud
3d19772515
Fixed some broken tests for displaying member location
2013-08-19 17:59:40 +10:00
Skud
afc57db8d3
Added links to places pages
...
Committing with broken tests and pushing to github just so people can
take a look at what we're doing.
2013-08-12 13:38:20 +10:00
Skud
be9bc4ba4d
added 'Places' to top nav
2013-08-12 10:48:06 +10:00
Skud
1a764877a7
added signin link to green call to action box
2013-08-09 14:36:51 +10:00
Skud
0d4b2946e9
Fixed up all home/partials tests, now passing
2013-08-09 14:29:17 +10:00
Skud
fc0d883eab
Added tests for home/seeds partial
2013-08-09 14:19:40 +10:00
Skud
70e2e2a6a8
Added tests for home/members partial
2013-08-09 14:16:28 +10:00
Skud
925e8d5d6a
Added tests for home/open partial
2013-08-09 13:33:21 +10:00
Skud
7bba2b9e2c
Added tests for "keep in touch" partial
2013-08-09 13:29:43 +10:00
Skud
0eafaf6311
Added tests for home/stats partial
2013-08-09 13:26:32 +10:00
Skud
c69221cc7b
Wrote tests for crops partial
2013-08-09 13:06:59 +10:00
martyhines
07efe0dc8d
Added bio to the member profile
2013-08-08 22:18:18 -04:00
Skud
7d56cf57a1
got tests passing again, post homepage redesign
2013-08-09 10:18:21 +10:00
Skud
c4e9683fe1
CSS tweaks and some tests
2013-08-07 13:21:27 +10:00
Ryan Clark
fe00146f22
Added map to places/index
2013-08-06 19:38:11 -07:00
Skud
c12c0acc14
removed author fields from RSS
2013-08-05 12:23:36 +10:00
Skud
fa0d818fd9
added metadata to plantings RSS
2013-08-05 12:05:06 +10:00
Skud
128c76bca3
added RSS feed for seeds
2013-08-05 12:04:45 +10:00
Joseph Caudle
a43d3a1ce7
Add places pages
...
This commit builds off of @Skud's spike on locations and largely takes
off from the `nearby_members` feature which previously existed on
members.
One thing to note is that we needed to add a search route and action to
`PlacesController` to account for requests of new places as they could
not be redirected to properly from within `PlacesController#show`.
[Story #53848631 ]
2013-08-02 00:15:51 -04:00
Skud
e77c402ad9
Merge pull request #263 from Skud/crop_photos
...
Crop photos
2013-07-29 08:11:05 -07:00
Skud
8bc75a2276
Show photos on crop page
...
As a side effect of this, we moved a bunch of chunks of the crops page
out into partials. We also moved photo thumbnails (as formerly seen on
the plantings page) into a partial, and then used it to display photos
on the crops page as well.
2013-07-29 11:25:36 +10:00
Skud
a56af4e88f
removed test for member name in navbar
2013-07-27 14:55:06 +10:00
Skud
b8e0f135f0
rearranged navbar yet again
2013-07-26 15:45:13 +10:00
Skud
7c6d7ba3a9
rearranged routing to avoid ?owner_id=99
2013-07-26 15:29:30 +10:00
Skud
ebb8765583
make gardens page look like plantings/seeds
2013-07-26 14:48:55 +10:00
Skud
e2754a94d9
added pagination to seed and planting index pages
2013-07-26 14:36:12 +10:00
Skud
def6426e49
Fixed broken test for clicky analytics
2013-07-26 14:35:42 +10:00
Skud
1ac5683557
display plantings in table form, like seeds
2013-07-26 14:22:49 +10:00
Skud
955975a115
rearranged navbar to include Your Stuff
2013-07-26 14:16:30 +10:00
Skud
fd466e795b
Minor tweaks to seed trading:
...
- changed "Will trade to" to "Will trade" on seeds/show page
- on crop page, only list tradable seeds (not "nowhere" ones) -- did
this by adding a tradable scope to Crop
- on crop page, say "(location unknown)" where necessary
- change heading on crop page to "Find seeds"
- show "Find seeds" heading regardless of whether any are available, and
say there are none if there aren't any, along with a link to add some
- moved "sign in or sign up to add seeds" to under the Find seeds area
2013-07-24 11:20:47 +10:00
Miles Gould
b7cbadf84a
Merge branch 'dev' into seed_trade
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 12:59:41 +01:00
Skud
292f5185ec
Merge pull request #256 from Skud/seed_trade
...
Seed trade
2013-07-23 04:47:51 -07:00
Miles Gould
d57d233e52
Fix broken test.
2013-07-23 12:42:10 +01:00
Miles Gould
da15994a46
Merge branch 'dev' into seed_trade
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 12:32:21 +01:00
Skud
e17f5d6599
Merge pull request #255 from Skud/photo_set
...
Photo set
2013-07-23 03:47:36 -07:00
Skud
6c49c80931
test cleanups (no idea how they got into that state)
2013-07-23 20:28:14 +10:00
Skud
d227da891e
Merge branch 'dev' into seed_trade
2013-07-23 20:21:58 +10:00
Skud
2b6bdeda16
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 19:35:31 +10:00
Ryan Clark
a87db0e406
Show list of seeds for trade on crop/show
2013-07-22 21:15:05 -07:00
Skud
3a96cd96df
removed tradable boolean field
...
we're now relying just on the "tradable_to" field, which is clearer.
2013-07-22 15:47:25 +10:00
Skud
610b100f7f
seed page: cleaned up views/tests for location
2013-07-18 23:54:51 +10:00
Miles Gould
96e66cd9bb
New photo: show an h2 with the name of the current set
...
Also don't show a sets dropdown if the user has no sets.
2013-07-18 14:45:36 +01:00
Ryan Clark
269162c759
Tidied up seed views and added location stuff
2013-07-17 19:37:35 -07:00
Ryan Clark
21a0590114
Add tradable attributes to seed views
2013-07-17 18:59:32 -07:00
Ryan Clark
106c3a74ba
Display a set dropdown on the new photo page.
2013-07-16 18:27:06 -07:00
Skud
491e97c997
connected seeds into other parts of the site
2013-07-15 23:29:14 +10:00
Skud
cc711a0a48
prettified seed-related views
2013-07-15 22:53:30 +10:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud