mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 05:02:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,667 Commits 105 Branches 96 Tags
release34
Commit Graph
4667 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pozorvlak 929229379e Merge pull request #1455 from Growstuff/dev 
Release 34
release34 		2017-11-17 16:55:01 +00:00
pozorvlak ac0e52f15d Merge pull request #1412 from Br3nda/api 
Basic read only api  - members, gardens, plantings, crops, photos, harvests, seeds
 2017-11-17 16:44:41 +00:00
Shiny c7f427fe8a Merge branch 'dev' into api 2017-11-18 00:48:03 +13:00
Shiny 50fd9ae9b0 Merge branch 'master' into dev 2017-11-18 00:44:44 +13:00
Brenda Wallace efe39da878 Removed un-used method, to reduce class size 2017-11-18 00:43:17 +13:00
Brenda Wallace 1cd3c64590 Reducing class line count 2017-11-18 00:43:17 +13:00
Brenda Wallace b591529892 Reinstated test of first harvest prediction display 2017-11-18 00:43:17 +13:00
Brenda Wallace cef236d8f8 Reducing crop class size 2017-11-18 00:43:17 +13:00
Brenda Wallace 5ad0068142 Run existing crop specs with annual crop 2017-11-18 00:43:17 +13:00
Brenda Wallace b8a5ff9acf Don't show lifespan of perennials 2017-11-18 00:43:17 +13:00
deppbot 90653aa57f Bundle Update on 2017-11-15 2017-11-18 00:43:17 +13:00
Shiny 80a4739f34 Underscore prefix on our last unused args (#1442) 2017-11-18 00:43:17 +13:00
Brenda Wallace a6cc530fe5 Updating specs to use same owner for garden and planting 2017-11-18 00:43:17 +13:00
Brenda Wallace 97f19a0038 If a harvest has a planting, it must have the same owner 2017-11-18 00:43:17 +13:00
Brenda Wallace 140611d868 Get planting factory's owner from its garden 2017-11-18 00:43:17 +13:00
Brenda Wallace 3fa5ffc544 Planting's owner must be the same as its garden's owner 2017-11-18 00:43:17 +13:00
deppbot eeafb4caa5 Bundle Update on 2017-11-12 2017-11-18 00:43:17 +13:00
Brenda Wallace c747d46ab5 Request spec for seeds api 2017-11-17 23:22:10 +13:00
Brenda Wallace 3009ed2d83 Merge branch 'api' of github.com:Br3nda/growstuff into api 2017-11-17 23:16:16 +13:00
Shiny f68a15c04e Merge branch 'dev' into api 2017-11-17 22:02:12 +13:00
Brenda Wallace 06295fb9e9 Merge branch 'api' of github.com:Br3nda/growstuff into api 2017-11-17 22:02:06 +13:00
Brenda Wallace c4a1806a87 Request spec for photos api 2017-11-17 22:01:37 +13:00
Brenda Wallace fa5e151af0 Request spec for photos api 2017-11-17 22:00:32 +13:00
Brenda Wallace 13e8d1f5a5 Merge remote-tracking branch 'upstream/dev' into api 2017-11-17 21:51:39 +13:00
Brenda Wallace c1836cc78e Removed un-used method, to reduce class size 2017-11-17 21:50:59 +13:00
Brenda Wallace 28fdb6e1ed Reducing class line count 2017-11-17 21:50:59 +13:00
Brenda Wallace 67dec795a0 Reinstated test of first harvest prediction display 2017-11-17 21:50:59 +13:00
Brenda Wallace 86ea8eab39 Reducing crop class size 2017-11-17 21:50:59 +13:00
Brenda Wallace 8884056ff3 Run existing crop specs with annual crop 2017-11-17 21:50:59 +13:00
Brenda Wallace d01a5d7976 Don't show lifespan of perennials 2017-11-17 21:50:59 +13:00
pozorvlak 66c08650ba Merge pull request #1445 from Br3nda/feature/planting-garden-owner-match 
planting owner needs to match garden owner
 2017-11-15 17:49:00 +00:00
Shiny 521873b656 Merge branch 'dev' into feature/planting-garden-owner-match 2017-11-15 09:27:41 +13:00
deppbot 2060d9ab9e Bundle Update on 2017-11-15 2017-11-15 09:26:47 +13:00
Shiny 1795b27152 Merge branch 'dev' into feature/planting-garden-owner-match 2017-11-13 23:09:04 +13:00
Shiny 93193c9fba Merge branch 'dev' into api 2017-11-13 23:00:33 +13:00
Shiny df7a9448b0 Underscore prefix on our last unused args (#1442) 2017-11-13 09:54:55 +00:00
Brenda Wallace 1b4d77e017 Requests spec for member api 2017-11-13 20:03:39 +13:00
Brenda Wallace 08e7c7dd29 Request specs for harvests api 2017-11-13 19:19:18 +13:00
Brenda Wallace 5fec826c41 Add more attributes to crops 2017-11-13 19:19:18 +13:00
Brenda Wallace c29234c40c Request specs for crops api 2017-11-13 19:19:18 +13:00
Brenda Wallace 2f0cb5c815 DRY the api specs 2017-11-13 19:19:18 +13:00
Brenda Wallace b6cbfe25d2 Factory girl becomes factory bot 2017-11-13 19:19:18 +13:00
Brenda Wallace d8f5876518 Added predictions to planting api, and added specs 2017-11-13 19:19:18 +13:00
Brenda Wallace ae2cbf0bec requests spec for modifying immutable gardens on api 2017-11-13 19:19:18 +13:00
Brenda Wallace c9d5c42814 Plantings have many harvests 2017-11-13 19:19:18 +13:00
Brenda Wallace b60f47f502 Add more relationships to members on the api 2017-11-13 19:19:18 +13:00
Brenda Wallace d86e0af5ad Request for for getting api gardens#index 2017-11-13 19:19:18 +13:00
Brenda Wallace fc0058d677 all our api controllers inheriting from base 2017-11-13 19:19:18 +13:00
Brenda Wallace 41110f96d1 Put immutable on every resource 2017-11-13 19:19:18 +13:00
Brenda Wallace 33822abf93 crops have harvests 2017-11-13 19:19:18 +13:00