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,065 Commits 65 Branches 76 Tags
a47328eed45b748e413bfb062e77eb76e2d8fdd2
Commit Graph

2065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Miles Gould
9f54641e95 Find crops by name when loading altnames 
Crop IDs are not guaranteed to be the same on staging and production.
 2014-12-01 11:03:27 +00:00
Miles Gould
4b90f6385b Merge branch 'dev' into load_alternate_names 
Conflicts:
	Gemfile.lock
	script/deploy-tasks.sh
 2014-12-01 10:47:10 +00: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
6f3e430840 Add deploy tasks for new crops 2014-12-01 21:23:15 +11:00
Skud
d0b61c259d Added squashes and new crops from London working bee 2014-12-01 21:20:44 +11:00
Skud
30c91eb23f Tidy up sidebar on crop detail page 2014-12-01 21:14:44 +11:00
Skud
82a5379a25 Added mint family and brassica crops (seed files) 2014-12-01 20:53:17 +11:00
Skud
593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Taylor Griffin
e7bb285b8e Merge pull request #448 from yoongkang/followerdev 
Allow members to follow other members
 2014-11-30 16:04:35 +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
7ddaca6e11 Use .size instead of .count 2014-11-30 15:19:50 +11:00
Yoong Kang Lim
2036a0f2e9 Used environment variable for site name instead 2014-11-30 15:18:13 +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
Taylor Griffin
14e8c367e1 Merge pull request #456 from Skud/paidaccountbug 
Fixed a bug which only occurs in the few months before February
 2014-11-30 14:23:19 +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
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
Yoong Kang Lim
2ca42bbae3 Slight modification to the notification wording. 2014-11-21 01:05:23 +11:00
Yoong Kang Lim
5de6759917 Moved number of follows/followers under activity and added pagination. 2014-11-21 00:29:45 +11:00
Yoong Kang Lim
aeb7192f48 Break up tests into different scenarios. Defined cancan ability for follows and updated member profile view 2014-11-20 23:46:15 +11:00
Yoong Kang Lim
0ba6562d79 Added more model tests for following behaviour 2014-11-20 01:46:04 +11:00
Yoong Kang Lim
996043d8fb Renamed get_follow_id to get_follow as it does not return id. Also added unit tests for the new methods in the member model. 2014-11-20 01:10:28 +11:00
Yoong Kang Lim
0eb5ae58aa Renamed member_id column in Follow table to follower_id. Made necessary modifications to models and tests. 2014-11-20 00:42:46 +11:00
Skud
6aea16028e Merge pull request #452 from wsmoak/negative-area 
Prevent the creation of a garden with a negative number for the area.
 2014-11-19 17:18:09 +11:00
Skud
5f2ca6bc9d Merge pull request #450 from Skud/login_timeout 
Login timeout
 2014-11-19 17:18:02 +11:00
Skud
9861f8cf51 Merge pull request #447 from krio/add-edit-button-seeds-index 
Add edit button to seeds index page
 2014-11-19 17:17:52 +11:00
Skud
284c28ce9a Merge pull request #441 from yoongkang/editprofile 
Removed "Edit Profile" button from home page
 2014-11-19 17:17:27 +11:00
Wendy Smoak
02994bd5cc Added a test for the validator to show it doesn't accept negative numbers for garden area. 2014-11-18 20:58:00 -05:00
Wendy Smoak
53d782bc83 Prevent the creation of a garden with a negative number for the area. If entered, the area must be greater than or equal to zero. 2014-11-18 20:33:44 -05:00
Skud
93e468876d Remove old capistrano stuff, as we don't use it anymore 2014-11-16 10:17:22 +11:00
Skud
52cfa9f676 Changed staging environment hostname to staging.growstuff.org 2014-11-16 10:16:34 +11:00
Kevin Rio
65706f560b Add test to new edit seed link 2014-11-14 16:37:55 -05:00
Taylor Griffin
7d27251be3 Merge pull request #449 from Skud/login_timeout 
Increase devise timeout to 30 days
 2014-11-13 22:14:29 +11:00
Yoong Kang Lim
bd8be01ec7 Merge branch 'dev' into editprofile 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 21:38:05 +11:00
Yoong Kang Lim
3dbb585467 Removed edit profile button from home page 
Added yoongkang to the contributors list

Feature test for edit profile button on homepage
 2014-11-13 21:28:15 +11:00
Skud
bfce66a8f7 Increase devise timeout to 30 days 2014-11-13 11:28:14 +11:00
Skud
f56c184033 Merge branch 'tygriffin-finish-plantings-javascript' into dev 2014-11-13 10:58:06 +11:00
Skud
68dfdbeba1 Merge branch 'finish-plantings-javascript' of github.com:tygriffin/growstuff into tygriffin-finish-plantings-javascript 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-13 10:57:55 +11:00
Skud
0ffa3a6d0f Merge pull request #438 from tygriffin/byebug 
replace debugger with byebug
 2014-11-13 10:51:53 +11:00
Kevin Rio
8d74fd52db Rearrange titles on RSS feeds 
https://www.pivotaltracker.com/n/projects/646869/stories/50492161
 2014-11-12 13:54:01 -05:00
Yoong Kang Lim
77f40a3dc2 Fixed comment + code style 2014-11-13 02:10:54 +11:00
Kevin Rio
43fa356670 Add edit button to seeds index page 
https://www.pivotaltracker.com/n/projects/646869/stories/53958137
 2014-11-12 09:56:05 -05:00