mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 18ab0c8697 Add photos back into crop resources 2019-02-05 10:22:58 +13:00
Brenda Wallace 1ea19bee9d Not planted means the percent_grown is 0 2019-02-05 09:59:20 +13:00
Brenda Wallace 49f7e57334 Make use of factory bot 2019-02-05 09:59:09 +13:00
Brenda Wallace 8d58edf083 Set hte crops in photos#show view spec 2019-02-04 22:35:42 +13:00
Brenda Wallace b61c2290be Removed unnecesary helper wrapper 2019-02-04 22:15:18 +13:00
Brenda Wallace 6be8f05223 Set the planted at date to the past (so we don't end up with 0%) 2019-02-04 22:11:50 +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
Brenda Wallace 862bdf35f5 Look for crop card on photo#show 2019-02-04 21:43:31 +13:00
Brenda Wallace bb5a606240 Updated string to look for when planting 2019-02-04 21:43:10 +13:00
Brenda Wallace d2c63db59b Translate planting status 2019-02-04 21:42:54 +13:00
Brenda Wallace 6a1954b1e7 added dependent: destroy 2019-02-04 21:22:19 +13:00
Brenda Wallace 8e29a86edf Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds 2019-02-04 21:19:30 +13:00
Brenda Wallace d71f6f9fc4 Rubocop tidy up 2019-02-04 21:17:41 +13:00
Brenda Wallace b29c830f65 Merge branch 'dev' into photos/seeds 2019-02-04 21:17:08 +13:00
Brenda Wallace b8747d7c52 Controller specs for photos#index 2019-02-04 21:15:10 +13:00
Brenda Wallace a074810988 FEature specs for showing photos on crops#show 2019-02-04 21:03:31 +13:00
Brenda Wallace 81c899079e Removed commented out code 2019-02-04 20:57:35 +13:00
Brenda Wallace f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace 0759ca9039 Schema update for crops added to photogaphings table 2019-02-04 20:53:04 +13:00
Brenda Wallace 5822764c1d Fetch photos in the controller 2019-02-04 20:52:13 +13:00
Brenda Wallace 42de920352 Removed display of status 2019-02-04 20:44:20 +13:00
Brenda Wallace ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace dbf707d80e Crops have seeds 2019-02-04 20:32:23 +13:00
Brenda Wallace e8ac207fa7 Save the crop on the photo association 2019-02-04 20:32:11 +13:00
Brenda Wallace a9ca12c1c5 Method to find planting photos only 2019-02-04 19:39:44 +13:00
Brenda Wallace 87d2c8b4c8 Fixed bug - look up photos by crop 2019-02-04 19:39:21 +13:00
Brenda Wallace b29ab46a48 Merge pull request #1808 from Growstuff/dependabot/bundler/rubocop-rspec-1.32.0 
Bump rubocop-rspec from 1.31.0 to 1.32.0
 2019-02-02 23:22:10 +13:00
dependabot[bot] 951076bc85 Bump rubocop-rspec from 1.31.0 to 1.32.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.31.0 to 1.32.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.31.0...v1.32.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-01 20:17:34 +00:00
Brenda Wallace 76f4ffc78a Merge pull request #1805 from Br3nda/fix/recent-harvests 
Fix/recent harvests
 2019-02-02 09:14:27 +13:00
Brenda Wallace e3a0de081e Merge branch 'dev' into photos/seeds 2019-01-30 16:46:42 +13:00
Brenda Wallace 8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brenda Wallace 41082b31a9 Merge branch 'dev' into fix/recent-harvests 2019-01-30 16:44:47 +13:00
Brenda Wallace 6ebe853cb3 Merge pull request #1771 from Br3nda/routes-tidy-up 
Routes tidy up
 2019-01-30 16:44:30 +13:00
Brenda Wallace 682de8f815 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up 2019-01-30 15:25:31 +13:00
Brenda Wallace 4c02a3247e Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-30 15:25:19 +13:00
Brenda Wallace 6acc6bd5ee Tell rspec which gardens button to use 2019-01-30 15:25:07 +13:00
Brenda Wallace 0bb483e8eb Merge branch 'dev' into routes-tidy-up 2019-01-30 15:20:41 +13:00
Brenda Wallace 96fc9d9368 Merge branch 'dev' into fix/recent-harvests 2019-01-30 15:20:30 +13:00
Brenda Wallace 02ed494898 Merge pull request #1810 from Growstuff/dependabot/bundler/newrelic_rpm-6.0.0.351 
Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351
 2019-01-30 15:20:14 +13:00
dependabot[bot] 964dbe5e54 Bump newrelic_rpm from 5.7.0.350 to 6.0.0.351 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.7.0.350 to 6.0.0.351.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-29 07:20:30 +00:00
Brenda Wallace 9325f03019 Merge pull request #1788 from Growstuff/dependabot/bundler/newrelic_rpm-5.7.0.350 
Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350
 2019-01-28 16:13:01 +13:00
Brenda Wallace 3d3d1407cd Fixed link in global actions 2019-01-27 18:28:42 +13:00
Brenda Wallace 52272550c8 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 2019-01-27 18:25:43 +13:00
Brenda Wallace 6484e4e6e5 Merge branch 'dev' into fix/recent-harvests 2019-01-27 18:25:22 +13:00
Brenda Wallace 10beb65e1a Feature spec to check most recently planted/harvested on crops#show 2019-01-27 18:23:15 +13:00
Brenda Wallace ea35816654 Fix ordering of recent harvests 2019-01-27 18:12:37 +13:00
dependabot[bot] 9c13064191 Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 5.6.0.349 to 5.7.0.350.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-26 22:56:56 +00:00
pozorvlak 0664324d29 Merge pull request #1798 from Br3nda/remove-mandrill 
Remove references to MANDRILL
 2019-01-26 22:54:32 +00:00
Brenda Wallace bc576ccc44 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-27 11:43:49 +13:00