mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 15:41:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,065 Commits 65 Branches 76 Tags
a47328eed45b748e413bfb062e77eb76e2d8fdd2
Commit Graph

1253 Commits

Author SHA1 Message Date
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
Skud
844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +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
Skud
4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +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
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
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
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
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
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
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
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
Yoong Kang Lim
03fea2a785 Remove dependent detroy as this wipes out both users. Woops. 2014-11-13 01:52:43 +11:00
Yoong Kang Lim
b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11:00
Kevin Rio
7023b4969b Update position of activity on member details page 
Switched activity and contact.
 2014-11-11 22:42:01 -05:00
pozorvlak
f233d502f7 Merge pull request #445 from yoongkang/plantingsfix 
Plantings index should display finished at date instead of planted at under the finished column
 2014-11-11 20:55:23 +00:00
Yoong Kang Lim
3c3eb1fd78 Fixed/improved method in member model 2014-11-12 01:53:47 +11:00
Yoong Kang Lim
cacc002a01 Added follow/unfollow buttons 2014-11-12 01:47:26 +11:00
Yoong Kang Lim
a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +11:00
Yoong Kang Lim
caad748d08 Plantings index should display finished at date instead of planted at under the finished column. 
Added feature test for plantings index page.
 2014-11-11 22:41:29 +11:00
Taylor Griffin
1d071c197a Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 19:53:00 +11:00
Taylor Griffin
50b8acc67c put finished at bottom of list to make it more obvious when marking a planting finished 2014-11-11 19:52:31 +11:00
Skud
2426c51951 Fixed bug in deleting unused photos 
... and wow, my tests were really not testing what I thought they were
testing :-/
 2014-11-11 19:29:32 +11:00
Taylor Griffin
af9aa690ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 18:37:30 +11:00
pozorvlak
24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Taylor Griffin
0ccd6e843a implement confirm without date functionality on appty on append date js 2014-10-23 22:43:38 +11:00
Taylor Griffin
e9d1d11535 add append date functionality for planting finished on garden show page and planting list page 2014-10-21 19:43:51 +11:00
pozorvlak
4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud
a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Skud
58f1bca683 removed spurious console.log calls 2014-10-19 16:51:08 +01:00
Miles Gould
56b7d89d9e Link scinames to crops, don't show numeric crop IDs 2014-10-19 16:36:10 +01:00
Miles Gould
6de2112c4d Display note on successful sciname deletion. 2014-10-19 16:36:10 +01:00
Skud
7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
emmawinston
1daee9612c Changed set to album on photo page 2014-10-19 14:52:10 +01:00
Skud
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Skud
496c070efd Tweaked layout of crop page sidebar 2014-10-19 14:14:24 +01:00
Skud
f468a8b77b Changed all h1 to content_for :title 2014-10-19 14:04:55 +01:00
Skud
16677a3b86 Removed underline on header area 2014-10-19 14:04:32 +01:00
Skud
41566d39f3 Added map to member profile page 2014-10-19 13:50:43 +01:00