mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 21:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,170 Commits 63 Branches 82 Tags
fc0d883eab566b2effa8897fb753bcdc571e3735
Commit Graph

1170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Skud
12c9ee67d8 Made h3 smaller (so it's smaller than h2) 2013-08-09 12:58:34 +10:00
Skud
7d56cf57a1 got tests passing again, post homepage redesign 2013-08-09 10:18:21 +10:00
Skud
bbe623c081 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-08 11:58:14 +10:00
Skud
db8c2e4aef Merge pull request #272 from sabreuse/homepage-css 
Remove a border and extra padding that looked out of place in the mobile...
 2013-08-07 18:57:51 -07:00
Amy
547476e8fd Remove a border and extra padding that looked out of place in the mobile view. 2013-08-07 21:46:52 -04:00
Skud
88c09d6df5 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-07 16:48:26 +10:00
Skud
e871c7628c Merge pull request #271 from Skud/redesign-homepage 
Fixed locatable scope for pgsql (needs single quotes)
 2013-08-06 23:48:11 -07:00
Skud
f9f929e508 Fixed locatable scope for pgsql (needs single quotes) 2013-08-07 16:46:21 +10:00
Skud
1787d6729a Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 
Conflicts:
	app/models/crop.rb
 2013-08-07 16:35:24 +10:00
Skud
a2d3ef0440 Merge pull request #270 from Skud/redesign-homepage 
Redesign homepage
 2013-08-06 23:34:42 -07:00
Skud
d5d004306b randomise crops on homepage 2013-08-07 16:33:39 +10:00
Skud
0e401c907e Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:26:51 +10:00
Skud
937ef36b6d don't count empty strings as interesting locations 2013-08-07 16:26:41 +10:00
Skud
7ebdfd5692 fixed some weird formatting fo members 2013-08-07 16:26:33 +10:00
Skud
ee39156036 Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:25:38 +10:00
Skud
3122aa6484 Shuffle interesting crops 2013-08-07 16:16:08 +10:00
Skud
a1383ad9b6 don't count empty strings as interesting locations 2013-08-07 16:13:31 +10:00
Skud
ddd0ec7e03 fixed some weird formatting fo members 2013-08-07 16:08:24 +10:00
Skud
252d19ce7b Merge pull request #269 from Skud/redesign-homepage 
Redesign homepage
 2013-08-06 22:53:22 -07:00
Skud
0c3c9c7694 fixed up some bootstrap formatting (rows/spans) 2013-08-07 15:51:49 +10:00
Skud
c6af9a7bbd Fixed missing heading from messed up merge 2013-08-07 15:28:10 +10:00
Skud
73d9f280b0 Merge pull request #268 from Skud/redesign-homepage 
Redesign homepage
 2013-08-06 21:14:23 -07:00
Skud
f34afae097 merging/rebasing/i'm confused to be honest 2013-08-07 14:03:35 +10:00
Skud
18405de849 tweaked hero unit/blurb/etc on homepage 2013-08-07 13:58:48 +10:00
Skud
1c7a81cd2b added some nicer wording to signup form 2013-08-07 13:21:27 +10:00
Skud
c4e9683fe1 CSS tweaks and some tests 2013-08-07 13:21:27 +10:00
Skud
749a9b8fdc Added seeds and people to homepage 2013-08-07 13:21:27 +10:00
Skud
56e7b8392f refactored interesting crops 2013-08-07 13:21:27 +10:00
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
6908e526c6 Merge pull request #266 from Skud/seeds-rss 
Seeds rss
 2013-08-06 19:58:23 -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