Commit Graph

1569 Commits

Author SHA1 Message Date
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
Cesy
5b19d236d0 Merge pull request #783 from pozorvlak/remove_last_count_calls
Replace the last few .count and .length calls with .size where possible
2015-08-05 18:57:04 +01:00
Cesy
cad2c90a4f Merge pull request #784 from pozorvlak/fail_noisily_if_no_secret
Check existence of secret token before using it.
2015-08-05 16:03:31 +01:00
pozorvlak
de63fdc952 Merge pull request #786 from sha1sum/open_service_in_footer
Resolves #617 - Open Service graphic link in footer
2015-07-28 22:00:19 +01:00
Anthony Atkinson
9d62c012f1 Resolves #617 - Open Service graphic link in footer 2015-07-25 13:34:16 -04:00
Miles Gould
91a128ae7e Check existence of secret token before using it.
People were forgetting to create config/environment.yml, which meant
that RAILS_SECRET_TOKEN wasn't being set, which meant that all tests
involving notifications failed. Unfortunately, the resulting wall of
error messages (https://gist.github.com/sha1sum/5debae6b700ff8fc0c76)
did not make the root cause remotely clear, leading to much confusion
and head-scratching all round.

This commit checks for the existence of RAILS_SECRET_TOKEN and fails
with an informative error message if it's missing.
2015-07-24 15:16:31 +01:00
Miles Gould
d9dd797c33 Merge branch 'pr/782' into dev 2015-07-24 11:09:35 +01:00
Miles Gould
f970fc4db2 Fix another whitespace problem. 2015-07-24 11:09:22 +01:00
Miles Gould
8873986562 Merge branch 'pr/779' into dev 2015-07-24 11:05:21 +01:00
Miles Gould
40b5a47aae Remove trailing whitespace 2015-07-23 23:22:45 +01:00
Miles Gould
f29c0ad085 Replace .length calls with .size 2015-07-23 23:21:55 +01:00
Miles Gould
96b0198d41 Replace remaining calls to count() with size()
The couple that aren't removed are required: for instance, there's a
Crop.count method, but no Crop.size method.
2015-07-23 23:05:39 +01:00
Mackenzie Morgan
e3738ca0c6 whitespace tab/space correction 2015-07-23 13:56:23 -04:00
Mackenzie Morgan
b0d4f9c731 switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780 2015-07-23 13:56:07 -04:00
Anthony Atkinson
bc058b9152 Missed a few optional field placeholders on Seed form. 2015-07-23 11:36:40 -04:00
AELOGICA
aa3cf729c8 Added feature tests for on gardens, seeds and harvests for the card based thumbnails 2015-07-23 15:44:27 +08:00
AELOGICA
611adc0728 Fixed test errors for seeds and garden thumbnails. 2015-07-23 15:44:26 +08:00
AELOGICA
a97acfb1ca Fixed display of edit glyphicon based on edit priviledge. 2015-07-23 15:44:26 +08:00
AELOGICA
7e03ef1687 Fixed display of plantings on gardens thumbnail. 2015-07-23 15:44:26 +08:00
AELOGICA
c12791e428 Created card-based thumbnails for Seeds and Gardens page. 2015-07-23 15:44:25 +08:00
AELOGICA
bbe7d967b4 Changed px to em and used truncate instead of srolling for long harvest descriptions. 2015-07-23 15:44:25 +08:00
AELOGICA
f5336bd8f8 Created card based template for harvests. 2015-07-23 15:44:25 +08:00
Anthony Atkinson
4786e3e087 Marking required and optional fields on Garden form. 2015-07-22 11:07:32 -04:00
Anthony Atkinson
715a004b13 Marking required and optional fields on Seed form. Purposefully marked required those select fields which have no blank option. 2015-07-22 11:05:21 -04:00
Anthony Atkinson
96a007ef3b Marking required and optional fields on Harvest form. 2015-07-22 11:02:46 -04:00
Anthony Atkinson
a03d044049 Make a reusable helper for the "* denotes a required field" help text and change the Planting form to use the helper. 2015-07-22 10:59:47 -04:00
Anthony Atkinson
9a6c32fe6d Planting form with required fields marked and optional fields with "optional" placeholders or select options. 2015-07-22 10:52:08 -04:00
Anthony Atkinson
fc33269f47 Reusable class for adding a 1em bottom margin to a block and .red class for red foreground color. 2015-07-22 10:51:37 -04:00
Anthony Atkinson
30032f5527 Add a red asterisk via CSS after all .form-group labels with the .required class. 2015-07-22 10:38:41 -04:00
AELOGICA
7b3aefacd3 Hidden the +/- buttons by dby default, making them visible via JavaScript code. 2015-07-17 07:55:03 +08:00
AELOGICA
a581b759a3 Added tests for creating crops with multiple scientific and alternate names 2015-07-17 07:31:53 +08:00
AELOGICA
734b57e395 Fixed feature test errors 2015-07-17 07:31:53 +08:00
AELOGICA
12d151b68c Added multiple forms for scientific and alternate names on crop creation 2015-07-17 07:31:51 +08:00
AELOGICA
472acd0e81 Polished UI of added forms for alternate names 2015-07-17 07:31:51 +08:00
AELOGICA
7f88b167b4 Added dynamic adding and removing additional scientific names 2015-07-17 07:31:51 +08:00
Miles Gould
897eac4fae Merge branch 'pr/727' into dev 2015-07-17 00:31:00 +01:00
pozorvlak
8c017b24e0 Merge pull request #774 from jacarandang/signout
[#568] Signout redirects to last page visited
2015-07-16 23:22:03 +01:00
AELOGICA
0816b6b114 Added link to owner's profile from seeds', plantings', and harvests' index 2015-07-13 10:42:06 +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
pozorvlak
133a67a8f2 Merge pull request #764 from GabrielSandoval/gab/places
Fixes #720 - Places show nearby seeds, members, and plantings.
2015-07-10 16:26:25 +01:00
AELOGICA
4193e38034 Fixed feature test errors on garden/show page. 2015-07-10 15:43:08 +08:00
AELOGICA
9eaaa8856f Added row divs for members/_gardens, gardens/show, planting/index page. 2015-07-10 15:27:34 +08:00
AELOGICA
3ea9f2b5f2 Applied the responsive planting thumbnail to plantings/index page. 2015-07-10 15:18:39 +08:00
AELOGICA
723329ac49 Made the plantings/_thumbnail partial flexible for small and large screen sizes. 2015-07-10 15:11:15 +08:00
AELOGICA
89424b931b Replaced 'sunniness_not specified.png' icon with a darker one. 2015-07-10 13:17:43 +08:00
Jym Paul A. Carandang
9f3d3b2b8f Signout redirects to last page visited 2015-07-10 12:51:36 +08:00
AELOGICA
80c1e1bf23 Removed the column headers of planting thumbnails. 2015-07-10 11:25:05 +08:00