 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 |
|
|
Brenda Wallace
|
acc4d3ad84
|
Only delete own associations
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
beb3f7e2b8
|
Don't overwrite edited photo titles
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
ab46a8dd96
|
UI for removing photos from plantings
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
b6b578d7e6
|
Layout change on photos
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
4d07cf80fa
|
Editing title of photos
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
93f6b65d8d
|
bugfix: Only show harvests if we have some
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
b40a6723e1
|
gardens#show Include crop, owner, harvesss and garden in query
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
2058d28b37
|
Include owner in query, because we need it later
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
682c6d6f5e
|
Reduced query count by .includes() on plantings
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
2be55acc92
|
Route for flickr auth callback -- Fixes #1106
|
2017-04-19 08:22:03 +00:00 |
|
|
Brenda Wallace
|
a9a040182c
|
Rubocop compliance for members controller
|
2017-04-19 08:22:03 +00:00 |
|
|
Shiny
|
f39fe94173
|
Merge branch 'master' into dev
|
2017-04-18 18:27:43 +00:00 |
|
|
Brenda Wallace
|
976bdbbd96
|
Removed owner_matches?
it's not used anymore
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
cff1d8bfb9
|
Photo#show for signed in and not signed in, and other members
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
bbdc54cb69
|
Photos#show links to items
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
36f1f7b71a
|
updating view spec - link to delete photo has changed
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
e1731793dd
|
controller specs for PhotoAssociations
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
8ea3b27612
|
Responsive image on photos#show
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
9469a69078
|
Deleting photo's association with another item
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
cc46fe3336
|
Only delete own associations
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
52b4064a2d
|
Don't overwrite edited photo titles
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
d367b9ef21
|
UI for removing photos from plantings
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
4711e4669f
|
Layout change on photos
|
2017-04-18 07:09:47 +00:00 |
|
|
Brenda Wallace
|
3e55024f98
|
Editing title of photos
|
2017-04-18 07:09:47 +00:00 |
|
|
Daniel O'Connor
|
ccf56bf944
|
Merge pull request #1321 from Br3nda/harvests-display
bugfix: Only show harvests if we have some
|
2017-04-18 12:24:01 +09:30 |
|
|
Shiny
|
42e51a9cf6
|
Merge branch 'dev' into harvests-display
|
2017-04-17 10:00:20 +00:00 |
|
|
Brenda Wallace
|
667e0cc0e3
|
bugfix: Only show harvests if we have some
|
2017-04-17 21:59:31 +12:00 |
|
|
Brenda Wallace
|
339830b3bb
|
gardens#show Include crop, owner, harvesss and garden in query
|
2017-04-17 08:59:34 +00:00 |
|
|
Brenda Wallace
|
7770164672
|
Include owner in query, because we need it later
|
2017-04-17 08:59:34 +00:00 |
|
|
Brenda Wallace
|
f333607572
|
Reduced query count by .includes() on plantings
|
2017-04-17 08:59:34 +00:00 |
|
|
Brenda Wallace
|
87d3764eeb
|
Route for flickr auth callback -- Fixes #1106
|
2017-04-17 08:28:52 +00:00 |
|
|
Cesy
|
faf487b719
|
Merge pull request #1314 from Br3nda/members-controller
Rubocop compliance for members controller
|
2017-04-17 09:13:26 +01:00 |
|