mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 19:54:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 101 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
1297 Commits
Author SHA1 Message Date
Savant Krishna 7ef1eb5852 Create a notification to all members mentioned in a post : Feature #505 2015-09-06 14:41:04 +10:00
Daniel O'Connor 994296640b #645 Implement all of finish signup, fix an edge case of an authentication without a member, fix error messages on failed oauth. 2015-08-24 16:20:39 +09:30
twconquest 2882e3d1a5 Correct Gibbon list id to point to correct list 2015-08-21 19:29:03 +00:00
Daniel O'Connor dee7ff34c9 #645 Indicate that a member is omniauthable, so devise knows to render sign-in-with-facebook 2015-08-21 11:36:04 +09:30
Cesy de981689fc Revert "Merge pull request #775 from pozorvlak/speed_up_homepage" 
This reverts commit fa50ff47bb, reversing
changes made to 5b19d236d0.

Once fixed, please read https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html carefully to get it back in properly.
 2015-08-06 10:56:46 +00:00
Cesy fa50ff47bb Merge pull request #775 from pozorvlak/speed_up_homepage 
Speed up homepage by calculating "interesting" things more efficiently
 2015-08-05 19:18:56 +01:00
Miles Gould f29c0ad085 Replace .length calls with .size 2015-07-23 23:21:55 +01:00
AELOGICA 12d151b68c Added multiple forms for scientific and alternate names on crop creation 2015-07-17 07:31:51 +08:00
Miles Gould fc1dc0e4c3 Remove unused Planting#interesting? method. 2015-07-11 14:32:27 +01:00
Miles Gould 492bdd915f Move the rest of Planting.interesting into the DB 
We could maybe make it a scope at this point...
 2015-07-11 14:32:27 +01:00
Miles Gould 07c976b1fc Filter plantings-with-photos in the DB, not Ruby. 2015-07-11 14:32:27 +01:00
Miles Gould 2faada7f14 Find interesting crops using DB queries 2015-07-11 14:32:27 +01:00
AELOGICA 4ca4d6b030 Fixed error where progress bars do not change upon update 2015-07-07 08:20:43 +08:00
AELOGICA 372a7f080d Added the days before maturity feature #678 2015-07-07 08:20:42 +08:00
Cjay Billones bb88041fef [Refactoring] Replace .count and .length with .size for collections 
Improved program efficiency (in querying in particular) by replacing .count and .length with .size for collections.

Fix error in refactoring

Reverted some .size into .count
 2015-06-25 12:09:03 +08:00
Andrey e35ebab380 Reply to notification action 2015-05-27 11:56:24 +10:00
Mackenzie Morgan bd0da36d63 reverse the rejection_explanation logic to not use != 2015-03-17 21:23:54 -04:00
Mackenzie Morgan 920ca2948b add helper function for crop rejection explanation and use it on both notifier and status message 2015-03-09 00:50:34 -04:00
Shiho Takagi 35f8c126b6 using scope for searching only approved records 2015-02-18 15:38:28 +11:00
Shiho Takagi 506e3e550c update sql search to excludes unapproved crops 2015-02-18 11:26:14 +11:00
Shiho Takagi 436e7e3c59 Merge branch 'dev' of https://github.com/Growstuff/growstuff into PT80956846_crop_search 2015-02-18 10:33:48 +11:00
Shiho Takagi 023333b15f exclude unapproved crops from search 2015-02-17 23:52:02 +11:00
Skud d0f856d389 Fixed various problems with search matching 2015-02-17 19:20:25 +11:00
Shiho Takagi 3ed7edbfbf merge 2015-02-12 21:09:42 +11:00
Shiho Takagi e09f050088 updated the crop search query for more accurate search 2015-02-12 16:42:36 +11:00
Yoong Kang Lim 75ac2081b0 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:57:28 +11:00
Yoong Kang Lim 36a94156c1 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:54:45 +11:00
Taylor Griffin 623dbdd418 fix search deleting crops 2015-02-10 19:58:43 +11:00
Taylor Griffin b81e034254 tweak permissions for alternate names just like sci names 2015-02-10 18:38:32 +11:00
Taylor Griffin cbb4f9d7ac add rejection notes 2015-02-09 22:17:32 +11:00
Taylor Griffin 0dbc2e1964 prevent users from seeing sci names of crops unless approved 2015-02-09 21:52:52 +11:00
Taylor Griffin 319fc12ebb add crop must be approved validation 2015-02-09 21:13:25 +11:00
Savant Krishna 49a5a26f17 Functionality to sort members by recently joined : Issue #550 2015-02-09 17:47:25 +11:00
Skud f7a2ec2054 Merge pull request #676 from pozorvlak/seed_properties 
New seed properties: days until maturity, organic, GMO, heirloom
 2015-02-09 14:07:20 +11:00
Yoong Kang Lim 33a66dce1f Starting stages of a like feature for posts. 2015-02-05 00:54:31 +11:00
Taylor Griffin 076a6cc1df catch up with upstream dev 2015-02-04 21:41:42 +11:00
Taylor Griffin b842bff9cb wip: fix misc tests 2015-02-04 18:36:14 +11:00
Taylor Griffin 80a28085f1 make pending crops unviewable to regular members 2015-02-04 14:44:12 +11:00
Taylor Griffin 0dd8cbccf0 refactor default scope on crop 2015-02-04 14:21:35 +11:00
Taylor Griffin abece6473b make rejected and pending crops viewable on wrangle crops page 2015-02-04 14:18:10 +11:00
Taylor Griffin ff1b941690 validate that a crop hasn't already been rejected or approved 2015-02-04 06:56:51 +11:00
Taylor Griffin 0993917dc6 define approval status options in model 2015-02-03 13:28:44 +11:00
Taylor Griffin d6cb20e2c4 make reasons for rejection a select input 2015-02-03 13:27:41 +11:00
Taylor Griffin 47dc94f820 reason_for_rejection is required if marked as rejected 2015-02-03 13:18:59 +11:00
Miles Gould c1870d46a2 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-02 17:45:49 +00:00
Shiho Takagi 656b0e44d8 fixing issue with elasticsearch option false in dev 2015-02-02 18:40:24 +11:00
Skud af39df5e0c Fixed test failure if elasticsearch isn't present in test env 2015-02-02 18:20:16 +11:00
Mackenzie Morgan 7ca89908cd merge from upstream 2015-02-01 22:00:52 -05:00
Mackenzie Morgan 2c94f61843 use %0.3f instead of %0.2f so we get to gram-granularity, and don't duplicate code 2015-02-01 21:59:33 -05:00
Taylor Griffin 2f67ffd2f8 fix regressions 2015-02-02 00:01:49 +11:00