11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Skud	266fd99a12	Merge branch 'master' of heroku.growstuff:growstuff-dev into redesign-homepage	2013-08-18 20:14:00 +10:00
Skud	b793762dc1	rearranged interesting methods a bit	2013-08-18 20:06:10 +10:00
Skud	75bdd0068e	Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev	2013-08-14 14:00:33 +10:00
Skud	e1fcac240a	Merge pull request #279 from Skud/redesign-homepage ... removed redundant check for photos	2013-08-13 21:00:18 -07:00
Skud	48313007f9	removed redundant check for photos	2013-08-14 13:58:26 +10:00
Skud	06927e2a4b	Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev	2013-08-14 13:54:47 +10:00
Skud	66e19bf02e	Merge pull request #278 from Skud/redesign-homepage ... and another try and making caching work	2013-08-13 20:54:34 -07:00
Skud	9409fc6507	and another try and making caching work	2013-08-14 13:52:53 +10:00
Skud	8ba611a54a	and another try and making caching work	2013-08-14 13:51:54 +10:00
Skud	91cc08d46c	Merge pull request #277 from Skud/redesign-homepage ... fixed caching errors (we weren't caching what we thought we were)	2013-08-13 20:40:05 -07:00
Skud	a04c93f843	fixed caching errors (we weren't caching what we thought we were)	2013-08-14 13:38:05 +10:00
Skud	96b236cb72	Merge pull request #276 from Skud/redesign-homepage ... Redesign homepage	2013-08-13 19:55:50 -07:00
Skud	ebe36438ba	Cache recent crops on homepage	2013-08-14 12:38:52 +10:00
Skud	f0d4ec2690	cache crop image with popover	2013-08-14 12:15:53 +10:00
Skud	7e98981c0a	standardise on _id for caching	2013-08-14 12:09:11 +10:00
Skud	f6fea51ac3	cache planting snippets on homepage	2013-08-14 12:08:27 +10:00
Skud	e8cb5e89b6	Changed interesting methods to always return 12 ... ... because it makes the caching more effective. Use .first(n) to get a smaller number if you want it.	2013-08-14 11:58:54 +10:00
Skud	5d3a44ae0c	cache stats and member thumbnails on homepage	2013-08-14 11:47:09 +10:00
Skud	46aa6ec758	added caching to the Blah.interesting methods	2013-08-14 11:06:18 +10:00
Skud	533529fa08	Got rid of old, unused recent plantings partial	2013-08-14 11:03:00 +10:00
Skud	e54697189f	look up nominatim directly	2013-08-13 12:31:19 +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	5cc1ab2ab5	switched geocoding from google to openstreetmaps	2013-08-12 13:00:54 +10:00
Skud	d30f8e443e	added popovers, added map on places/show page	2013-08-12 12:36:09 +10:00
Skud	be9bc4ba4d	added 'Places' to top nav	2013-08-12 10:48:06 +10:00
Skud	32f2830df5	changed located scope to ignore blank lat/long	2013-08-12 10:46:35 +10:00
Skud	e4aac36763	Merge pull request #275 from Skud/redesign-homepage ... Redesign homepage	2013-08-08 21:59:20 -07:00
Skud	e1d6c6bf70	fixed member thumbnails on homepage and changed member index to match	2013-08-09 14:58:36 +10:00
Skud	5f1b3274ce	tightened up sidebar text	2013-08-09 14:45:38 +10:00
Skud	1a764877a7	added signin link to green call to action box	2013-08-09 14:36:51 +10:00
Skud	51964b18ab	generalised credentials*.sh in gitignore	2013-08-09 14:30:21 +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
Skud	12c9ee67d8	Made h3 smaller (so it's smaller than h2)	2013-08-09 12:58:34 +10:00
martyhines	07efe0dc8d	Added bio to the member profile	2013-08-08 22:18:18 -04:00
martyhines	0d5b2bbcce	Added bio to member model	2013-08-08 21:38:01 -04:00
martyhines	80b628ed89	Add autocomplete=off to location field	2013-08-08 20:58:00 -04: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