mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-04 20:04:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,807 Commits 65 Branches 92 Tags
cf0485c4480ef6091b285ea36c1936bb783fbbca
Commit Graph
2164 Commits
Author SHA1 Message Date
Brenda Wallace 72e348cdf6 Fix up specs 2019-11-19 14:16:50 +13:00
Brenda Wallace fa1e70036a Fix name of spec 2019-11-18 16:06:57 +13:00
Brenda Wallace c6fffebb28 Update specs for new index layout with api docs 2019-11-18 10:50:13 +13:00
Brenda Wallace 8fb4725f46 Merge remote-tracking branch 'upstream/dev' into api-docs 
Conflicts:
	app/resources/api/v1/planting_resource.rb
 2019-11-18 10:26:05 +13:00
Brenda Wallace 4f8830676e Swagger docs 2019-11-18 10:15:06 +13:00
Brenda Wallace 140f625c48 Add new planting api attributes to test 2019-11-16 22:40:06 +13:00
Brenda Wallace 4c82adc612 Added new api items to controller spec 2019-11-16 20:38:15 +13:00
Brenda Wallace 1697f3e758 Update model spec for location 2019-11-16 13:07:38 +13:00
Brenda Wallace df5b0499e4 Update spec for api resource 2019-11-16 13:05:40 +13:00
Brenda Wallace a651f079d8 Simplify garden.name validation regexp 2019-11-11 17:41:46 +13:00
Brenda Wallace cfaa18daaf Merge remote-tracking branch 'upstream/dev' into UTFGardenNames 2019-11-11 14:14:34 +13:00
Brenda Wallace 405de0fb18 Merge branch 'dev' into all-varieties 2019-11-02 13:21:30 +13:00
Brenda Wallace d0bee45c0c show all varieties (including grandchildren) 2019-11-01 21:33:43 +13:00
Brenda Wallace c27622803d Specs for linking plantings to seeds 2019-11-01 17:18:51 +13:00
Brenda Wallace b2e90cddc6 Merge branch 'dev' into weeks 2019-10-25 13:41:30 +13:00
André Aubin 279d85456b Switching gravatar urls to secure subdomain 2019-10-24 23:51:52 +00:00
André Aubin 66045866b3 Switch to HTTPS for Gravatar urls 2019-10-24 23:51:52 +00:00
Brenda Wallace 8cf5acc30a Update spec to expect weeks to be rounded 2019-10-25 07:42:13 +13:00
Brenda Wallace d96b30fff8 spec for in_weeks method 2019-10-24 21:06:28 +13:00
Brenda Wallace 358631d0f9 update spec to look for weeks 2019-10-24 20:58:27 +13:00
Brenda Wallace 627d97155f Tidy up 2019-10-24 19:59:18 +13:00
Brenda Wallace c094b5daf9 Update spec, to look for new emojii timeline 2019-10-24 18:55:47 +13:00
Brenda Wallace dc3a730064 update spec to use expect syntax 2019-10-24 16:15:06 +13:00
Brenda Wallace 6d6d1930d1 Merge branch 'dev' into planting-reminders 2019-10-21 15:53:25 +13:00
Brenda Wallace d90a58218a Remove roles#show 2019-10-21 15:38:46 +13:00
Brenda Wallace 13c024fac9 Fixed typo in spec 2019-10-21 15:13:47 +13:00
Brenda Wallace 498a754eea update specs for admin roles 2019-10-21 14:32:23 +13:00
Brenda Wallace 6280115055 Merge branch 'role-admin' of github.com:br3nda/growstuff into role-admin 2019-10-21 14:27:02 +13:00
Brenda Wallace 47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace 8cdae6647d Merge remote-tracking branch 'upstream/dev' into planting-reminders 2019-10-21 14:20:45 +13:00
Brenda Wallace 8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace 94452ee62e polish up the plantings reminders 2019-10-20 14:12:34 +13:00
Brenda Wallace 6bd7e139a6 Move views specs to admin 2019-10-19 16:04:16 +13:00
Brenda Wallace 75897bad51 Update routing specs for admin roles 2019-10-19 10:28:24 +13:00
Brenda Wallace 5a6d0f6342 Check admin before roles controller runs 2019-10-19 10:22:27 +13:00
Brenda Wallace 2ddddb1652 Updated specs for admin editing roles 2019-10-19 10:16:02 +13:00
Brenda Wallace b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
bestest-mensch d72ec5890a address code climate issues 2019-10-07 21:38:19 +00:00
bestest-mensch 9f8e2e65be update/add specs 2019-10-07 21:38:19 +00:00
bestest-mensch 80fb4f5fe6 add ability to delete multiple conversations at once 2019-10-07 21:38:19 +00:00
Brenda Wallace 7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace 6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
Brenda Wallace 367377088b Fix specs for photo sources 2019-09-21 09:37:55 +12:00
Brenda Wallace b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00
Brenda Wallace a50b0485ac find button by class 2019-09-01 20:46:46 +12:00
Brenda Wallace 017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace 777408a6dc Merge branch 'dev' into UTFGardenNames 2019-08-29 13:53:04 +12:00
Brenda Wallace e3f32d8bb4 Updated specs 2019-08-20 15:09:39 +00:00
Brenda Wallace c6d4563edc Updated spec 2019-08-20 15:09:39 +00:00
Brenda Wallace 6782765581 Merge branch 'fix/feature-spec-sessions' of github.com:br3nda/growstuff into fix/feature-spec-sessions 2019-08-19 09:21:34 +12:00