 Cesy
|
3b6a42b8f2
|
Merge pull request #1343 from Growstuff/dev
Release 26
release26
|
2017-06-12 09:01:10 +01:00 |
|
|
Cesy
|
2f30343303
|
Merge pull request #1341 from Br3nda/issue-1044-account-deletion
Issue 1044 account deletion
|
2017-06-11 19:01:00 +01:00 |
|
|
Brenda Wallace
|
8de7e7a00b
|
remove pending admin deletion specs. covered by model spec
|
2017-06-09 23:35:04 +12:00 |
|
|
Brenda Wallace
|
46efcf3e61
|
Spec for Forum owners and Crop creators deleting their accounts
|
2017-06-09 23:25:40 +12:00 |
|
|
Brenda Wallace
|
7968f3e407
|
Marked some un-written specs as pending
|
2017-06-09 23:00:38 +12:00 |
|
|
Brenda Wallace
|
639232bc87
|
Removal from newsletter spec is in model spec
|
2017-06-09 22:55:11 +12:00 |
|
|
Brenda Wallace
|
e0bc1c936a
|
Spec for comments by deleted members
|
2017-06-09 22:54:36 +12:00 |
|
|
Brenda Wallace
|
910a9673dc
|
Unsubscribes newsletter before member destroying
|
2017-06-09 22:39:07 +12:00 |
|
|
Brenda Wallace
|
582dd2c9fd
|
Checks the deleted members are not found
|
2017-06-09 21:28:47 +12:00 |
|
|
Brenda Wallace
|
1a743d7592
|
Filled in spec for link to delete member's account
|
2017-06-09 21:17:12 +12:00 |
|
|
Shiny
|
174040aa1b
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-06-09 21:04:41 +12:00 |
|
|
deppbot
|
4471ac64e4
|
Bundle Update on 2017-06-09
|
2017-06-09 21:03:03 +12:00 |
|
|
Daniel O'Connor
|
a8bb6c9f58
|
Merge pull request #1357 from cesy/bundleupdate0
Bundle update 2017-06-08
|
2017-06-09 09:55:12 +09:30 |
|
|
Daniel O'Connor
|
7d7053f558
|
Merge branch 'dev' into bundleupdate0
|
2017-06-09 09:54:24 +09:30 |
|
|
Daniel O'Connor
|
6f59896d96
|
Merge pull request #1358 from cesy/bundleupdate
Rails 4.2.7->4.2.8
|
2017-06-09 09:53:45 +09:30 |
|
|
Cesy Avon
|
e8cf19cc9d
|
Bundle update 2017-06-08
|
2017-06-08 16:20:11 +00:00 |
|
|
Cesy Avon
|
5a3d15d101
|
Bundle update
|
2017-06-08 16:19:00 +00:00 |
|
|
Cesy Avon
|
142be72fc3
|
Upgrading Rails
|
2017-06-08 16:07:30 +00:00 |
|
|
Brenda Wallace
|
c6331fc449
|
Spec checks deleted member doesn't appear in interesting queries
|
2017-06-04 19:31:27 +12:00 |
|
|
Brenda Wallace
|
e8455cd943
|
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
|
2017-06-04 19:27:37 +12:00 |
|
|
Brenda Wallace
|
080e728905
|
Spec checks you can't log in after deleting your account
|
2017-06-04 19:21:58 +12:00 |
|
|
Shiny
|
db532fcc8f
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-06-04 13:00:30 +12:00 |
|
|
deppbot
|
e78d899528
|
Bundle Update on 2017-06-03
|
2017-06-04 12:55:47 +12:00 |
|
|
Brenda Wallace
|
1f916b8314
|
Post says Member Deleted when they are
|
2017-06-02 22:51:48 +12:00 |
|
|
Brenda Wallace
|
1cdcaac41e
|
comment says "Member Deleted" when they are
|
2017-06-02 22:50:48 +12:00 |
|
|
Brenda Wallace
|
bbc3ca749f
|
Removed author_exists scope. It is part of default
|
2017-06-02 22:43:25 +12:00 |
|
|
Brenda Wallace
|
20b980a162
|
Helpful comment explains why we use act_as_paranoid
|
2017-06-02 22:42:03 +12:00 |
|
|
Brenda Wallace
|
37897ad595
|
Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion
|
2017-06-02 22:40:56 +12:00 |
|
|
Brenda Wallace
|
72f805e135
|
Doesn't need check the :deleted field in registraions
|
2017-06-02 22:40:39 +12:00 |
|
|
Shiny
|
1bb4f601a1
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-06-02 22:35:07 +12:00 |
|
|
Brenda Wallace
|
fb012c073e
|
leaves a record of orders and payments intact when members deleted
|
2017-06-02 22:34:19 +12:00 |
|
|
Brenda Wallace
|
3dfd9eedca
|
Updating member deletion specs
|
2017-06-02 21:49:28 +12:00 |
|
|
Brenda Wallace
|
75d2c0ea3c
|
destroy member if password correct
|
2017-06-02 20:49:30 +12:00 |
|
|
Brenda Wallace
|
08996c4157
|
removed members#destroy. this should be on the registrations controller
|
2017-06-02 20:48:43 +12:00 |
|
|
Brenda Wallace
|
c48e24845e
|
Remove owner_exists scope
|
2017-06-02 20:28:32 +12:00 |
|
|
Cesy Avon
|
61f93df6ff
|
Feature specs for member deletion
|
2017-06-02 19:48:59 +12:00 |
|
|
deppbot
|
34e5e0850d
|
Bundle Update on 2017-05-31
|
2017-05-31 18:27:23 +12:00 |
|
|
Shiny
|
7621da7041
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-05-30 20:39:44 +12:00 |
|
|
Brenda Wallace
|
8bcc5104e5
|
Delegate planting predictions
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
4bbeca9f3e
|
only look up other plantings finishing, if we have a crop
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
54748ac20d
|
Removed current_date variable from planting_predictions
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
3c8b80574a
|
Small DRY of planting models -> predict added
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
288ad782d2
|
Planted? = true when planted today
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
5d97a7edac
|
Move setting of days_before_maturity back to plant model
|
2017-05-29 22:45:14 +12:00 |
|
|
Brenda Wallace
|
ff1c835cda
|
Moving the planting predictions to own service
|
2017-05-29 22:45:14 +12:00 |
|
|
Daniel O'Connor
|
479f61b224
|
Merge pull request #1352 from Br3nda/admin-typo
Fixed admin typo
|
2017-05-29 19:18:59 +09:30 |
|
|
Brenda Wallace
|
ac94b8b6d3
|
Fixed admin typo
|
2017-05-29 17:52:08 +12:00 |
|
|
Shiny
|
fedc7a7fb6
|
Merge branch 'dev' into issue-1044-account-deletion
|
2017-05-29 16:17:59 +12:00 |
|
|
Brenda Wallace
|
9f9df07390
|
DRY photos controller more
|
2017-05-29 16:17:43 +12:00 |
|
|
Brenda Wallace
|
e5a705aeae
|
Responders on the roles controller
|
2017-05-29 16:17:43 +12:00 |
|