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: life events #1765

Merged
merged 96 commits into from
Sep 25, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
e446486
first draft of the migration
djaiss Aug 31, 2018
f2ddb3a
add default categories and types
djaiss Aug 31, 2018
41b7241
Merge branch 'master' into 2018-08-30-life-events
djaiss Aug 31, 2018
ad342ce
Apply fixes from StyleCI
djaiss Aug 31, 2018
da4ba01
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Aug 31, 2018
d83aa97
core services for life events
djaiss Aug 31, 2018
d0d72ac
Apply fixes from StyleCI
djaiss Aug 31, 2018
a91fc2b
api + api tests
djaiss Sep 1, 2018
0ef7f31
Apply fixes from StyleCI
djaiss Sep 1, 2018
b1daee4
add life events to fake content seeder
djaiss Sep 1, 2018
cb6af2a
first attempt to display life events
djaiss Sep 1, 2018
00bf554
Apply fixes from StyleCI
djaiss Sep 1, 2018
ac50a8d
create life event: add types and categories icons
djaiss Sep 2, 2018
4b1e727
Apply fixes from StyleCI
djaiss Sep 2, 2018
e2a0601
chore(assets): Update assets
MonicaBot Sep 2, 2018
e01260b
add basic add life event screen
djaiss Sep 2, 2018
9ccd536
chore(assets): Update assets
MonicaBot Sep 2, 2018
7e8a6c3
update the create life event view a little bit
djaiss Sep 3, 2018
9a81222
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 3, 2018
00cb273
chore(assets): Update assets
MonicaBot Sep 3, 2018
07e38fd
first step to store the life event
djaiss Sep 3, 2018
e488800
better display of life events
djaiss Sep 4, 2018
80f1cdb
ability to close add modal
djaiss Sep 4, 2018
95acb8c
chore(assets): Update assets
MonicaBot Sep 4, 2018
62e7075
add mouse over effect on listing
djaiss Sep 4, 2018
16aff16
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 4, 2018
f2aba92
chore(assets): Update assets
MonicaBot Sep 4, 2018
e73724c
better layout for add life event screen
djaiss Sep 5, 2018
3e2fd79
first step towards changing profile page
djaiss Sep 5, 2018
b948aa3
Apply fixes from StyleCI
djaiss Sep 5, 2018
33ac3fc
chore(assets): Update assets
MonicaBot Sep 5, 2018
83c6d4e
first step to update function
djaiss Sep 6, 2018
7e2a52a
chore(assets): Update assets
MonicaBot Sep 6, 2018
5242d35
better blank display and create screen
djaiss Sep 7, 2018
dffae50
Apply fixes from StyleCI
djaiss Sep 7, 2018
a0a782c
chore(assets): Update assets
MonicaBot Sep 7, 2018
2e57c3b
better layout of the switch buttons
djaiss Sep 7, 2018
bcf93b8
create button in blank screen
djaiss Sep 7, 2018
630aff3
lay off foundations for custom information for each life event type
djaiss Sep 8, 2018
14c1204
chore(assets): Update assets
MonicaBot Sep 8, 2018
0bffb7a
wip
djaiss Sep 9, 2018
2d38953
chore(assets): Update assets
MonicaBot Sep 9, 2018
527e8df
custom date chooser
djaiss Sep 9, 2018
f90e5b2
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 9, 2018
8d611d1
chore(assets): Update assets
MonicaBot Sep 9, 2018
c97a439
create life event finally works
djaiss Sep 9, 2018
1582902
lang + fix tests
djaiss Sep 9, 2018
19489d2
merge master
djaiss Sep 9, 2018
c476651
chore(assets): Update assets
MonicaBot Sep 9, 2018
ee3ec1e
fix tests
djaiss Sep 9, 2018
c7af30e
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 10, 2018
da4acc3
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 10, 2018
7b773ab
fix fake data setup
djaiss Sep 10, 2018
ae05b21
i18n complete for add life event screen
djaiss Sep 10, 2018
b117949
chore(assets): Update assets
MonicaBot Sep 10, 2018
091a76e
wip
djaiss Sep 10, 2018
86da2ac
add destroy method
djaiss Sep 14, 2018
e2bd5ba
Apply fixes from StyleCI
djaiss Sep 14, 2018
2b1c1b0
chore(assets): Update assets
MonicaBot Sep 14, 2018
eb9c4f6
final touches for deletion and i18n
djaiss Sep 14, 2018
12be39a
chore(assets): Update assets
MonicaBot Sep 14, 2018
79494f1
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 18, 2018
323b884
update
djaiss Sep 18, 2018
a40d570
Apply fixes from StyleCI
djaiss Sep 18, 2018
557ba7c
feature complete
djaiss Sep 19, 2018
a0d6414
merge master
djaiss Sep 21, 2018
3b28e06
fix update
djaiss Sep 21, 2018
94916dd
fix destroy
djaiss Sep 21, 2018
ad1cf39
fix select not working
djaiss Sep 21, 2018
bcfdce6
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 21, 2018
2ece35d
Apply fixes from StyleCI
djaiss Sep 21, 2018
a9bb8bb
fix sonarcloud
djaiss Sep 21, 2018
2f8f65f
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 21, 2018
d4cd165
fix sonar
djaiss Sep 21, 2018
ba27ee0
fix sonar
djaiss Sep 21, 2018
6169526
fix again
djaiss Sep 21, 2018
8f81582
Apply fixes from StyleCI
djaiss Sep 21, 2018
78c27ae
Fix psalm
asbiin Sep 21, 2018
5fd168b
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 21, 2018
6db0122
fix palsm
djaiss Sep 22, 2018
263cb8f
Apply fixes from StyleCI
djaiss Sep 22, 2018
78a889c
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 22, 2018
d3f8166
fix pslam again, again
djaiss Sep 22, 2018
4b230b1
add details about life events
djaiss Sep 22, 2018
4545098
add changelog
djaiss Sep 22, 2018
789f15e
increase coverage
djaiss Sep 23, 2018
c1390b1
increase coverage
djaiss Sep 23, 2018
f792678
Apply fixes from StyleCI
djaiss Sep 23, 2018
99b46df
fix psalm
djaiss Sep 23, 2018
3a63ecc
Merge branch '2018-08-30-life-events' of github.com:monicahq/monica i…
djaiss Sep 23, 2018
346d341
fix palsm
djaiss Sep 23, 2018
e02734e
fix palsm
djaiss Sep 23, 2018
479c108
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 24, 2018
797dec4
enhancements
djaiss Sep 25, 2018
38b40e0
add text explaining that dates can be empty
djaiss Sep 25, 2018
df14d29
Merge branch 'master' into 2018-08-30-life-events
djaiss Sep 25, 2018
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
fix palsm
  • Loading branch information
djaiss committed Sep 22, 2018
commit 6db0122b6a5797fe718d1d26438630d70379b1ac
1 change: 1 addition & 0 deletions app/Http/Controllers/Contacts/LifeEventsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Controllers\Contacts;

use App\Helpers\DateHelper;
use Illuminate\Support\Collection;
use Illuminate\Http\Request;
use App\Models\Contact\Contact;
use App\Http\Controllers\Controller;
Expand Down
1 change: 1 addition & 0 deletions app/Services/Auth/Population/PopulateLifeEventsTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace App\Services\Auth\Population;

use Illuminate\Support\Collection;
use App\Services\BaseService;
use App\Models\Account\Account;
use Illuminate\Support\Facades\DB;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use Illuminate\Support\Facades\DB;
use App\Models\Account\Account;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
Expand Down