 Brenda Wallace
|
5baa357bb3
|
Use bullet to find queries to optomise
|
2017-03-24 16:07:05 +13:00 |
|
|
deppbot
|
0fb4d74685
|
Bundle Update on 2017-03-24
|
2017-03-24 09:24:40 +13:00 |
|
|
Daniel O'Connor
|
eebaef6fde
|
Merge branch 'dev' into bw/readme-new-contributors
|
2017-03-21 14:03:22 +10:30 |
|
|
Daniel O'Connor
|
59fc550f3c
|
Merge pull request #1290 from Growstuff/bundle-update-2017-03-19-161121
Bundle Update on 2017-03-19
|
2017-03-20 14:15:06 +10:30 |
|
|
Shiny
|
64ffaab1ec
|
Merge branch 'dev' into bundle-update-2017-03-19-161121
|
2017-03-20 10:01:48 +13:00 |
|
|
Cesy
|
21f53e362f
|
Merge pull request #1279 from Br3nda/plantings-harvests
View harvests for a planting
|
2017-03-19 09:46:57 +00:00 |
|
|
deppbot
|
20cfa0c5b2
|
Bundle Update on 2017-03-19
|
2017-03-19 16:11:22 +08:00 |
|
|
Shiny
|
204633d533
|
Merge branch 'dev' into bw/readme-new-contributors
|
2017-03-18 14:21:43 +13:00 |
|
|
Shiny
|
c77ed8c6d0
|
Merge branch 'dev' into plantings-harvests
|
2017-03-17 08:18:56 +13:00 |
|
|
Shiny
|
fe7ae18e7b
|
Merge pull request #1285 from Growstuff/add-contributor-megan
Added Megan to contributors
|
2017-03-17 08:13:03 +13:00 |
|
|
Shiny
|
8746cc67e2
|
Merge branch 'dev' into plantings-harvests
|
2017-03-17 08:11:33 +13:00 |
|
|
Shiny
|
f1feb59818
|
Merge branch 'dev' into add-contributor-megan
|
2017-03-17 08:10:32 +13:00 |
|
|
Shiny
|
bb62b11070
|
Merge branch 'dev' into bw/readme-new-contributors
|
2017-03-16 21:15:30 +13:00 |
|
|
deppbot
|
1660d54c01
|
Bundle Update on 2017-03-16
|
2017-03-16 21:15:11 +13:00 |
|
|
Shiny
|
cb7715b6d9
|
Merge branch 'dev' into bw/readme-new-contributors
|
2017-03-16 15:35:22 +13:00 |
|
|
Shiny
|
a60d0faedd
|
Merge branch 'dev' into add-contributor-megan
|
2017-03-16 15:35:15 +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 |
|
|
Shiny
|
40e4f8df8a
|
Merge branch 'dev' into add-contributor-megan
|
2017-03-16 14:59:26 +13:00 |
|
|
Brenda Wallace
|
81d41398a2
|
Link to waffle from readme
|
2017-03-16 14:55:30 +13:00 |
|
|
Brenda Wallace
|
4f02f45ae8
|
Updated wiki link
|
2017-03-16 14:55:22 +13:00 |
|
|
Arun Kumar
|
f7ec1826b0
|
Use presence instead of regex validation
|
2017-03-16 13:27:13 +13:00 |
|
|
Shiny
|
d619cd160d
|
Added Megan to contributors
|
2017-03-16 13:04:31 +13:00 |
|
|
Daniel O'Connor
|
4a20f68d3a
|
Merge branch 'dev' into plantings-harvests
|
2017-03-16 09:40:56 +10:30 |
|
|
Daniel O'Connor
|
62d2b5e9fb
|
Merge pull request #1273 from Br3nda/yaml-cleanup
Yaml file clean up
|
2017-03-16 09:39:33 +10:30 |
|
|
Daniel O'Connor
|
5935d2e73f
|
Merge pull request #1276 from Br3nda/bw/install-linters
Install npm modules locally
|
2017-03-16 09:38:54 +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 |
|
|
Daniel O'Connor
|
ea54fca2b2
|
Merge pull request #1282 from Br3nda/gardens-order
Gardens order
|
2017-03-16 09:35:17 +10:30 |
|
|
Daniel O'Connor
|
d7db9007fd
|
Merge pull request #1280 from Br3nda/public-error-pages
Update public error pages
|
2017-03-16 09:32:52 +10:30 |
|
|
Daniel O'Connor
|
c2acb8cf73
|
Merge pull request #1274 from Br3nda/fix-traxis-badge
Tie travis badge to a branch
|
2017-03-16 09:30:27 +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
|
b23118a9db
|
Merge branch 'dev' into public-error-pages
|
2017-03-15 23:09:21 +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 |
|
|
Shiny
|
8833571ab3
|
Merge branch 'dev' into bw/discourse-removal
|
2017-03-14 16:21:44 +13:00 |
|
|
Shiny
|
a54e66f2fd
|
Merge branch 'dev' into bw/install-linters
|
2017-03-12 22:56:11 +13:00 |
|
|
Shiny
|
7913f85cf4
|
Merge branch 'dev' into yaml-cleanup
|
2017-03-12 22:55:11 +13:00 |
|
|
Shiny
|
bf46c0a6d2
|
Merge branch 'dev' into bw/crop-model-dupe
|
2017-03-12 22:54:32 +13:00 |
|
|
Shiny
|
082bdb035f
|
Merge branch 'dev' into plantings-harvests
|
2017-03-12 22:54:17 +13:00 |
|
|
Shiny
|
15bedb1659
|
Merge branch 'dev' into public-error-pages
|
2017-03-12 22:54:03 +13:00 |
|
|
Shiny
|
5995812215
|
Merge branch 'dev' into gardens-order
|
2017-03-12 22:53:34 +13:00 |
|
|
Brenda Wallace
|
195d1bbdbb
|
order gardens by recently updated
|
2017-03-12 20:12:28 +13:00 |
|
|
deppbot
|
55e0579384
|
Bundle Update on 2017-03-12
|
2017-03-12 18:50:42 +13:00 |
|
|
Megan Talbot
|
d167a427b9
|
Update public error pages
Author: Megan Talbot <meganftalbot@gmail.com>
Date: Wed Mar 1 15:55:30 2017 -0700
|
2017-03-12 14:46:40 +13:00 |
|
|
Brenda Wallace
|
c89c20e842
|
View harvests for a planting
|
2017-03-12 14:44:11 +13:00 |
|
|
Shiny
|
ad04a48c8f
|
Merge branch 'dev' into bw/discourse-removal
|
2017-03-12 13:56:04 +13:00 |
|
|
Shiny
|
d3a47b3dc6
|
Merge branch 'dev' into fix-traxis-badge
|
2017-03-12 12:49:22 +13:00 |
|