 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
|
53eb171dfc
|
Merge pull request #1317 from Growstuff/dev
release 22
release22
|
2017-04-17 05:00:59 +00:00 |
|
|
deppbot
|
b0b6931678
|
Bundle Update on 2017-04-17
|
2017-04-17 03:45:39 +00:00 |
|
|
Daniel O'Connor
|
d515dba7f2
|
Merge pull request #1316 from Br3nda/garden-thumbnail
Garden thumbnail display cleanup
|
2017-04-16 15:50:52 +09:30 |
|
|
Shiny
|
4958330c9e
|
Merge branch 'master' into dev
|
2017-04-16 02:42:38 +00:00 |
|
|
Brenda Wallace
|
17236a4a8a
|
Garden thumbnail display cleanup
|
2017-04-16 13:48:22 +12:00 |
|
|
Daniel O'Connor
|
3ccab3f857
|
Merge pull request #1309 from Br3nda/fix_1305
Fix 1305
|
2017-04-15 17:11:02 +09:30 |
|
|
Daniel O'Connor
|
0201e873eb
|
Merge branch 'dev' into fix_1305
|
2017-04-15 17:03:15 +09:30 |
|
|
Daniel O'Connor
|
20289e6566
|
Merge pull request #1310 from Br3nda/counter-caches
Adding counter caches
|
2017-04-15 17:01:20 +09:30 |
|
|
Shiny
|
85ded414ec
|
Merge branch 'dev' into fix_1305
|
2017-04-15 06:50:16 +00:00 |
|
|
Shiny
|
299c95c5f5
|
Merge branch 'dev' into counter-caches
|
2017-04-14 07:40:19 +00:00 |
|
|
Taylor Griffin
|
8f51090098
|
make mentionbot settings file
|
2017-04-14 07:40:01 +00:00 |
|
|
deppbot
|
5551eeba24
|
Bundle Update on 2017-04-14
|
2017-04-14 07:10:10 +00:00 |
|
|
Shiny
|
7a5a68f511
|
Merge branch 'dev' into counter-caches
|
2017-04-14 01:44:44 +00:00 |
|
|
Shiny
|
6d4ec9ad34
|
Merge branch 'dev' into fix_1305
|
2017-04-14 01:44:35 +00:00 |
|
|
Brenda Wallace
|
fffef75813
|
Ignore ConsecutiveComments and IdNames in haml for now
|
2017-04-14 01:43:42 +00:00 |
|
|
Brenda Wallace
|
0e2d7b4393
|
Allow instance variables in partials for now
|
2017-04-14 01:43:42 +00:00 |
|
|
Brenda Wallace
|
f08068c289
|
Upgrade haml_lint
|
2017-04-14 01:43:42 +00:00 |
|
|
deppbot
|
ff653934ad
|
Bundle Update on 2017-04-08
|
2017-04-14 01:43:42 +00:00 |
|
|
Brenda Wallace
|
c4bed2cf4d
|
Merge branch 'haml-lint-fix' into counter-caches
|
2017-04-14 11:42:02 +12:00 |
|
|
Brenda Wallace
|
47c0f74f81
|
Ignore ConsecutiveComments and IdNames in haml for now
|
2017-04-14 11:40:52 +12:00 |
|
|
Brenda Wallace
|
171e34914b
|
Allow instance variables in partials for now
|
2017-04-14 11:40:46 +12:00 |
|
|
Brenda Wallace
|
8010a8b56c
|
Upgrade haml_lint
|
2017-04-14 11:40:40 +12:00 |
|
|
Brenda Wallace
|
ac165ce0cd
|
Adding counter caches
|
2017-04-14 11:32:31 +12:00 |
|
|
Brenda Wallace
|
4925fde28f
|
Ignore ConsecutiveComments and IdNames in haml for now
|
2017-04-14 09:43:16 +12:00 |
|
|
Brenda Wallace
|
6580cf38b0
|
Allow instance variables in partials for now
|
2017-04-13 23:02:16 +12:00 |
|
|
Brenda Wallace
|
fdf10202ba
|
Upgrade haml_lint
|
2017-04-13 22:56:07 +12:00 |
|
|
Brenda Wallace
|
85a368999b
|
we love rubocop
|
2017-04-13 14:30:51 +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 |
|
|
Cesy
|
71aedb136a
|
Merge pull request #1300 from Growstuff/bundle-update-2017-04-02-131809
Bundle Update on 2017-04-02
|
2017-04-08 15:06:16 +01:00 |
|
|
Shiny
|
65c988790b
|
Merge branch 'dev' into bundle-update-2017-04-02-131809
|
2017-04-06 08:04:46 +12:00 |
|
|
Brenda Wallace
|
0372d3b9b0
|
Removing pre-commit.sh script
|
2017-04-06 08:04:09 +12:00 |
|
|
Shiny
|
3272ea1ca5
|
Merge branch 'dev' into bundle-update-2017-04-02-131809
|
2017-04-06 07:51:19 +12:00 |
|