11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	af0871cd0a	Merge pull request #1344 from Growstuff/bundle-update-2017-05-25-051814 ... Bundle Update on 2017-05-25	2017-05-25 11:49:55 +09:30
deppbot	60d074a0de	Bundle Update on 2017-05-25	2017-05-25 05:18:15 +08:00
Shiny	c2ba2719de	Merge branch 'master' into dev	2017-05-24 13:26:06 +12:00
Shiny	afb0b9e387	Merge branch 'dev' into issue-1044-account-deletion	2017-05-24 13:25:21 +12:00
pozorvlak	e4e4d9600e	Merge pull request #1340 from Br3nda/fix-1334 ... Display seeds for trade, on homepage, as thumbnails.	2017-05-24 00:35:28 +01:00
Brenda Wallace	a6964a8f4e	Update specs to join before checking member is destroyed.	2017-05-21 21:59:28 +12:00
Brenda Wallace	b538330785	Form to delete your own account	2017-05-21 21:51:44 +12:00
Brenda Wallace	aee90268a5	Fixed old migration - to work under act_as_paranoid	2017-05-21 21:50:52 +12:00
Brenda Wallace	cabf849774	Deleting of users	2017-05-21 21:29:09 +12:00
Brenda Wallace	7251f3308b	Merge branch 'fix-1334' into issue-1044-account-deletion	2017-05-21 11:46:30 +12:00
Brenda Wallace	121d3d99fe	Tests for retrieving data of deleted members	2017-05-21 11:36:07 +12:00
Brenda Wallace	c4938e00e4	Member acts as paranoid	2017-05-21 11:33:12 +12:00
Brenda Wallace	4a926415db	Call destroy, to mark a member as deleted	2017-05-21 11:32:54 +12:00
Brenda Wallace	7d4c9011aa	Member.deleted_at column added	2017-05-21 11:31:53 +12:00
Brenda Wallace	b5b2582335	default scope says members deleted :false	2017-05-21 11:17:42 +12:00
Brenda Wallace	7d2a2b96a2	Only show gardens of members who are not deleted	2017-05-21 11:17:09 +12:00
Brenda Wallace	e2fe04a44b	Form and controller method to mark members as deleted	2017-05-20 22:01:20 +12:00
Brenda Wallace	18c02bf33b	Add deleted column to members table	2017-05-20 22:00:15 +12:00
Brenda Wallace	6c0b1018bc	Updated spec for homepage seeds	2017-05-20 17:16:03 +12:00
Brenda Wallace	15e2b4f595	Seeds on home page looking like thumbnails	2017-05-20 17:01:07 +12:00
Brenda Wallace	6e7bf11ec8	Seeds delegate name and default_photo to their crop	2017-05-20 17:00:49 +12:00
Brenda Wallace	5f9b0890fb	Move seed.interesting to a scope	2017-05-20 16:58:49 +12:00
Brenda Wallace	4841c52bcd	order crop.plant_parts by plant_parts.name	2017-05-20 15:46:37 +12:00
Brenda Wallace	7baabca827	Unique is un-necesary when declaring relationship to plant_parts	2017-05-20 15:46:37 +12:00
Brenda Wallace	9a19007b85	More railsy order by in models	2017-05-20 15:46:37 +12:00
Brenda Wallace	677f850e21	Removed extra blank line	2017-05-20 15:46:37 +12:00
Brenda Wallace	d771bc3688	More railsy syntax in default scopes	2017-05-20 15:46:37 +12:00
Brenda Wallace	1dfc58c120	Remove default scope from harvest. ... Causes an ORDER clause to be added in queries even when not selecting from that table. E.g. if we 're looking for PlantParts that have a Harvest	2017-05-20 15:46:37 +12:00
Brenda Wallace	6f58f266a6	Moving has_photos scope to PhotoCapable ... -	2017-05-20 15:46:37 +12:00
deppbot	e38395b6ba	Bundle Update on 2017-05-19	2017-05-20 07:07:27 +12:00
Daniel O'Connor	944d477dbc	Merge pull request #1338 from Growstuff/bundle-update-2017-05-16-135240 ... Bundle Update on 2017-05-16	2017-05-16 16:45:08 +09:30
deppbot	cbf7ac0126	Bundle Update on 2017-05-16	2017-05-16 13:52:41 +08:00
Cesy	1ad171f37b	Merge pull request #1335 from Growstuff/dev ... Release 25 release25	2017-05-15 20:43:16 +01:00
deppbot	06896dacd5	Bundle Update on 2017-05-13	2017-05-14 18:20:44 +12:00
Shiny	ff90d6430d	Merge branch 'master' into dev	2017-05-13 11:35:26 +12:00
Brenda Wallace	4dbdbc4285	Pull haml gem back to version 4	2017-05-13 11:31:32 +12:00
deppbot	0f1c8e0658	Bundle Update on 2017-05-03	2017-05-13 11:31:32 +12:00
Daniel O'Connor	c9ec116c9b	Merge pull request #1333 from Br3nda/garden-photos-fixup ... Fix up of photo display on garden#show	2017-05-11 17:25:51 +09:30
Brenda Wallace	e61c3f619b	Revert "Only show first 5 photos on gardens#show" ... This reverts commit 93b25a5c32.	2017-05-07 16:10:14 +12:00
Brenda Wallace	93b25a5c32	Only show first 5 photos on gardens#show	2017-05-07 14:41:14 +12:00
Brenda Wallace	f7ca32d888	Moved garden photos to right/bottom	2017-05-06 13:30:57 +12:00
Brenda Wallace	d57c46066a	updated view spec to find glypicon	2017-05-06 13:27:23 +12:00
Brenda Wallace	1e6cb2cfe4	don't eager load harvests	2017-05-06 12:15:03 +12:00
Brenda Wallace	67ae80056a	Removed unnecesary div wrap	2017-05-06 12:08:23 +12:00
Brenda Wallace	13fa3c69e8	fixes places ... card -> thumbnail	2017-05-06 12:06:28 +12:00
Brenda Wallace	caad557b2a	Updating specs to click glypicons	2017-05-06 12:03:57 +12:00
Brenda Wallace	0f030d2c27	Planting thumbnail links to planting ... fixes #1308	2017-05-06 11:48:17 +12:00
Brenda Wallace	66d548c9c1	Added some glypicons to gardenshow	2017-05-06 11:47:24 +12:00
Brenda Wallace	c168bb4a2b	More fix up to alignment and thumbnail row counts gardens#show	2017-05-06 11:39:02 +12:00
Brenda Wallace	811db2961a	Quick fix up of photo display on garden#show	2017-05-05 23:38:19 +12:00