mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-13 02:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,125 Commits 57 Branches 82 Tags
2cd298fbde7d00a7f49b8e130ca6262e1b2c2532
Commit Graph

661 Commits

Author SHA1 Message Date
Skud
2cd298fbde refactored 'interesting plantings' 2013-08-07 13:21:26 +10:00
Skud
4d0f63bf74 Added a popover for planting images too. 2013-08-07 13:21:26 +10:00
Skud
ed0b48bf7d style tweaking 2013-08-07 13:21:26 +10:00
Skud
21928c502c Sidebar: keep in touch, and open stuff 2013-08-07 13:21:26 +10:00
Skud
f6001dcaa3 Added "keep in touch" links to sidebar 2013-08-07 13:21:26 +10:00
Skud
d306aea1ca Added blog and email icons 
Both are free/unrestricted use:

Blog icon from http://theblogicon.com/
Email icon from http://commons.wikimedia.org/wiki/File:Email_social_icon.svg
 2013-08-07 13:21:26 +10:00
Skud
b27d3d8385 roughly got crops/plantings working for new homepage 2013-08-07 13:21:26 +10:00
Skud
2daa4369aa roughed in the framework for new homepage design 2013-08-07 13:21:26 +10:00
Skud
4bcc408236 added recent scope for crops 2013-08-07 13:21:26 +10:00
Skud
382f77e0c2 Merge pull request #267 from Skud/api-review 
Review and cleanup of JSON API
 2013-08-06 19:58:51 -07:00
Skud
c06bafcd01 Merge pull request #265 from Skud/profile-email 
fixed(?) firefox bug with email address in location field
 2013-08-06 19:58:40 -07:00
Skud
a3b7822268 Review and cleanup of JSON API 
Removed JSON from classes that shouldn't have it.
(PT: https://www.pivotaltracker.com/story/show/54570954)

Also found a couple of controllers with broken authorization (i.e. not
checking CanCan). Incidentally, this also fixes the comment form bug at
https://www.pivotaltracker.com/story/show/54328716.
 2013-08-05 13:29:07 +10: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
Skud
40c734a8b5 fixed(?) firefox bug with email address in location field 2013-08-05 11:14:30 +10:00
Skud
e77c402ad9 Merge pull request #263 from Skud/crop_photos 
Crop photos
 2013-07-29 08:11:05 -07:00
Skud
9fe975378d yet another slight rearrangement of the navbar 2013-07-29 12:04:59 +10: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
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
15d7423f53 made RSS feeds author/owner-aware 2013-07-26 15:02:17 +10:00
Skud
5a3fb8f074 avoid redundant 'no items' messages 2013-07-26 14:56:01 +10:00
Skud
ac684dd8ae add author choice to posts page 2013-07-26 14:55:47 +10:00
Skud
ebb8765583 make gardens page look like plantings/seeds 2013-07-26 14:48:55 +10:00
Skud
82da4a09f0 added default sort (created at desc) to seeds 2013-07-26 14:37:12 +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
4a0cecff14 strip tags from garden description 2013-07-26 14:23:46 +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
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
470f8f2f22 allow nil/blank qtys for plantings/seeds 2013-07-23 21:19:21 +10:00
Skud
bdc267b044 added slug for seeds 2013-07-23 21:14:24 +10:00
Skud
adceb61679 fixed javascript datepicker for seeds 2013-07-23 20:55:54 +10:00
Skud
e17f5d6599 Merge pull request #255 from Skud/photo_set 
Photo set
 2013-07-23 03:47:36 -07:00
Skud
2185f257c0 set 'nowhere' as default seed.tradable_to 2013-07-23 20:43:13 +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
091a2dc366 tidying up/bugfixing seed display 2013-07-22 16:41:06 +10:00
Skud
52a00c5ed4 added numeric validation to qty for planting/seed 2013-07-22 16:40:42 +10: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
8d9fc66cd5 cleaned up member.flickr_photos based on flickraw author's advice 2013-07-19 00:17:43 +10:00
Skud
a035e70db6 show the name of the selected set 2013-07-19 00:05:20 +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