Brenda Wallace
|
626d5f8d7c
|
Move harvest and seeds to the right on plantings#show
|
2019-03-27 21:19:35 +13:00 |
|
Brenda Wallace
|
d35dfeea21
|
Show date taken, not data the database record was created
|
2019-03-27 21:19:22 +13:00 |
|
Brenda Wallace
|
e7b0b6f18e
|
Remove table display on plantings#show, replace with boxes
|
2019-03-27 21:04:56 +13:00 |
|
Brenda Wallace
|
1e0f308db2
|
Merge branch 'dev' into UTFGardenNames
|
2019-03-26 22:43:56 +13:00 |
|
Brenda Wallace
|
1e240cf4b8
|
replace a rubocop ignore
|
2019-03-26 22:12:09 +13:00 |
|
Brenda Wallace
|
2d2304d8c0
|
Rubocop lint
|
2019-03-26 22:07:54 +13:00 |
|
Brenda Wallace
|
5d32bc8010
|
don't allow spaces in slug
|
2019-03-26 22:07:47 +13:00 |
|
Brenda Wallace
|
55f6636da5
|
change "required" to "optional"
|
2019-03-26 22:06:41 +13:00 |
|
Brenda Wallace
|
48022fb541
|
nullify gardens.garden_type when garden_type is destroyed
|
2019-03-26 21:18:14 +13:00 |
|
Brenda Wallace
|
cc88f5c6c7
|
Update subtitler
|
2019-03-26 21:11:25 +13:00 |
|
Brenda Wallace
|
721a8694a0
|
Removing plots
|
2019-03-26 21:09:26 +13:00 |
|
Brenda Wallace
|
b446e44ac0
|
Moved garden types to admin menu
|
2019-03-26 21:02:48 +13:00 |
|
Brenda Wallace
|
5395aefa66
|
Rename containers to garden types
|
2019-03-26 20:56:11 +13:00 |
|
Brenda Wallace
|
02e0dd091a
|
Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens
|
2019-03-26 19:35:16 +13:00 |
|
Brenda Wallace
|
db5bdab055
|
Set planting.finished as a boolean
|
2019-03-20 09:43:01 +13:00 |
|
Brenda Wallace
|
37693e8d12
|
Add filters for the members api
|
2019-03-20 09:43:01 +13:00 |
|
Brenda Wallace
|
5ab3d85d32
|
Merge remote-tracking branch 'upstream/master' into material
|
2019-03-10 16:12:52 +13:00 |
|
Brenda Wallace
|
3ed173ebcd
|
Material design changes
|
2019-02-17 21:33:36 +13:00 |
|
Brenda Wallace
|
0c868d3edb
|
Merge branch 'dev' into photos/seeds
|
2019-02-16 12:37:53 +13:00 |
|
Brenda Wallace
|
3967e68038
|
More info on a crop's varieties, and parent
|
2019-02-15 09:13:08 +13:00 |
|
Brenda Wallace
|
d3a542727c
|
Fixing crop deleting and adding tests
|
2019-02-15 08:45:18 +13:00 |
|
Brenda Wallace
|
1441850cd6
|
Merge branch 'dev' into photos/seeds
|
2019-02-13 13:59:14 +13:00 |
|
Brenda Wallace
|
3722672869
|
Merge branch 'dev' into photos/seeds
|
2019-02-13 09:06:42 +13:00 |
|
Brenda Wallace
|
fa00262f80
|
Merge branch 'dev' into crops-show
|
2019-02-13 09:04:51 +13:00 |
|
Brenda Wallace
|
bd86f7372e
|
Merge branch 'dev' into garden-overview
|
2019-02-12 21:50:51 +13:00 |
|
Brenda Wallace
|
f57a423c29
|
Merge branch 'dev' into crops-show
|
2019-02-12 21:50:05 +13:00 |
|
Brenda Wallace
|
5930334bd6
|
Merge branch 'dev' into photos/seeds
|
2019-02-12 21:49:43 +13:00 |
|
ImgBotApp
|
94403ab5a6
|
[ImgBot] Optimize images
*Total -- 299.13kb -> 245.06kb (18.08%)
/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
|
2019-02-12 21:49:11 +13:00 |
|
Brenda Wallace
|
80f0f41026
|
removed commented out code
|
2019-02-12 11:51:16 +13:00 |
|
Brenda Wallace
|
1dfad812a1
|
Javascript lint
|
2019-02-12 11:41:40 +13:00 |
|
Brenda Wallace
|
7a4121bf3f
|
Added missing semicolon
|
2019-02-12 11:41:33 +13:00 |
|
Brenda Wallace
|
fb6a270fa6
|
Tidy up crop predictions display
|
2019-02-10 21:51:06 +13:00 |
|
Brenda Wallace
|
572af9d135
|
Merge branch 'dev' into photos/seeds
|
2019-02-09 17:00:58 +13:00 |
|
Brenda Wallace
|
93835b3ee6
|
Javascript lint
|
2019-02-09 15:21:30 +13:00 |
|
Brenda Wallace
|
63b8554435
|
Added missing semicolon
|
2019-02-09 15:16:53 +13:00 |
|
Brenda Wallace
|
18d7ae2953
|
Further tidy up of the planting quick action buttons
|
2019-02-09 14:24:51 +13:00 |
|
Brenda Wallace
|
ec4b443d8c
|
Tool tips
|
2019-02-09 14:13:07 +13:00 |
|
Brenda Wallace
|
50751611fa
|
Tidy up where badges appear
|
2019-02-09 14:12:45 +13:00 |
|
Brenda Wallace
|
fc95a3c4e1
|
Moved planting css to own file
|
2019-02-09 14:12:30 +13:00 |
|
Brenda Wallace
|
dfe67d5308
|
Move thumbnail title up a bit
|
2019-02-09 12:13:22 +13:00 |
|
Brenda Wallace
|
aa8ed5bb3a
|
Fix up translation on badges
|
2019-02-09 11:47:13 +13:00 |
|
Brenda Wallace
|
fcd147412c
|
Tidy up display on gardens#index
|
2019-02-09 11:47:13 +13:00 |
|
Brenda Wallace
|
9a4f1058e1
|
Adding more attributes and filters to the api
|
2019-02-09 08:43:59 +13:00 |
|
Brenda Wallace
|
e446c14bd7
|
Use the new Photo.by_cropscope on photos controller
|
2019-02-05 12:44:34 +13:00 |
|
Brenda Wallace
|
6167af700d
|
Rubocop lint tidy
|
2019-02-05 12:37:09 +13:00 |
|
Brenda Wallace
|
9c4e649c5d
|
Split up photos on crops#show by model type
|
2019-02-05 12:31:59 +13:00 |
|
Brenda Wallace
|
18ab0c8697
|
Add photos back into crop resources
|
2019-02-05 10:22:58 +13:00 |
|
Brenda Wallace
|
b61c2290be
|
Removed unnecesary helper wrapper
|
2019-02-04 22:15:18 +13:00 |
|
Brenda Wallace
|
1ead9e333b
|
Fixed up planting_status when planting no planted yet
|
2019-02-04 21:55:23 +13:00 |
|
Brenda Wallace
|
dd38a69be7
|
Fixed up planting status text to match tests
|
2019-02-04 21:52:13 +13:00 |
|