 Brenda Wallace
|
51be3db970
|
Use a guard clasue in shop controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
5d654175a9
|
A bunch of single line methods
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
e9003ad32a
|
Small dry of crops controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
38c3320731
|
Rubocop fix up in accounts controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
e6b556851a
|
More DRYing of members controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
a30285ef49
|
DRY some of the members controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
4f67f17551
|
DRY the shop controller
|
2017-05-29 16:17:43 +12:00 |
|
|
Shiny
|
8f66009d0d
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-05-29 15:56:17 +12:00 |
|
|
Daniel O'Connor
|
cdd12fd4dd
|
Merge pull request #1348 from Br3nda/inactive-plantings
Inactive plantings show as tiny thumbnails
|
2017-05-29 10:52:37 +09:30 |
|
|
Daniel O'Connor
|
3ff0018a12
|
Merge branch 'dev' into inactive-plantings
|
2017-05-29 09:46:03 +09:30 |
|
|
Daniel O'Connor
|
0b0f479752
|
Merge pull request #1346 from Br3nda/bugfix-brokenurl-crop-rss
Fixed url in crop rss feed
|
2017-05-29 09:44:04 +09:30 |
|
|
Shiny
|
b7148b99dc
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-05-28 20:54:02 +12:00 |
|
|
Brenda Wallace
|
8076e58a97
|
Owner must exist so we can see photos
|
2017-05-28 19:32:34 +12:00 |
|
|
Shiny
|
251d390c23
|
Merge branch 'dev' into bugfix-brokenurl-crop-rss
|
2017-05-28 18:52:03 +12:00 |
|
|
Brenda Wallace
|
f380f222a9
|
Move edit link to top of card
|
2017-05-28 18:51:01 +12:00 |
|
|
Brenda Wallace
|
eacdab45ba
|
Removed planting.with_dates
|
2017-05-28 18:44:26 +12:00 |
|
|
Brenda Wallace
|
dcb949e7b3
|
Fixed bug - error when planting has no finished_at
|
2017-05-28 18:10:53 +12:00 |
|
|
Brenda Wallace
|
ebf1468652
|
Fix up small haml nexting bug
|
2017-05-28 18:07:19 +12:00 |
|
|
Brenda Wallace
|
4726b57c47
|
Inactive plantings show as tiny thumbnails
|
2017-05-28 17:13:04 +12:00 |
|
|
deppbot
|
f422336aff
|
Bundle Update on 2017-05-28
|
2017-05-28 14:23:17 +12:00 |
|
|
Brenda Wallace
|
2c622af49c
|
Fixed url in crop rss feed
|
2017-05-27 14:30:24 +12:00 |
|
|
Brenda Wallace
|
0b684eb05e
|
Checks owner exists, in default_scopes of many models
|
2017-05-26 23:00:06 +12:00 |
|
|
Brenda Wallace
|
9c4a45bc29
|
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
|
2017-05-26 21:25:00 +12:00 |
|
|
Brenda Wallace
|
00f7551c0a
|
Merge remote-tracking branch 'upstream/dev' into issue-1044-account-deletion
|
2017-05-26 21:24:41 +12:00 |
|
|
Shiny
|
ee7b915313
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-05-26 21:24:29 +12:00 |
|
|
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 |
|