mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 18:31:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,127 Commits 57 Branches 82 Tags
d3faa75d1d3bbfb4ade667ecdd799c4e6bb1cd81
Commit Graph

1566 Commits

Author SHA1 Message Date
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
jenkr55
eed0b257fa Fixing test because I removed this line 2018-04-21 22:03:31 -05:00
Brenda Wallace
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00
Brenda Wallace
e5cf8b6091 added spec for finished_predicted_at 2018-04-21 17:25:04 +12:00
Brenda Wallace
6077d4da34 Fixed bug in garden spec 2018-04-21 15:01:33 +12:00
Brenda Wallace
34b6b54616 Name goes on garden, not planting 2018-04-21 14:33:39 +12:00
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
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
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
cdde3994b2 Revert "Auto corrected by following Style/ExpandPathArguments" 
This reverts commit a5b84403bb.
 2018-04-21 10:35:28 +12:00
Brenda Wallace
dc62ab05ad Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-21 10:21:40 +12:00
Awesome Code
a5b84403bb Auto corrected by following Style/ExpandPathArguments 2018-04-20 22:19:28 +00: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
279c922b34 Rename update predictions methods to have ! 2018-04-19 13:45:29 +12:00
Brenda Wallace
2a8c4d4829 Add finished and finished_at to plantings factory 2018-04-17 10:06:40 +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
2d309b7645 Removing jasmine, we have no jasmine specs 2018-04-02 09:58:02 +12:00
Brenda Wallace
ece7113c89 DRY photo helper spec 2018-03-15 22:56:32 +13:00
Brenda Wallace
8941c577e4 Specs for photos helper 2018-03-14 22:25:30 +13:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace
b2cf022522 Removed extra blank lines 2018-01-29 13:01:49 +13:00
Awesome Code
767477df66 Auto corrected by following RSpec/LeadingSubject 2018-01-28 23:47:27 +00:00
Awesome Code
e8d9314cff Auto corrected by following Style/Lambda 2018-01-23 09:00:34 +13:00
Brenda Wallace
92e56cfc1e Fixed up a spec, use sign_in member instead of stubing 2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1 Moved gardens chart to dedicated controller 2018-01-23 09:00:34 +13:00
Shiny
6f613635d2 Update crop_detail_page_spec.rb 2018-01-23 09:00:34 +13:00
Awesome Code
8c8d549cb1 Auto corrected by following RSpec/NotToNot 2018-01-23 09:00:34 +13:00
Awesome Code
d9cc1dcae8 Auto corrected by following RSpec/MultipleSubjects 2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229 Permissions (and specs) for charts json 2018-01-23 09:00:34 +13:00
Brenda Wallace
9adb3d1e4e Removed d3 graph tests 2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392 Auto corrected by following Style/RescueStandardError 2018-01-23 09:00:34 +13:00
Awesome Code
dea7ce241b Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-23 09:00:34 +13:00
Awesome Code
8d166f1fe6 Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically 2018-01-23 09:00:34 +13:00
Brenda Wallace
49253b59ee Fixing up prediction specs 2018-01-23 09:00:34 +13:00
Brenda Wallace
427a0187e1 updated prediction spec 2018-01-23 09:00:34 +13:00
Brenda Wallace
4b65f28461 Added new line at end of file 2018-01-23 09:00:34 +13:00
Brenda Wallace
2cf335a064 Removed unused variables in js 2018-01-23 09:00:34 +13:00
Brenda Wallace
b205f35399 Wrapped a long line 2018-01-23 09:00:34 +13:00
Brenda Wallace
e009d9532a Updating javascript style 2018-01-23 09:00:34 +13:00
Shiny
9d47b2b029 Merge branch 'dev' into feature/admin-nicer 2017-12-18 15:10:36 +13:00
Brenda Wallace
99828c7c01 Updated spec for new admin#index 2017-12-17 17:54:13 +13:00