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: add ability to upload documents #1912

Merged
merged 58 commits into from
Oct 28, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
be3565b
wip
djaiss Sep 23, 2018
0e5e613
Apply fixes from StyleCI
djaiss Sep 23, 2018
354de89
wip
djaiss Sep 23, 2018
c51c627
Merge branch 'master' into 2018-09-22-add-document-upload
djaiss Sep 23, 2018
8e4f75f
wip
djaiss Sep 24, 2018
e4a75d3
Merge branch '2018-09-22-add-document-upload' of github.com:monicahq/…
djaiss Sep 24, 2018
56c7fba
Apply fixes from StyleCI
djaiss Sep 24, 2018
ab1e127
add test for the upload service
djaiss Oct 13, 2018
c25a175
pave the way to display documents
djaiss Oct 13, 2018
cb48848
Apply fixes from StyleCI
djaiss Oct 13, 2018
0e40bfd
chore(assets): Update assets
MonicaBot Oct 13, 2018
2bcc20f
wip
djaiss Oct 14, 2018
9e324a3
Merge branch '2018-09-22-add-document-upload' of github.com:monicahq/…
djaiss Oct 14, 2018
55ed8f0
Apply fixes from StyleCI
djaiss Oct 14, 2018
6d5c620
wip
djaiss Oct 15, 2018
818a31f
Merge branch 'master' into 2018-09-22-add-document-upload
djaiss Oct 15, 2018
2b52897
fix js problems
djaiss Oct 15, 2018
78ec0ea
add unit test for controller
djaiss Oct 15, 2018
23a40d4
add api method to get documents
djaiss Oct 15, 2018
879c1b0
add an env variable to define max storage size
djaiss Oct 16, 2018
418f555
add document module to settings
djaiss Oct 16, 2018
1e2c888
add wording to i18n
djaiss Oct 16, 2018
4f9c68c
Enough work for today
djaiss Oct 16, 2018
7a3661d
Apply fixes from StyleCI
djaiss Oct 16, 2018
6d77cd4
chore(assets): Update assets
MonicaBot Oct 16, 2018
e8178af
menu is now working
djaiss Oct 17, 2018
60d1c5a
chore(assets): Update assets
MonicaBot Oct 17, 2018
b327645
wip
djaiss Oct 18, 2018
492dd9d
chore(assets): Update assets
MonicaBot Oct 18, 2018
249e758
wip
djaiss Oct 18, 2018
649ae29
merge master
djaiss Oct 22, 2018
41c609f
fix migration
djaiss Oct 23, 2018
70d7e59
Merge branch 'master' into 2018-09-22-add-document-upload
djaiss Oct 23, 2018
eda4e83
Apply fixes from StyleCI
djaiss Oct 23, 2018
25a3b20
fix population module table seeder
djaiss Oct 23, 2018
39fe208
fix tests
djaiss Oct 23, 2018
e872e2e
Merge branch '2018-09-22-add-document-upload' of github.com:monicahq/…
djaiss Oct 23, 2018
a5af545
fix palsm
djaiss Oct 23, 2018
d5ced48
Apply fixes from StyleCI
djaiss Oct 23, 2018
153bc7c
wip
djaiss Oct 23, 2018
023882a
chore(assets): Update assets
MonicaBot Oct 23, 2018
32a1789
Merge branch 'master' into 2018-09-22-add-document-upload
djaiss Oct 27, 2018
2bfa032
improvements
djaiss Oct 27, 2018
61475c2
Apply fixes from StyleCI
djaiss Oct 27, 2018
e2a4d75
Update resources/assets/js/components/passport/Clients.vue
asbiin Oct 27, 2018
b570a50
Update resources/views/people/documents/index.blade.php
asbiin Oct 27, 2018
2b79946
chore(assets): Update assets
MonicaBot Oct 27, 2018
06e50e5
changelog
djaiss Oct 27, 2018
70e377b
Merge branch '2018-09-22-add-document-upload' of github.com:monicahq/…
djaiss Oct 27, 2018
3604bc2
enhancements
djaiss Oct 27, 2018
61def9e
add missing tests
djaiss Oct 27, 2018
349bb7d
chore(assets): Update assets
MonicaBot Oct 27, 2018
44fd75c
enhancements
djaiss Oct 27, 2018
9843c70
Fix deletion not working
djaiss Oct 27, 2018
7533ca8
destroy all documents on account reset and deletion
djaiss Oct 28, 2018
65e5025
Apply fixes from StyleCI
djaiss Oct 28, 2018
e8d3ae1
fix palsm
djaiss Oct 28, 2018
937c912
fix failing tests
djaiss Oct 28, 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
2 changes: 1 addition & 1 deletion app/Models/Account/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
use App\Models\Contact\Gift;
use App\Models\Contact\Note;
use App\Models\Contact\Task;
use App\Models\Contact\Document;
use App\Models\Journal\Entry;
use Laravel\Cashier\Billable;
use App\Models\Contact\Gender;
Expand All @@ -21,6 +20,7 @@
use App\Models\Contact\Contact;
use App\Models\Contact\Message;
use App\Models\Contact\Activity;
use App\Models\Contact\Document;
use App\Models\Contact\Reminder;
use Illuminate\Support\Facades\DB;
use App\Models\Contact\ActivityType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public function up()
$table->timestamps();
$table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
});
});
}
}
2 changes: 1 addition & 1 deletion tests/Unit/Models/AccountTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
use App\Models\User\Changelog;
use App\Models\Account\Account;
use App\Models\Contact\Contact;
use App\Models\Contact\Document;
use App\Models\Contact\Message;
use App\Models\Contact\Activity;
use App\Models\Contact\Document;
use App\Models\Contact\Reminder;
use App\Models\Account\Invitation;
use Illuminate\Support\Facades\DB;
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Models/ContactTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
use App\Models\Account\Account;
use App\Models\Contact\Contact;
use App\Models\Contact\Message;
use App\Models\Contact\Document;
use App\Models\Contact\Activity;
use App\Models\Contact\Document;
use App\Models\Contact\ContactField;
use App\Models\Contact\Conversation;
use App\Models\Contact\Notification;
Expand Down