 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 |
|
|
Brenda Wallace
|
882d641683
|
Photo changes expire homepage too
|
2017-03-03 08:49:24 +13:00 |
|
|
Shiny
|
d23be43c2f
|
Merge branch 'dev' into overcommit
|
2017-03-02 22:24:18 +13:00 |
|
|
Brenda Wallace
|
6c282ffbd7
|
rubocop fix for redundant self assignment
|
2017-03-02 22:21:15 +13:00 |
|
|
Brenda Wallace
|
076da040b5
|
Revert "Intentionally making rubocop fail"
This reverts commit 17858cc17c.
|
2017-03-02 21:53:20 +13:00 |
|
|
Brenda Wallace
|
17858cc17c
|
Intentionally making rubocop fail
|
2017-03-02 21:50:48 +13:00 |
|
|
Brenda Wallace
|
cfff970812
|
Revert "Intentionally making rubocop unhappy"
This reverts commit 6e3f5f9d77fb4b3b81265665adea1e1b416469fe.
|
2017-03-01 20:48:15 +00:00 |
|
|
Brenda Wallace
|
0db8c2feb2
|
Intentionally making rubocop unhappy
to test travis
|
2017-03-01 20:48:15 +00:00 |
|
|
Brenda Wallace
|
dd710860de
|
Run the linters etc from overcommit
|
2017-03-01 20:48:15 +00:00 |
|
|
Brenda Wallace
|
ce03b4efde
|
DRY the photos controller
|
2017-02-26 17:03:29 +13:00 |
|
|
Brenda Wallace
|
4eda3a506b
|
Fix up csv importer, should make duplicates
Now matches the old functionality.
|
2017-02-24 20:08:01 +13:00 |
|
|
Brenda Wallace
|
5abc1fb80e
|
duplicate alt name spec (and adding to crop)
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
86d5f5febd
|
sciname/altnames adding code is very similar
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
3d7f2ec20c
|
Updating specs to match new csv importer
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
abbd2cf0a4
|
fix bug: look up parent crop by name in csv import
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
3089c28233
|
Adding validations to sci names and alt names
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
4e722dd123
|
Move crop csv import to own file
|
2017-02-23 15:35:29 +13:00 |
|
|
Brenda Wallace
|
5698a78d9b
|
DRY the accounts controller
|
2017-02-23 09:45:57 +13:00 |
|
|
Brenda Wallace
|
d500c9093d
|
DRY the account types controller
|
2017-02-22 13:21:59 +13:00 |
|
|
pozorvlak
|
3ac4fbcdb8
|
Merge branch 'dev' into seeds-controller
|
2017-02-20 13:36:50 +00:00 |
|
|
pozorvlak
|
25a1f0da9a
|
Merge branch 'dev' into gardens-controller
|
2017-02-20 13:11:18 +00:00 |
|
|
pozorvlak
|
837934167b
|
Merge branch 'dev' into harvests-controller
|
2017-02-20 13:02:58 +00:00 |
|