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.

Sign up for GitHub

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

Contribute Tripal HQ Imports #116

Merged
merged 40 commits into from
Nov 12, 2019
Merged

Contribute Tripal HQ Imports #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
1a1dd95
Initial commit
laceysanderson Oct 13, 2019
057b529
Update README.md
laceysanderson Oct 13, 2019
6111b52
Initialize module.
laceysanderson Oct 13, 2019
669f0e0
List importers and allow users to submit them for consideration (incl…
laceysanderson Oct 13, 2019
a2a96cb
Trying to fix travis by ensuring dependencies are present.
laceysanderson Oct 13, 2019
f30ae44
Remove tests which fail due to tripal core bug.
laceysanderson Oct 13, 2019
9aa1991
Skipping tests due to bug in core :-(
laceysanderson Oct 13, 2019
8919cad
List data submissions on the users dashboard.
laceysanderson Oct 14, 2019
31a1801
Bring back the tests.
laceysanderson Oct 14, 2019
e69a438
Skip user dashboard test until alter PR makes it into Tripal HQ master.
laceysanderson Oct 14, 2019
d36acf2
Update README.md
laceysanderson Oct 14, 2019
0990b83
Override the administration dashboard, adding data file submissions.
laceysanderson Oct 15, 2019
4244ab7
Merge branch 'master' of https://github.com/UofS-Pulse-Binfo/tripal_h…
laceysanderson Oct 15, 2019
d96f50a
Add pagers.
laceysanderson Oct 15, 2019
0fa718e
Small bug fix and added tests for admin dashboard.
laceysanderson Oct 15, 2019
2118119
Support editing of submissions.
laceysanderson Oct 15, 2019
cbe799c
Improve user submission with messages and redirect.
laceysanderson Oct 16, 2019
de837a2
Add Approve/Reject Support.
laceysanderson Oct 16, 2019
92914f6
Update README.md
laceysanderson Oct 16, 2019
bc9265b
Support per-importer permissions.
laceysanderson Oct 17, 2019
6565332
Improve tests.
laceysanderson Oct 17, 2019
2a9be85
Update README.md
laceysanderson Oct 17, 2019
e778d7d
Update README.md
laceysanderson Oct 17, 2019
c022197
Move all Headquarters modules into separate package.
laceysanderson Oct 31, 2019
d86dffc
Add 'tripal_hq_imports/' from commit 'e778d7d53ee55757ee3a4fea6ed8f76…
laceysanderson Oct 31, 2019
5b88354
Move Tripal HQ Import tests.
laceysanderson Oct 31, 2019
1519497
Ensure Tripal HQ imports is in the same package as the rest of Tripal…
laceysanderson Oct 31, 2019
26d93b1
Merge redundant files to import Tripal HQ Imports.
laceysanderson Oct 31, 2019
e7141ab
Update Tripal HQ docs to include Tripal HQ Imports.
laceysanderson Nov 1, 2019
e9a4ab6
Update README.md
laceysanderson Nov 1, 2019
a3191b6
Update Tripal HQ Imports readme.
laceysanderson Nov 1, 2019
e531945
Make some changes code climate suggested.
laceysanderson Nov 1, 2019
49682bd
Merge branch 'submit-tripal-hq-imports' of https://github.com/laceysa…
laceysanderson Nov 2, 2019
95450a5
Fix formatting and documentation issues.
laceysanderson Nov 2, 2019
ed14253
Add helpful tips to make contribution easier.
laceysanderson Nov 2, 2019
1d3cacd
Fix comment count display.
laceysanderson Nov 12, 2019
d191c81
Remove unsupported importers: obo and bulk publication.
laceysanderson Nov 12, 2019
9150dfd
Disable local file upload.
laceysanderson Nov 12, 2019
b3570bd
Fix merge conflict.
laceysanderson Nov 12, 2019
f4e8066
Code style fixes.
laceysanderson Nov 12, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ vendor/
.idea/
docs/_build/*
.DS_Store
tests/_build
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ before_script:
script:
- docker run -it -d --rm --name tripal -v "$(pwd)":/modules/tripal_hq statonlab/tripal3
- sleep 30 # We pause here so postgres and apache complete booting up
- docker exec -it tripal drush pm-enable -y tripal_hq tripal_hq_permissions
- docker exec -it tripal drush pm-enable -y tripal_hq tripal_hq_permissions tripal_hq_imports
- docker exec -it tripal yum install -y php-pecl-xdebug.x86_64
- docker exec -it tripal bash -c "cd /modules/tripal_hq && composer install && DRUPAL_ROOT=/var/www/html ./vendor/bin/phpunit --coverage-clover ./clover.xml"

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For module installation and usage instructions, [please see our documentation we

## Module Features

* Users create data using your existing Bundle configuration- no extra forms!
* Users create data using your existing Bundle configuration or Importers- no extra forms!
* User dashboard area for viewing pending submissions
* Admin dashboard for viewing submissions
* Chado-based permissions to create admins for certain projects or organisms
Expand Down
4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
},
"require-dev": {
"statonlab/tripal-test-suite": "1.5.*",
"phpunit/php-code-coverage": "^6.1"
"phpunit/php-code-coverage": "^6.1",
"squizlabs/php_codesniffer": "^2.9.1",
"drupal/coder": "^8.2"
},
"autoload": {
"psr-4": {
Expand Down
Loading