 Brenda Wallace
|
677f850e21
|
Removed extra blank line
|
2017-05-20 15:46:37 +12:00 |
|
|
Brenda Wallace
|
d771bc3688
|
More railsy syntax in default scopes
|
2017-05-20 15:46:37 +12:00 |
|
|
Brenda Wallace
|
1dfc58c120
|
Remove default scope from harvest.
Causes an ORDER clause to be added in queries even when not selecting
from that table. E.g. if we 're looking for PlantParts that have a
Harvest
|
2017-05-20 15:46:37 +12:00 |
|
|
Brenda Wallace
|
6f58f266a6
|
Moving has_photos scope to PhotoCapable
-
|
2017-05-20 15:46:37 +12:00 |
|
|
deppbot
|
e38395b6ba
|
Bundle Update on 2017-05-19
|
2017-05-20 07:07:27 +12:00 |
|
|
Daniel O'Connor
|
944d477dbc
|
Merge pull request #1338 from Growstuff/bundle-update-2017-05-16-135240
Bundle Update on 2017-05-16
|
2017-05-16 16:45:08 +09:30 |
|
|
deppbot
|
cbf7ac0126
|
Bundle Update on 2017-05-16
|
2017-05-16 13:52:41 +08:00 |
|
|
Cesy
|
1ad171f37b
|
Merge pull request #1335 from Growstuff/dev
Release 25
release25
|
2017-05-15 20:43:16 +01:00 |
|
|
deppbot
|
06896dacd5
|
Bundle Update on 2017-05-13
|
2017-05-14 18:20:44 +12:00 |
|
|
Shiny
|
ff90d6430d
|
Merge branch 'master' into dev
|
2017-05-13 11:35:26 +12:00 |
|
|
Brenda Wallace
|
4dbdbc4285
|
Pull haml gem back to version 4
|
2017-05-13 11:31:32 +12:00 |
|
|
deppbot
|
0f1c8e0658
|
Bundle Update on 2017-05-03
|
2017-05-13 11:31:32 +12:00 |
|
|
Daniel O'Connor
|
c9ec116c9b
|
Merge pull request #1333 from Br3nda/garden-photos-fixup
Fix up of photo display on garden#show
|
2017-05-11 17:25:51 +09:30 |
|
|
Brenda Wallace
|
e61c3f619b
|
Revert "Only show first 5 photos on gardens#show"
This reverts commit 93b25a5c32.
|
2017-05-07 16:10:14 +12:00 |
|
|
Brenda Wallace
|
93b25a5c32
|
Only show first 5 photos on gardens#show
|
2017-05-07 14:41:14 +12:00 |
|
|
Brenda Wallace
|
f7ca32d888
|
Moved garden photos to right/bottom
|
2017-05-06 13:30:57 +12:00 |
|
|
Brenda Wallace
|
d57c46066a
|
updated view spec to find glypicon
|
2017-05-06 13:27:23 +12:00 |
|
|
Brenda Wallace
|
1e6cb2cfe4
|
don't eager load harvests
|
2017-05-06 12:15:03 +12:00 |
|
|
Brenda Wallace
|
67ae80056a
|
Removed unnecesary div wrap
|
2017-05-06 12:08:23 +12:00 |
|
|
Brenda Wallace
|
13fa3c69e8
|
fixes places
card -> thumbnail
|
2017-05-06 12:06:28 +12:00 |
|
|
Brenda Wallace
|
caad557b2a
|
Updating specs to click glypicons
|
2017-05-06 12:03:57 +12:00 |
|
|
Brenda Wallace
|
0f030d2c27
|
Planting thumbnail links to planting
fixes #1308
|
2017-05-06 11:48:17 +12:00 |
|
|
Brenda Wallace
|
66d548c9c1
|
Added some glypicons to gardenshow
|
2017-05-06 11:47:24 +12:00 |
|
|
Brenda Wallace
|
c168bb4a2b
|
More fix up to alignment and thumbnail row counts gardens#show
|
2017-05-06 11:39:02 +12:00 |
|
|
Brenda Wallace
|
811db2961a
|
Quick fix up of photo display on garden#show
|
2017-05-05 23:38:19 +12:00 |
|
|
Brenda Wallace
|
42cea2ebde
|
Fixed spec for days_before_maturity
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
ccc5eb3c9a
|
Make calc_and_set_days_before_maturity public
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
0e71a4fcb3
|
Removed un-needed rubocop ignores
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
4ea681984f
|
Call calc_and_set_days_before_maturity from controller
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
dadc5b96c6
|
Reduced duplicate code further, with responders gem
This makes locale-friendly flash notices
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
787fca138b
|
Added helpful comment about days_until_maturity
|
2017-04-28 20:48:25 +12:00 |
|
|
Brenda Wallace
|
b820615081
|
Moved planting maturity to planting model. simplified controller
|
2017-04-28 20:48:25 +12:00 |
|
|
Cesy
|
812a6f5ec2
|
Merge pull request #1328 from Growstuff/dev
release 24
release24
|
2017-04-28 07:31:21 +01:00 |
|
|
Shiny
|
f1b42ec699
|
Merge branch 'master' into dev
|
2017-04-25 13:14:40 +12:00 |
|
|
Brenda Wallace
|
26c17ea19c
|
Plantings Thumbnails, fit to box
|
2017-04-25 10:58:17 +12:00 |
|
|
Brenda Wallace
|
acc75f80bf
|
include harvests when retrieving data for plantings#index
|
2017-04-25 10:58:17 +12:00 |
|
|
Daniel O'Connor
|
a79a65363f
|
Merge pull request #1326 from Br3nda/plantings-validators
Plantings validators
|
2017-04-24 17:47:41 +09:30 |
|
|
Shiny
|
dfeb4804e7
|
Merge branch 'dev' into plantings-validators
|
2017-04-23 19:35:37 +12:00 |
|
|
deppbot
|
9d20fafd06
|
Bundle Update on 2017-04-23
|
2017-04-23 19:35:23 +12:00 |
|
|
Shiny
|
e9a5ef0058
|
Merge branch 'dev' into plantings-validators
|
2017-04-22 20:50:29 +12:00 |
|
|
Brenda Wallace
|
d2378376e4
|
Plantings validators
Adding garden presence true.
Checks crop presence before crop approved
|
2017-04-22 20:48:48 +12:00 |
|
|
Daniel O'Connor
|
4b1b5d8a18
|
Merge pull request #1323 from Growstuff/bundle-update-2017-04-20-122131
Bundle Update on 2017-04-20
|
2017-04-20 15:27:04 +09:30 |
|
|
deppbot
|
a0770e80e7
|
Bundle Update on 2017-04-20
|
2017-04-20 12:21:32 +08:00 |
|
|
Brenda Wallace
|
f08e740ac6
|
Removed owner_matches?
it's not used anymore
release23
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
5f23bcfad6
|
Photo#show for signed in and not signed in, and other members
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
3cd7b86c99
|
Photos#show links to items
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
bd53d4a271
|
updating view spec - link to delete photo has changed
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
16d88730ec
|
controller specs for PhotoAssociations
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
5ad88eb6bd
|
Responsive image on photos#show
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
b617eb3140
|
Deleting photo's association with another item
|
2017-04-19 08:22:03 +00:00 |
|