 Brenda Wallace
|
976bdbbd96
|
Removed owner_matches?
it's not used anymore
|
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 |
|
|
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 |
|
|
Shiny
|
cd272a6443
|
Merge branch 'dev' into members-controller
|
2017-04-16 09:44:32 +00:00 |
|
|
Brenda Wallace
|
17236a4a8a
|
Garden thumbnail display cleanup
|
2017-04-16 13:48:22 +12:00 |
|
|
Brenda Wallace
|
936a8778ed
|
Rubocop compliance for members controller
|
2017-04-16 12:03:48 +12:00 |
|
|
Daniel O'Connor
|
0201e873eb
|
Merge branch 'dev' into fix_1305
|
2017-04-15 17:03:15 +09:30 |
|
|
Brenda Wallace
|
ac165ce0cd
|
Adding counter caches
|
2017-04-14 11:32:31 +12:00 |
|
|
Daniel O'Connor
|
6ba4b4560e
|
Fix #1305 by adding aggregation
Expand test coverage
member_id is owner_id on plantings
Argue with ActionView::Template::Error about what we can group on
Rename variable
|
2017-04-13 14:30:41 +12:00 |
|
|
Brenda Wallace
|
2521e52d71
|
Remove test called to Planting.interesting(...)
Interesting plantings with no photos is not used in the code.
The method was converted to a scope.
|
2017-03-29 08:28:58 +13:00 |
|
|
Brenda Wallace
|
63cee1edc9
|
Back to reading @garden.plantings
|
2017-03-29 08:21:02 +13:00 |
|
|
Brenda Wallace
|
3791b34fe3
|
One planting per owner (used for intersetingness)
|
2017-03-28 22:39:03 +13:00 |
|
|
Brenda Wallace
|
5d58be110e
|
Fixed crop.interesting, no more duplicate crops
|
2017-03-28 19:33:34 +13:00 |
|
|
Brenda Wallace
|
911593b480
|
Reduces query numbes on gardens#show
|
2017-03-24 21:10:45 +13:00 |
|
|
Shiny
|
b72a3d6942
|
Merge branch 'dev' into query-optimising
|
2017-03-24 18:31:18 +13:00 |
|
|
Brenda Wallace
|
804ac8662a
|
Rubocop fix ups
|
2017-03-24 17:29:39 +13:00 |
|
|
Brenda Wallace
|
1601e966ad
|
Planting.interesting is in a scope
|
2017-03-24 16:59:09 +13:00 |
|
|
Brenda Wallace
|
e7553868f2
|
Removed variables on homes controller
following the comment there
|
2017-03-24 16:57:51 +13:00 |
|
|
Brenda Wallace
|
5e8ca392d2
|
Moved Member.interest near top of file
|
2017-03-24 16:45:55 +13:00 |
|
|
Brenda Wallace
|
815915d933
|
Loading child records of interesting crops
|
2017-03-24 16:45:36 +13:00 |
|
|
Brenda Wallace
|
6223076dae
|
Pull in interesting members data in controller
|
2017-03-24 16:30:56 +13:00 |
|
|
Brenda Wallace
|
0182a99654
|
Optimising Member.interesting
|
2017-03-24 16:28:37 +13:00 |
|
|
Shiny
|
7f592579cd
|
Merge branch 'dev' into plantings-harvests
|
2017-03-16 15:35:06 +13:00 |
|
|
Brenda Wallace
|
998befb30f
|
Limited plantings to member's own garden, and approved crops
|
2017-03-16 15:29:25 +13:00 |
|
|
Shiny
|
ebbf6df87d
|
Merge branch 'dev' into plantings-harvests
|
2017-03-16 14:59:54 +13:00 |
|
|
Arun Kumar
|
f7ec1826b0
|
Use presence instead of regex validation
|
2017-03-16 13:27:13 +13:00 |
|
|
Daniel O'Connor
|
4a20f68d3a
|
Merge branch 'dev' into plantings-harvests
|
2017-03-16 09:40:56 +10:30 |
|
|
Daniel O'Connor
|
92b8972b24
|
Merge pull request #1278 from Br3nda/bw/crop-model-dupe
Reduced duplication of the term "approved" in crop model
|
2017-03-16 09:37:24 +10:30 |
|
|
Daniel O'Connor
|
12254fe0ca
|
Merge pull request #1275 from Br3nda/bw/discourse-removal
Removing references to Discourse (talk.growstuff.org)
|
2017-03-16 09:36:29 +10:30 |
|
|
Shiny
|
8d04d4b223
|
Merge branch 'dev' into plantings-harvests
|
2017-03-15 23:10:15 +13:00 |
|
|
Shiny
|
35d9c8e9f1
|
Merge branch 'dev' into bw/crop-model-dupe
|
2017-03-15 23:09:31 +13:00 |
|
|
Shiny
|
5585dbada1
|
Merge branch 'dev' into gardens-order
|
2017-03-15 23:09:09 +13:00 |
|
|
Thomas Countz
|
fa49234669
|
remove "add new garden" on other member's page (#1283)
* update garden#show view logic
* added name to contributors
Closes #1167
|
2017-03-15 23:06:32 +13:00 |
|
|
Brenda Wallace
|
195d1bbdbb
|
order gardens by recently updated
|
2017-03-12 20:12:28 +13:00 |
|
|
Brenda Wallace
|
c89c20e842
|
View harvests for a planting
|
2017-03-12 14:44:11 +13:00 |
|
|
Brenda Wallace
|
02de30f617
|
Reduced duplication of the term "approved" in crop model
|
2017-03-12 12:31:38 +13:00 |
|
|
Brenda Wallace
|
8267b7d16d
|
Removing references to Discource (talk.growstuff.org)
and adding one link to github issues.
|
2017-03-12 10:51:25 +13:00 |
|
|
Brenda Wallace
|
1e0ccd72a2
|
Added missing semicolons to js files
|
2017-03-04 17:06:29 +13:00 |
|