 Brenda Wallace
|
5cc647ee9b
|
test that expects a garden name, set to that name
|
2018-04-21 14:22:20 +12:00 |
|
|
Brenda Wallace
|
948c32d1d5
|
test that expects a garden name, set to that name
|
2018-04-21 14:19:40 +12:00 |
|
|
Brenda Wallace
|
2e4378f025
|
Add css class to show finished/zombie/harvesting etc
|
2018-04-21 14:17:50 +12:00 |
|
|
Brenda Wallace
|
548fb3d3fd
|
Badges feature specs
|
2018-04-21 14:00:00 +12:00 |
|
|
Brenda Wallace
|
9966eddd37
|
Giving gardens unique names to stop test collisions
|
2018-04-21 13:52:49 +12:00 |
|
|
Brenda Wallace
|
aae7688a0e
|
Classes for planting badge colours
|
2018-04-21 13:05:15 +12:00 |
|
|
Brenda Wallace
|
9b16abd373
|
Render perenial progress bar the same as others
|
2018-04-21 13:04:31 +12:00 |
|
|
Brenda Wallace
|
87b04f60f7
|
Order garden's plantings by planted_at
|
2018-04-21 13:03:46 +12:00 |
|
|
Brenda Wallace
|
a8509acd49
|
Zombie status needs 90 days
|
2018-04-21 13:02:51 +12:00 |
|
|
Brenda Wallace
|
ca8dae4b78
|
Moving the planting buttons lower
|
2018-04-21 13:02:09 +12:00 |
|
|
Brenda Wallace
|
1b3e00fba0
|
Colours for badges on plantings
|
2018-04-21 13:00:24 +12:00 |
|
|
Brenda Wallace
|
935aebcb0d
|
Tidy up visual link between planting thumbnail and crop name
|
2018-04-21 12:38:32 +12:00 |
|
|
Brenda Wallace
|
4fe8cd566b
|
USe finished not finished?
because some plants have finished_at in the past but haven't had their .finished set to true yet
|
2018-04-21 12:37:00 +12:00 |
|
|
Brenda Wallace
|
9188bd384d
|
Futher simplifying planting badges
|
2018-04-21 11:36:48 +12:00 |
|
|
Brenda Wallace
|
8ce0717c0f
|
Fixing up planting helper predictions
|
2018-04-21 11:36:02 +12:00 |
|
|
Brenda Wallace
|
4c7529eb8e
|
Merge remote-tracking branch 'origin/feature/status' into feature/status
|
2018-04-21 11:14:32 +12:00 |
|
|
Brenda Wallace
|
f8b76e9c84
|
Reducing complexity in planting predictions
|
2018-04-21 11:12:25 +12:00 |
|
|
Brenda Wallace
|
16341da7bd
|
Merge branch 'dev' into feature/status
|
2018-04-21 10:55:40 +12:00 |
|
|
Brenda Wallace
|
0d7542a43d
|
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
|
2018-04-21 10:55:28 +12:00 |
|
|
Brenda Wallace
|
8dead992d3
|
Merge pull request #1624 from Br3nda/fix/awesome
Revert "Auto corrected by following Style/ExpandPathArguments"
|
2018-04-21 10:55:11 +12:00 |
|
|
Brenda Wallace
|
cdde3994b2
|
Revert "Auto corrected by following Style/ExpandPathArguments"
This reverts commit a5b84403bb.
|
2018-04-21 10:35:28 +12:00 |
|
|
Brenda Wallace
|
44196f7d65
|
Merge remote-tracking branch 'origin/feature/status' into feature/status
|
2018-04-21 10:24:13 +12:00 |
|
|
Brenda Wallace
|
dc62ab05ad
|
Merge remote-tracking branch 'upstream/dev' into feature/status
|
2018-04-21 10:21:40 +12:00 |
|
|
Brenda Wallace
|
15e64226c8
|
Merge branch 'dev' into feature/status
|
2018-04-21 10:21:05 +12:00 |
|
|
Brenda Wallace
|
c860f7c14b
|
Merge branch 'dev' into awesomecode-factorybot/createlist-12138
|
2018-04-21 10:20:38 +12:00 |
|
|
Brenda Wallace
|
944af28e3c
|
Merge pull request #1623 from Growstuff/awesomecode-style/expandpatharguments-12138
Auto corrected by following Style/ExpandPathArguments
|
2018-04-21 10:20:18 +12:00 |
|
|
Awesome Code
|
a5b84403bb
|
Auto corrected by following Style/ExpandPathArguments
|
2018-04-20 22:19:28 +00:00 |
|
|
Awesome Code
|
afc4441ce1
|
Auto corrected by following FactoryBot/CreateList
|
2018-04-20 22:19:04 +00:00 |
|
|
Brenda Wallace
|
b7d4781aef
|
Split the planting&harvest predictions into files
|
2018-04-21 10:18:18 +12:00 |
|
|
Brenda Wallace
|
c2ff3790db
|
set finished false on planting factory
some code+tests doesn't cope with nil
|
2018-04-21 09:22:35 +12:00 |
|
|
Brenda Wallace
|
a2f2e24aa1
|
Merge remote-tracking branch 'upstream/dev' into feature/status
|
2018-04-21 09:07:10 +12:00 |
|
|
pozorvlak
|
f1a40e4305
|
Merge pull request #1621 from jenkr55/SecondCommentButton
Show second comment button when many comments on a post
|
2018-04-20 10:51:18 +01:00 |
|
|
jenkr55
|
4120069e4c
|
Fixing trailing whitespace
|
2018-04-19 12:17:36 -05:00 |
|
|
jenkr55
|
18a7306fd0
|
Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton
|
2018-04-19 12:11:03 -05:00 |
|
|
jenkr55
|
b3962bc9bc
|
Comment button same style
|
2018-04-19 12:10:19 -05:00 |
|
|
Brenda Wallace
|
7a112aeecf
|
Grammar correction in method name
|
2018-04-19 13:49:54 +12:00 |
|
|
Jennifer Kruse
|
296daa7a56
|
Merge branch 'dev' into SecondCommentButton
|
2018-04-18 20:47:53 -05:00 |
|
|
Brenda Wallace
|
5bf75fa36f
|
Only show finish prediction badges if we have enough data
|
2018-04-19 13:45:47 +12:00 |
|
|
Brenda Wallace
|
279c922b34
|
Rename update predictions methods to have !
|
2018-04-19 13:45:29 +12:00 |
|
|
Brenda Wallace
|
3ed90b8d04
|
Moving predictions to own file
|
2018-04-19 13:44:39 +12:00 |
|
|
jenkr55
|
634dc936f9
|
Show second comment button when many comments
|
2018-04-18 19:32:24 -05:00 |
|
|
Brenda Wallace
|
2a8c4d4829
|
Add finished and finished_at to plantings factory
|
2018-04-17 10:06:40 +12:00 |
|
|
Brenda Wallace
|
3ee2537438
|
Only show time to finished if not finished
|
2018-04-17 10:03:59 +12:00 |
|
|
Brenda Wallace
|
934bd9adb8
|
Fixed bug in spec, wasn't really on member's garden#index
|
2018-04-16 22:11:36 +12:00 |
|
|
Brenda Wallace
|
d043613bde
|
Model specs for harvest time and zombies
|
2018-04-16 21:14:47 +12:00 |
|
|
Brenda Wallace
|
d1603a6e7f
|
Badges showing finished and harvest status
|
2018-04-16 21:06:20 +12:00 |
|
|
Brenda Wallace
|
79e0bc5206
|
Merge pull request #1615 from Growstuff/dev
Release 45
|
2018-04-13 11:25:40 +12:00 |
|
|
pozorvlak
|
61183509b0
|
Merge pull request #1612 from Growstuff/Br3nda-patch-1
Pick the first photo
release45
|
2018-04-12 15:34:22 +01:00 |
|
|
Brenda Wallace
|
6c1bbe9f1c
|
Merge branch 'dev' into Br3nda-patch-1
|
2018-04-12 14:15:49 +12:00 |
|
|
Brenda Wallace
|
bab41143fa
|
Merge branch 'master' into dev
|
2018-04-12 11:01:53 +12:00 |
|