mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 08:36:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

4522 Commits

Author SHA1 Message Date
Marlena Compton
482650dec6 bar label group and all tests passing 2014-12-06 21:16:22 -08:00
Marlena Compton
cc22b87cf1 barlabelgroup tests passing still horizontalbargraph tests to fix 2014-12-06 08:30:49 -08:00
emmawinston
58728f6a61 Made crop thumbnail markup more semantic 2014-12-05 02:45:39 +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
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
Taylor Griffin
d174f25d03 order messages to be most recent 2014-11-30 16:06:06 +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
Taylor Griffin
cf7ead3d84 Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade 2014-11-30 14:36:10 +11:00
Yoong Kang Lim
969f7e7c23 Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-11-30 14:25:08 +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
Taylor Griffin
18c40809a6 Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade 2014-11-29 22:20:58 +11:00
Marlena Compton
8826b0137a changed growtuff to growstuff which fixed tests 2014-11-26 13:55:27 -08:00
Marlena Compton
d4d76b2e8d committing tests classes I thought I committed earlier :/ 2014-11-26 13:48:22 -08: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
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
Taylor Griffin
c83b01bbb7 catch up with dev 2014-11-18 22:59:43 +11:00
Taylor Griffin
acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin
0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin
56b4f8a221 mimick old FriendlyId behavior when calling find on a model - therefore, Model.find not Model.friendly.find (this probably needs review) 2014-11-16 20:21:34 +11:00
Taylor Griffin
868e5c2079 upgrade jquery-ui-rails gem and config 2014-11-16 12:41:57 +11:00
Taylor Griffin
70185156aa use lambda instead of just relation in names scope 2014-11-16 12:11:56 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Taylor Griffin
8e79199766 wip: upgrading rspec 2014-11-15 22:55:37 +11:00
Taylor Griffin
40a88b5b09 tests run but fail like whoa 2014-11-15 21:44:55 +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
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