-
Couldn't load subscription status.
- Fork 79
WIP: Portals subdirectory #1648
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit
Hold shift + click to select a range
6f4a557
Modifying config files and parser
josenavas f65d6bf
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza ff36f09
Addressing comments
josenavas 17042b9
fixing some files!
antgonza f0271e8
Fixing parser
josenavas 6bd9d31
Merge branch 'master' of https://github.com/biocore/qiita into subdir…
josenavas 60c50e8
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza a0ab325
update sitebase for portals
squirrelo 23afbde
move to raw output
squirrelo b3fc0a1
addressing @squirrelo comments
antgonza e5bae74
update error_log
squirrelo 71e8383
update list_studies
squirrelo de2b96b
fixing some files!
antgonza 731d62c
Merge pull request #1649 from antgonza/subdir-portals-agp
josenavas 65c1d8d
Merge pull request #1650 from squirrelo/portal-updates-1
josenavas d4e544a
Fixing form in error_log.html
josenavas 9e28c90
Merge pull request #1651 from squirrelo/portal-updates-2
josenavas b7ea47e
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
josenavas 78bc774
Fixing various files
josenavas f4a1ce1
More files
josenavas 9d0d57d
Fixing study description templates
josenavas 31acb67
Merge pull request #1655 from josenavas/subdir-portals-misc
antgonza a10e4af
Fixing comments
josenavas 427f866
Adding missing import
josenavas 48094b8
Merge pull request #1656 from josenavas/subdir-portals-2
antgonza 593dbee
Merge pull request #1654 from josenavas/portal-updates-2
antgonza 4981f03
Merge pull request #1652 from antgonza/subdir-portals-agp-1
josenavas e02ec12
Merge pull request #1657 from josenavas/subdir-portals-study-desc-tem…
antgonza 18fdd3a
Fixing merge conflict
josenavas a8f8271
Fixing link in list_studies
josenavas 690106f
Adding setUp to TestSearchStudiesAJAX
josenavas afcd709
Adding a test to TestSearchStudiesAJAX with different portal
josenavas ff469b9
Changing url in email sent to the user
josenavas 4689470
Fixing link in sitebase.html
josenavas bbe27ca
Fixing moi call in analysis
josenavas 11372c8
Fixing login_url in webserver config
josenavas a55fb93
Merge branch 'subdir-portals-missing' of https://github.com/josenavas…
antgonza 030f397
Merge pull request #1662 from josenavas/subdir-portals-missing
antgonza c23fcee
solving rest of issues
antgonza 6c933fb
Merge pull request #1670 from antgonza/fixing-portals
josenavas 8ab30b5
some more minor fixes
antgonza d1c5468
Merge pull request #1673 from antgonza/fixing-portals-1
josenavas b90cbd5
Solving merge conflicts
josenavas 1d629a5
Merge pull request #1738 from josenavas/subdir-portals-asp
antgonza 7df98ca
make share js more generic
squirrelo 997274b
add anaysis sharing to UI. Fix #1615
squirrelo 5fe04bc
add & update tests
squirrelo 01ac908
add messaging for sharing analyses and studies
squirrelo 1a3414a
merge origin/share-studies-in-studies
squirrelo 9d7524b
remove global var
squirrelo 63d0a7a
fix analysis share changes
squirrelo 5fb1147
merge origin/share-studies-in-studies
squirrelo 2314e24
fix backwards messages
squirrelo b40bb8b
merge upstream/master
squirrelo 32f052b
fix suggestions
squirrelo 3f60461
indentation
squirrelo 5ad25f0
use data attribute
squirrelo 521f8af
Solving merge conflicts
josenavas d4af309
here we go ...
antgonza a2978d6
addressing @josenavas comments
antgonza 4aef864
Merge pull request #1763 from antgonza/subdir-portals-antoniog
josenavas 4f268fd
fixed processing_artifact.html
288930e
FIX: urls
mortonjt b9726e9
update for portals
squirrelo fc91318
Merge pull request #1766 from mortonjt/urls2
josenavas 5e954b8
fixed import in processing_artifact
8492ecb
Merge pull request #1768 from squirrelo/share-analyses
antgonza b797495
Merge pull request #1767 from squirrelo/portals-1
josenavas f4b1d40
Merge pull request #1765 from tkosciol/subdir-portals-tomasz
josenavas 44bcbb5
ENH:Update URLs in data_type_menu and prep_summary
ElDeveloper 3e9525b
Merge pull request #1769 from ElDeveloper/subdir-portals-yoshiki
josenavas 8fdab75
Fixing study base
josenavas 94dba47
missing
josenavas a01fe32
Merge pull request #1770 from josenavas/subdir-portals-base
antgonza e50a7f7
update sharing for portals
squirrelo 3d47374
update sharing for portals
squirrelo a2dcb69
add missing init
squirrelo ec1aa7e
Fixing sample_summary.html
josenavas cd16e14
BUG: Move admin tasks to the main portal only
ElDeveloper a105310
add missing portals calls
squirrelo 4030341
Merge pull request #1773 from ElDeveloper/admin-portals
josenavas bd0ea05
Merge pull request #1772 from josenavas/subdir-portals-3
antgonza 8751685
Merge pull request #1771 from squirrelo/sharing-portals-changes
josenavas 921a886
QUOTES
squirrelo ef44f38
Merge pull request #1774 from squirrelo/sharing-portals-changes
josenavas b629203
remove URL from sharing
squirrelo b52311a
Merge pull request #1775 from squirrelo/sharing-portals-changes
josenavas 0e81d94
remove url
squirrelo 291fb69
fix message
squirrelo 3a68699
Merge pull request #1776 from squirrelo/sharing-portals-changes
antgonza 9cae18f
change portal config
squirrelo 1c64740
move import back
squirrelo 6c9c666
Adding the portal to the base url for the plugins
josenavas be58c8d
Merge pull request #1777 from squirrelo/sharing-portals-changes
antgonza 542ebdb
Adding comments
josenavas 4f2450d
Merge pull request #1778 from josenavas/subdir-portals-plugin
antgonza 38c56ae
Fixing config file
josenavas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,9 @@ VALID_UPLOAD_EXTENSION = fastq,fastq.gz,txt,tsv,sff,fna,qual | |
| # Portal the site is working under | ||
|
||
| PORTAL = QIITA | ||
|
|
||
| # Portal subdirectory | ||
| PORTAL_DIR = | ||
|
|
||
| # Script used for launching plugins | ||
| PLUGIN_LAUNCHER = qiita-plugin-launcher | ||
|
|
||
|
|
||
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both portal and portal_dir are missing from the docstring for the class.