mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 01:32:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,215 Commits 64 Branches 76 Tags
2c4e768a3afddd2d78fb7233cd9207c1d885d65f
Commit Graph

892 Commits

Author SHA1 Message Date
Shiho Takagi
2c4e768a3a fixing wrong file name 2015-01-26 22:30:19 +11:00
Shiho Takagi
04d61bd040 deployment sript 2015-01-25 16:18:26 +11:00
Shiho Takagi
5a96b7efd6 adding a rake task to generate elasticsearch index 2015-01-25 15:47:40 +11:00
Shiho Takagi
3d738e1b7c Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-21 16:50:21 +11:00
Shiho Takagi
018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Shiho Takagi
d12ec968c4 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:44:59 +11:00
Shiho Takagi
cd57c9cd34 updated test so elasticsearch index is deleted before every test 2015-01-18 00:24:51 +11:00
Shiho Takagi
2a184bcb2e updated test spec for improved elasticsearch syncing method 2015-01-18 00:20:50 +11:00
Shiho Takagi
ad7cfdabd0 cleaning up the code 2015-01-17 19:11:07 +11:00
Shiho Takagi
b4cd151a03 merge from upstream 2015-01-17 14:09:45 +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
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
ba3a1f6298 Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:28:28 +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
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
Miles Gould
c244ca672f Add tests for SEO of crop detail page 2015-01-11 12:08:57 +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
007f7112a7 replaced caching using observers with a key-based (and simplified) caching system 2014-12-19 21:17:43 +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
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +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
6f2fa1b72b add facebook test 2014-12-12 22:27:52 +11: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
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
pozorvlak
751a66b49b Merge pull request #457 from Skud/multiple_scinames 
Multiple scientific and alternate names
 2014-12-01 10:33:46 +00:00
Skud
30c91eb23f Tidy up sidebar on crop detail page 2014-12-01 21:14:44 +11:00
Skud
593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Yoong Kang Lim
b06d48091e Indentation problem 2014-11-30 15:50:13 +11:00
Skud
844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +11:00
Yoong Kang Lim
73d6b5065b Use factorygirl aliases 2014-11-30 15:25:48 +11:00
Yoong Kang Lim
27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Yoong Kang Lim
13c98eac89 Wrapped tests around context blocks to clarify the purpose of the tests. 2014-11-30 15:14:56 +11:00
Skud
4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11:00
Yoong Kang Lim
969f7e7c23 Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-11-30 14:25:08 +11:00
Skud
924efe6af5 Fixed a bug which only occurs in the few months before February 
This is the fundamental problem:

    2.1.2 :005 > Time.zone.now + 3.months
    => Sat, 28 Feb 2015 03:17:24 UTC +00:00
    2.1.2 :006 > Time.zone.now + 3.months + 3.months
    => Thu, 28 May 2015 03:17:32 UTC +00:00
    2.1.2 :007 > Time.zone.now + 6.months
    => Sat, 30 May 2015 03:17:37 UTC +00:00

I changed the test to use the "3.months + 3.months" formulation and it
now passes.
 2014-11-30 14:19:55 +11:00
Skud
39b47b0d08 Merge pull request #454 from krio/rearrange-rss-titles 
Rearrange titles on RSS feeds
 2014-11-30 13:37:30 +11:00
Yoong Kang Lim
81d1189203 Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in 2014-11-24 22:12:42 +11:00
Kevin Rio
2111cddaef RSS feed tests 2014-11-23 21:02:56 -05:00
Kevin Rio
eb4fae463f Comments RSS tests 2014-11-23 11:47:48 -05:00
Yoong Kang Lim
8c55a6101d Formatting problem 2014-11-21 01:14:12 +11:00