mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rocky Jaiswal 31a7011260 update to latest patch on rails 4.1 2015-01-15 15:25:21 +01:00
pozorvlak 181c36cdc9 Merge pull request #635 from tygriffin/fix-cache-key 
Fix cache key
 2015-01-15 11:37:24 +00:00
Taylor Griffin 36ac0b75e7 decoy commit to test if travis / phantomjs error was spurious 2015-01-15 22:23:27 +11:00
Shiho Takagi f9cec41360 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-15 21:44:57 +11:00
Shiho Takagi 19dcf6f3d5 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-15 21:44:04 +11:00
Taylor Griffin d5aef16860 add comment 2015-01-15 21:35:10 +11:00
Shiho Takagi 1d28c30680 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-15 21:33:22 +11:00
Shiho Takagi 9a3c4e69e8 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	app/models/crop.rb
 2015-01-15 21:32:46 +11:00
Taylor Griffin 55ba535353 pass in additional parameters to make a more uniquely identifying cache key 2015-01-15 21:21:40 +11:00
Shiho Takagi 56025d3d33 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	app/models/crop.rb
 2015-01-15 19:34:25 +11:00
Shiho Takagi 59cae7a8ce Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	app/models/crop.rb
 2015-01-15 19:33:27 +11:00
Shiho Takagi 9a9f859b70 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	app/models/crop.rb
 2015-01-15 19:31:14 +11:00
Shiho Takagi ba3a1f6298 Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:28:28 +11:00
Shiho Takagi 10e6e7c3cb Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:05:02 +11:00
Taylor Griffin a510489570 Merge pull request #631 from Skud/newfooter 
New footer
 2015-01-14 22:45:41 +11:00
Taylor Griffin fcbc6002d1 Merge pull request #623 from pozorvlak/seo_crop_detail_page 
Add SEO-friendly language to the crop detail page
 2015-01-14 22:40:25 +11:00
Marlena Compton 1a845fdabc xscale working 2015-01-13 21:40:31 -08:00
Skud eeb48e2ad6 Removed sidebar from homepage. 
Also removed extraneous view tests for things we no longer have.
 2015-01-13 20:13:33 +11:00
Skud b114ed2414 Improved sitewide footer (fixes #526) 2015-01-13 20:07:59 +11:00
Skud 1064f39020 Merge pull request #626 from pozorvlak/authentications_page_die_die_die 
Remove authentications page and extraneous routes
 2015-01-13 10:39:06 +11:00
Skud b5a460a1b7 Merge pull request #624 from pozorvlak/inflections 
Add inflections for irregular plural crop names
 2015-01-13 10:38:58 +11:00
pozorvlak 9a961b80e5 Merge pull request #627 from tygriffin/seed-by-env 
don't load test and admin users in staging
 2015-01-12 13:55:37 +00:00
Taylor Griffin 7bc05fa118 typo 2015-01-12 22:16:42 +11:00
Taylor Griffin f7af7e649d update comment to reflect code changes 2015-01-12 20:13:00 +11:00
Taylor Griffin 4efb93ea45 don't load test and admin users in staging 2015-01-12 07:48:48 +11:00
Miles Gould a5edb6497c Display lack-of-posts nicely on crop page. 2015-01-11 12:08:57 +00:00
Miles Gould d6314ea9a1 SEO: add crop name everywhere 2015-01-11 12:08:57 +00:00
Miles Gould c244ca672f Add tests for SEO of crop detail page 2015-01-11 12:08:57 +00:00
Miles Gould 401777cc4c Add some irregular plurals. 2015-01-11 12:02:02 +00:00
Miles Gould 7ef8afb1ba Tests for crop inflections 2015-01-11 12:02:02 +00:00
Miles Gould e25bb5578a Remove extraneous authentication routes. 2015-01-11 11:57:13 +00:00
Miles Gould 401f3e176e Remove the authentications index page 2015-01-11 11:57:13 +00:00
Taylor Griffin 10ae117914 Merge pull request #451 from tygriffin/rails4-upgrade 
Rails4 upgrade
 2015-01-11 21:12:44 +11:00
Taylor Griffin 86cea2ad9f add current_password to permitted params 2015-01-11 14:55:12 +11:00
Taylor Griffin ccef46a5cf add more permitted parameters to member update 2015-01-11 14:32:19 +11:00
Taylor Griffin c803da3dfa fix planted_at on planting create bug 2015-01-11 14:00:51 +11:00
Taylor Griffin 02ff45f705 broaden seeding for staging env 2015-01-11 09:41:04 +11:00
Taylor Griffin 8a05a959c3 remove depricated method 2015-01-10 15:46:36 +11:00
Taylor Griffin e5d407b1ce replace depricated method 2015-01-10 15:35:54 +11:00
Taylor Griffin 5cd53be5be change post route to get per omniauth docs 2015-01-10 14:59:04 +11:00
Taylor Griffin c6cc8ee6bb configure devise account update for strong parameters 2014-12-31 18:32:37 +11:00
Marlena Compton e52c4f7d4b add group for graph and transform to accommodate labels 2014-12-22 10:24:33 -08:00
Taylor Griffin eaf4ea04ac Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade 2014-12-20 20:45:13 +11:00
Taylor Griffin 007f7112a7 replaced caching using observers with a key-based (and simplified) caching system 2014-12-19 21:17:43 +11:00
Skud 9d49a83918 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-12-17 17:34:42 +11:00
Skud 901fed7d35 Added non-code contribution tips 2014-12-17 17:34:18 +11:00
Skud 6deb0c659a Removed references to PT 2014-12-17 17:34:06 +11:00
Taylor Griffin f62fd8484a get rid of annoying warning about doubly loaded files when running tests 2014-12-15 21:13:22 +11:00
Taylor Griffin 849bdac81b include module that holds expire_fragment method 2014-12-15 21:02:44 +11:00
Taylor Griffin c1d2f2c9cc resolve conflicts 2014-12-15 07:17:11 +11:00