mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 23:21:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,122 Commits 65 Branches 76 Tags
06c77036287c77cc41b76210ce142225aa2f9cae
Commit Graph

2122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shiho Takagi
06c7703628 auto-suggest to use existing search 2015-01-17 00:31:01 +11:00
Shiho Takagi
619e8590c8 updated test spec for view change 2015-01-17 00:29:11 +11:00
Shiho Takagi
88efcf4da6 updated test spec for view change 2015-01-17 00:25:34 +11:00
Shiho Takagi
556ba33172 updated crop search view 2015-01-17 00:09:39 +11:00
Shiho Takagi
0bea278c5c Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 23:10:28 +11:00
Shiho Takagi
65814f1ef6 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 23:10:08 +11:00
Shiho Takagi
db0eb3e4da Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 22:20:36 +11:00
Shiho Takagi
323f635b7b Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 22:03:01 +11:00
Shiho Takagi
729dba8e0b Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 10:30:15 +11:00
Shiho Takagi
85c3e74cdd Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-16 10:29:39 +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
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
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
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
0afd9dfbe2 Merge pull request #608 from pozorvlak/libv8_fix 
Fix problems installing libv8 on OS X.
 2014-12-14 12:08:01 +11:00
Miles Gould
c446ea9232 Upgrade libv8 to v3.16.14.7. 
The old version was breaking `bundle install` on OS X.
 2014-12-13 11:56:18 +00:00
Miles Gould
43c241219d Update .ruby-version to match Gemfile. 2014-12-13 11:56:18 +00:00
Skud
77e424c412 Merge branch 'juzham-facebook_button' into dev 2014-12-13 08:26:22 +11:00
Skud
82b70cf893 Merge branch 'facebook_button' of https://github.com/juzham/growstuff into juzham-facebook_button 
Conflicts:
	CONTRIBUTORS.md
 2014-12-13 08:26:07 +11:00
Justin Hamman
6b0a298fd1 modified order and text for Facebook 2014-12-12 23:33:53 +11:00
Justin Hamman
78c6220262 updated the homepage to include a facebook icon. Updated all 'keep in touch' icons to be clickable and open new browser windows 2014-12-12 22:56:50 +11:00
Justin Hamman
6f2fa1b72b add facebook test 2014-12-12 22:27:52 +11:00
Skud
b520f9e78b Update CONTRIBUTORS.md 
Removed duplicate contributor
 2014-12-12 18:43:42 +11:00
Skud
b7d9924fa7 Merge pull request #462 from kevieyang/upgrade_ruby_version 
Modified ruby from 2.1.2 to 2.1.5
 2014-12-10 08:49:15 +11:00
Skud
ea41021ae8 Merge pull request #463 from yoongkang/cancanredirect 
Fix for redirect sign-in not working for all models
 2014-12-10 08:48:31 +11:00
Kevin Yang
7f88157696 removed whitespace 2014-12-09 14:11:29 +00:00
Yoong Kang Lim
a69210ae6b Explicitly add spec for notification 2014-12-09 22:07:41 +11:00
Yoong Kang Lim
de26dd3708 to_s not needed 2014-12-09 21:42:17 +11:00
Yoong Kang Lim
2fc6bfb77f Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-12-09 21:32:01 +11:00
Yoong Kang Lim
837121265a Reversed order of authorization and authentication. Also added tests 2014-12-09 21:27:16 +11:00
Kevin Yang
5e2a3db8c2 Added myself to Contributors.md 2014-12-09 20:44:46 +11:00
kevieyang
969c530193 Update .travis.yml 
upgrading ruby 2.1.2 to 2.1.5
 2014-12-09 20:32:47 +11:00
Kevin Yang
e9e238016b Merge branch 'dev' of https://github.com/Growstuff/growstuff into upgrade_ruby_version 2014-12-09 20:28:54 +11:00
Kevin Yang
899d3c3dbe Modified ruby from 2.1.2 to 2.1.5 2014-12-09 20:25:45 +11:00
Skud
7227c1f330 Merge pull request #455 from yoongkang/cancanredirect 
Redirect to sign-in page for any action that requires authentication
 2014-12-09 20:17:58 +11:00
Skud
609f3a46b2 Merge pull request #461 from emmawinston/more_semantic_markup 
Made crop thumbnail markup more semantic
 2014-12-09 19:09:45 +11:00
emmawinston
58728f6a61 Made crop thumbnail markup more semantic 2014-12-05 02:45:39 +00:00
Skud
94df504840 Merge pull request #459 from Skud/brassicafix 
Fix parent crop for B. oleracea Acephela group
 2014-12-03 14:59:17 +11:00
Skud
c1bcbd2e7d Fix parent crop for B. oleracea Acephela group 2014-12-03 14:58:46 +11:00
Skud
e5d71df294 Merge pull request #458 from Skud/brassicafix 
Fixed ordering and capitalisation in brassica import
 2014-12-03 14:51:07 +11:00
Skud
a47328eed4 Fixed ordering and capitalisation in brassica import 2014-12-03 14:50:25 +11:00
Skud
0c30f2198c Merge pull request #437 from pozorvlak/load_alternate_names 
Load alternate names for crops
 2014-12-01 22:22:24 +11:00