Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
6911f7b24b
Typo
2016-07-21 12:05:37 +09:30
Daniel O'Connor
4b87977e24
It helps to type properly
2016-07-08 18:12:16 +09:30
Daniel O'Connor
dfa28264c6
#1017 When a crop has no photos, look for harvests of the crop with photos.
2016-07-08 18:09:53 +09:30
Daniel O'Connor
427b98a157
#997 If a harvest doesn't have any photos, try to look at the crop's default photo
2016-07-08 17:59:32 +09:30
Daniel O'Connor
efd112c4b8
And vs && - revised version of b50127c166
2016-07-08 17:01:59 +09:30
Mackenzie Morgan
5c7b760f34
Use array literal [] instead of Array.new
2016-07-08 16:58:34 +09:30
Mackenzie Morgan
81ae473972
space between comma-separated arguments
2016-07-08 16:58:29 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Daniel O'Connor
7fe75ee52a
Fix DEPRECATION WARNING: #deliver is deprecated.
2016-06-10 15:45:01 +09:30
Daniel O'Connor
083035c924
Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup
2016-05-23 16:58:22 +09:30
Miles Gould
52dc111210
Merge branch 'dev' into upgradegibbon
2016-05-22 16:57:38 +01:00
Mackenzie Morgan
51a0a33b2a
upgrade gems and make API change for ruby-units
2016-05-21 16:33:42 -04:00
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Cesy
260b16da11
Merge pull request #865 from CloCkWeRX/fix_progress
...
Fix progress calculations
2016-04-21 08:02:37 +01:00
Daniel O'Connor
3644a8124f
Tweak specs, implementation properly
2016-04-09 22:54:03 +09:30
Cesy
594e3470b4
Merge pull request #858 from CloCkWeRX/fix_plant_parts
...
Fix plant parts / harvests issue #853
2016-04-09 13:25:46 +01:00
Daniel O'Connor
7bb7a18b66
Fixes #850 Refactors percentage grown to model, stops rendering progress bars in situations it doesn't make sense. Adds specs.
2016-04-09 21:45:13 +09:30
Cesy
b69bb219a3
Merge pull request #859 from CloCkWeRX/add_title_validations
...
Add title validations
2016-04-03 11:45:10 +01:00
Daniel O'Connor
de8bcc38d3
#857 Add length validations to models
2016-04-03 00:13:38 +10:30
Daniel O'Connor
99a3be08eb
Fixes #853
2016-04-03 00:08:19 +10:30
Daniel O'Connor
b57cb581dd
#840 Eager load photos
2016-03-28 23:08:26 +10:30
Daniel O'Connor
f23cb78dcb
#840 Eager load photos, which are used in the .interesting? call; so we don't have to do a photos.size call on every single crop.
2016-03-28 23:08:20 +10:30
twconquest
b2f3755196
Additional config fix to point to correct list id
2015-09-09 19:48:35 +00:00
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 fa50ff47bb5b19d236d0https://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
