Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: refactor reminders #2223

Merged
merged 65 commits into from
Jan 15, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
e51ae06
wip
djaiss Dec 22, 2018
0b05952
Apply fixes from StyleCI
djaiss Dec 22, 2018
7e55756
wip
djaiss Dec 22, 2018
b5cd10d
first batch of changes
djaiss Dec 23, 2018
b646619
Merge branch '2018-12-22-fix-one-time-reminder' of github.com:monicah…
djaiss Dec 23, 2018
e91551f
Apply fixes from StyleCI
djaiss Dec 23, 2018
c7be538
wip
djaiss Dec 28, 2018
bd5b15b
Apply fixes from StyleCI
djaiss Dec 28, 2018
18b04f5
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Dec 28, 2018
023a024
wip
djaiss Dec 28, 2018
f869c54
Apply fixes from StyleCI
djaiss Dec 28, 2018
0ec78ce
wip
djaiss Dec 28, 2018
370bb06
Merge branch '2018-12-22-fix-one-time-reminder' of github.com:monicah…
djaiss Dec 28, 2018
4957e82
Apply fixes from StyleCI
djaiss Dec 28, 2018
1cca8d7
fix reminder crud through ui
djaiss Dec 29, 2018
c5ea351
Apply fixes from StyleCI
djaiss Dec 29, 2018
8c70968
update tests for api reminder methods
djaiss Dec 29, 2018
b1abd27
Apply fixes from StyleCI
djaiss Dec 29, 2018
6077773
fixes
djaiss Dec 29, 2018
f203e70
fix reminder set to life event
djaiss Dec 30, 2018
1e85e90
fix reminder services
djaiss Dec 30, 2018
7d7560c
remove useless files
djaiss Dec 30, 2018
46c4eba
add user to reminderoutbox object
djaiss Dec 30, 2018
aa211ad
missing stuff about reminder outbox
djaiss Dec 30, 2018
bef6743
refactor how we check if user needs to be reminded
djaiss Dec 30, 2018
37a5ef0
add command console to send reminders
djaiss Dec 30, 2018
3579e2b
Apply fixes from StyleCI
djaiss Dec 30, 2018
5bcfddf
final touch on send reminder job
djaiss Dec 31, 2018
a450f95
Apply fixes from StyleCI
djaiss Dec 31, 2018
ab29fde
wip
djaiss Jan 1, 2019
3241d75
Apply fixes from StyleCI
djaiss Jan 1, 2019
937d311
chore(assets): Update assets
MonicaBot Jan 1, 2019
5266420
reminder should be properly scheduled now and sent
djaiss Jan 1, 2019
eda5958
Merge branch '2018-12-22-fix-one-time-reminder' of github.com:monicah…
djaiss Jan 1, 2019
594f602
Apply fixes from StyleCI
djaiss Jan 1, 2019
a1b2047
fix reminder api methods
djaiss Jan 1, 2019
64c53f7
fix pslam
djaiss Jan 2, 2019
95ed8dd
Apply fixes from StyleCI
djaiss Jan 2, 2019
cce7136
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 2, 2019
cc337fe
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 3, 2019
8119119
fix failing tests
djaiss Jan 4, 2019
e698a6b
Apply fixes from StyleCI
djaiss Jan 4, 2019
8146e0a
chore(assets): Update assets
MonicaBot Jan 4, 2019
37961e8
fix palsm
djaiss Jan 4, 2019
df959f2
Merge branch '2018-12-22-fix-one-time-reminder' of github.com:monicah…
djaiss Jan 4, 2019
3019329
fix failing tests
djaiss Jan 4, 2019
bba1203
Apply fixes from StyleCI
djaiss Jan 4, 2019
772aaad
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 5, 2019
94b40f5
wip
djaiss Jan 5, 2019
7bff3a6
Apply fixes from StyleCI
djaiss Jan 5, 2019
31b13b3
remove existing files
djaiss Jan 5, 2019
2e99db9
merge master
djaiss Jan 5, 2019
52c23b5
Apply fixes from StyleCI
djaiss Jan 5, 2019
bf480c4
reformat reminders
djaiss Jan 6, 2019
53723ca
Merge branch '2018-12-22-fix-one-time-reminder' of github.com:monicah…
djaiss Jan 6, 2019
4327d2e
fix errors
djaiss Jan 6, 2019
5b03611
fix flow
djaiss Jan 6, 2019
67e9e56
update changelog
djaiss Jan 6, 2019
5342e2f
final touches, perhaps, or not
djaiss Jan 6, 2019
7b0a6db
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 6, 2019
cae31fa
changes
djaiss Jan 15, 2019
11187fe
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 15, 2019
1517299
Apply fixes from StyleCI
djaiss Jan 15, 2019
4f0954e
chore(assets): Update assets
MonicaBot Jan 15, 2019
7b8f7db
Merge branch 'master' into 2018-12-22-fix-one-time-reminder
djaiss Jan 15, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply fixes from StyleCI
  • Loading branch information
djaiss authored and StyleCIBot committed Dec 28, 2018
commit 4957e823ca8048aa35aa387add34acc085fba0ad
2 changes: 1 addition & 1 deletion app/Http/Controllers/ContactsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public function edit(Contact $contact)
$day = ! is_null($contact->birthdate) ? $contact->birthdate->date->day : $now->day;
$month = ! is_null($contact->birthdate) ? $contact->birthdate->date->month : $now->month;

$hasBirthdayReminder = is_null($contact->birthday_reminder_id) ? 0 : 1;
$hasBirthdayReminder = is_null($contact->birthday_reminder_id) ? 0 : 1;

return view('people.edit')
->withContact($contact)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?php

use App\Models\Contact\Reminder;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Models\Contact\Contact;
use Illuminate\Database\Eloquent\ModelNotFoundException;

class AddBirthdayReminderToContacts extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?php

use App\Models\Contact\Reminder;
use App\Models\Contact\Contact;
use App\Models\Instance\SpecialDate;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Models\Contact\Contact;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use App\Models\Instance\SpecialDate;

class AddForeignKeyToContacts extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

use App\Models\Account\Account;
use App\Models\Contact\Contact;
use App\Models\Instance\SpecialDate;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Models\Instance\SpecialDate;
use App\Models\Contact\Contact;
use App\Models\Account\Account;
use Illuminate\Database\Eloquent\ModelNotFoundException;

class AddForeignKeysToSpecialDate extends Migration
Expand Down