4865 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Cesy	c08beb5291	Merge pull request #1495 from Growstuff/dev ... Release 37 release37	2017-12-22 09:54:32 +00:00
pozorvlak	269f3164b7	Merge pull request #1497 from Br3nda/feature/admin-nicer ... Nicer admin interface	2017-12-18 11:33:02 +00:00
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Daniel O'Connor	81e26aaf02	Merge pull request #1496 from Br3nda/feature/ordering ... Feature/ordering	2017-12-18 09:30:51 +10:30
Shiny	d62322b498	Merge branch 'dev' into feature/admin-nicer	2017-12-18 06:59:33 +13:00
Shiny	ebb2f90294	Merge branch 'dev' into feature/ordering	2017-12-18 06:59:17 +13:00
Shiny	72922a160d	Merge pull request #1498 from Growstuff/bundle-update-2017-12-18-000857 ... Bundle Update on 2017-12-18	2017-12-18 06:58:50 +13:00
deppbot	0699716c19	Bundle Update on 2017-12-18	2017-12-18 00:08:58 +08:00
Brenda Wallace	4c35987cb7	Ignore long method in ability.rb	2017-12-17 17:57:19 +13:00
Brenda Wallace	54e0806f38	don't check role is there's no member	2017-12-17 17:55:14 +13:00
Brenda Wallace	99828c7c01	Updated spec for new admin#index	2017-12-17 17:54:13 +13:00
Brenda Wallace	25d2773464	Use nested module/class definitions instead of compact style.	2017-12-17 17:50:30 +13:00
Brenda Wallace	233a30a045	Haml code style fix up	2017-12-17 17:49:05 +13:00
Brenda Wallace	01a7463ae8	Split up ability.rb into methods	2017-12-17 12:47:41 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	efc60e6313	Nicer layout on editing roles	2017-12-17 12:11:55 +13:00
Brenda Wallace	406b2dbf04	Make admin index a bit nicer	2017-12-17 12:06:03 +13:00
Brenda Wallace	ac056b4eb5	Merge remote-tracking branch 'upstream/dev' into dev	2017-12-17 12:05:42 +13:00
Brenda Wallace	2394f4d237	One view for showing photos on an item	2017-12-17 11:40:55 +13:00
Brenda Wallace	2a4fd57050	Merge remote-tracking branch 'upstream/dev' into feature/ordering	2017-12-17 10:18:25 +13:00
Shiny	5c885d675e	Merge branch 'master' into dev	2017-12-17 10:05:25 +13:00
Shiny	0b08691160	Merge pull request #1474 from Br3nda/feature/photos-1457 ... Polymorphic relationship to photos	2017-12-17 10:04:30 +13:00
Brenda Wallace	b1052a2dbf	Order posts by most recent	2017-12-17 10:01:51 +13:00
Brenda Wallace	95a923ff5f	Order the plantings on the front page	2017-12-17 10:01:51 +13:00
deppbot	c8e34b640e	Bundle Update on 2017-12-14	2017-12-17 10:01:51 +13:00
Brenda Wallace	6f2b4b13cd	Only show photo pagination if there are photos	2017-12-17 09:55:52 +13:00
Brenda Wallace	970da53873	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-17 09:15:24 +13:00
Brenda Wallace	3aa2f0bd3b	Paginate photos on seeds#show (inc feature specs)	2017-12-17 08:55:08 +13:00
Shiny	8c1514bc04	Merge branch 'dev' into feature/photos-1457	2017-12-15 17:13:12 +13:00
Daniel O'Connor	d2e39f58d5	Merge pull request #1494 from Br3nda/fix/ordering ... More ordering fixes	2017-12-15 12:57:08 +10:30
Brenda Wallace	3d3a3b669e	Order posts by most recent	2017-12-15 13:28:41 +13:00
Brenda Wallace	8697e56323	Order the plantings on the front page	2017-12-15 13:26:48 +13:00
Shiny	472b2eb192	Merge branch 'dev' into feature/photos-1457	2017-12-15 12:10:36 +13:00
Cesy	1698157d8d	Merge pull request #1492 from Growstuff/bundle-update-2017-12-14-201051 ... Bundle Update on 2017-12-14	2017-12-14 12:25:49 +00:00
deppbot	ff652ae234	Bundle Update on 2017-12-14	2017-12-14 20:10:52 +08:00
Shiny	b4fcf004cd	Merge pull request #1484 from Growstuff/dev ... Release 36 release36	2017-12-14 19:37:02 +13:00
Brenda Wallace	25e9ef892d	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-14 08:45:40 +13:00
Shiny	82149d4565	Merge branch 'dev' into feature/photos-1457	2017-12-14 08:44:31 +13:00
Brenda Wallace	fcd3e36e36	Removed commented out code	2017-12-14 08:42:51 +13:00
pozorvlak	b783448ec3	Merge pull request #1485 from Br3nda/planting-harvests ... Show photos of a planting's harvests	2017-12-13 12:08:23 +00:00
pozorvlak	e8b5850bfe	Merge branch 'dev' into planting-harvests	2017-12-13 10:57:40 +00:00
pozorvlak	bca72680c4	Merge pull request #1490 from Br3nda/dependabot/npm_and_yarn/coffeelint-2.0.7 ... Bump coffeelint from 1.16.0 to 2.0.7	2017-12-13 10:57:18 +00:00
pozorvlak	358eb96684	Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7	2017-12-13 10:29:18 +00:00
pozorvlak	05807d41f4	Merge pull request #1491 from Br3nda/flickr-auth-fix ... Fix Growstuff::OauthSignupAction not found error when connecting flickr	2017-12-13 10:27:16 +00:00
Shiny	96f1995768	Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7	2017-12-13 23:26:07 +13:00
Shiny	deefbbce71	Merge branch 'dev' into planting-harvests	2017-12-13 23:25:56 +13:00
Brenda Wallace	f8e51f4b45	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-13 22:35:29 +13:00
Brenda Wallace	1c8b75b7cb	add and show photos for seeds ... close #1457	2017-12-13 22:34:16 +13:00
Brenda Wallace	1f66df0743	Fixed link to associated flickr, twitter, facebook accountss ... fixes #1479	2017-12-13 22:23:22 +13:00
Brenda Wallace	72f52230a1	Fix Growstuff::OauthSignupAction not found error when connecting flickr account	2017-12-13 22:19:41 +13:00