Skip to content

Release candidate #2298

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 120 commits into from
Sep 19, 2017
Merged
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
6080742
Merge pull request #2249 from biocore/release-candidate
josenavas Aug 23, 2017
52e98a5
replace printable for try/except utf-8
antgonza Aug 28, 2017
e367b54
add sleeps for tests
antgonza Aug 28, 2017
5f7177e
moving wait_for_prep_information_job
antgonza Aug 28, 2017
01da18f
just leaving the changes on this pr
antgonza Aug 28, 2017
2ae9511
Fixing tests
josenavas Aug 28, 2017
2026d0c
Reverting changes
josenavas Aug 28, 2017
f098fcf
dist: precise
antgonza Aug 28, 2017
97a8397
Merge branch 'printable-to-utf8' of https://github.com/antgonza/qiita…
antgonza Aug 28, 2017
e195e07
addressing @josenavas comments
antgonza Aug 29, 2017
ef4f566
Merge pull request #2255 from antgonza/printable-to-utf8
josenavas Aug 29, 2017
7d5da5c
fix-2212
josenavas Aug 29, 2017
21f0287
Adding branch description to Contributing (#2256)
josenavas Aug 29, 2017
2e102b4
Merge branch 'dev' of https://github.com/biocore/qiita into dev
josenavas Aug 31, 2017
de5c89f
upgrading software
antgonza Aug 31, 2017
6248208
mv r_client to qiita
antgonza Aug 31, 2017
eb19870
from redis import Redis
antgonza Aug 31, 2017
120e9ac
Merge pull request #2261 from antgonza/upgrading-software
josenavas Aug 31, 2017
58e2dab
Merge branch 'remove-moi' of https://github.com/biocore/qiita into r_…
antgonza Aug 31, 2017
8b4ce80
Merge pull request #2262 from antgonza/r_client-to-qiita
josenavas Aug 31, 2017
fa7cf3d
rm moi and ipython
antgonza Aug 31, 2017
a47c13b
Move qiita_db/private.py -> qiita_ware/private_plugin.py
josenavas Aug 31, 2017
c8c1b59
_system_call as system_call
antgonza Aug 31, 2017
c46c05f
flake8
antgonza Aug 31, 2017
f7e9b1e
rm create_raw_data
antgonza Aug 31, 2017
c16b177
Transferring VAMPS submission to internal job
josenavas Aug 31, 2017
4de94cd
rm other unnecessary files
antgonza Aug 31, 2017
f50dc35
addressing @josenavas comment
antgonza Aug 31, 2017
d4f8d8c
Merge pull request #2263 from antgonza/rm-moi-ipython
josenavas Aug 31, 2017
925a3a5
Merge branch 'remove-moi' of https://github.com/biocore/qiita into rm…
antgonza Aug 31, 2017
58cd5ae
Merge branch 'remove-moi' of https://github.com/biocore/qiita into tr…
josenavas Aug 31, 2017
0be1275
Merge pull request #2264 from antgonza/rm-create_raw_data
josenavas Aug 31, 2017
263f956
Solving merge conflicts
josenavas Aug 31, 2017
efa1924
Merge branch 'transfer-submit-to-vamps' into transfer-copy-raw-data
josenavas Aug 31, 2017
4f43236
Fixing merge conflicts
josenavas Aug 31, 2017
a528e04
Adding tests to private plugin
josenavas Aug 31, 2017
242df8e
rm wrapper.py
antgonza Aug 31, 2017
0bf7307
Removing import
josenavas Aug 31, 2017
6ee9022
Fixing import
josenavas Aug 31, 2017
c13e8bd
Merge branch 'transfer-submit-to-vamps' into transfer-copy-raw-data
josenavas Aug 31, 2017
c3bc77c
Modifying GUI to use the plugin
josenavas Aug 31, 2017
fbf5402
moving qiita pet in .travis.yml
antgonza Aug 31, 2017
71c0b41
Transfer submit to vamps (#2265)
josenavas Aug 31, 2017
b6f43c0
Merge branch 'remove-moi' of https://github.com/biocore/qiita into rm…
antgonza Aug 31, 2017
8051cbb
some other .travis.yml fixes
antgonza Aug 31, 2017
10d8cfd
Fixing import
josenavas Aug 31, 2017
df5f5c8
addressing @josenavas comment
antgonza Aug 31, 2017
5230bae
Merge pull request #2266 from antgonza/rm-wrapper.py
josenavas Aug 31, 2017
044e562
Merge branch 'remove-moi' of https://github.com/biocore/qiita into tr…
josenavas Aug 31, 2017
f2a12c6
Adding success test
josenavas Aug 31, 2017
a9e302a
adding some methods
antgonza Aug 31, 2017
dde3296
flake8
antgonza Aug 31, 2017
779a5d1
Transfer copy raw data (#2267)
josenavas Aug 31, 2017
2113fa4
fix conflicts
antgonza Aug 31, 2017
e03997a
change imports
antgonza Sep 1, 2017
48abc1e
adding delete_artifact and create_sample_template
antgonza Sep 1, 2017
2d8dffa
fixing errors and gui
antgonza Sep 1, 2017
df64ef5
fix delete error
antgonza Sep 2, 2017
dc7f78c
Merge pull request #2268 from antgonza/mv-some-methods
josenavas Sep 5, 2017
9a8d271
Merge pull request #2257 from josenavas/fix-2212
adswafford Sep 6, 2017
6673792
ENH: Make jobs list modal
ElDeveloper Sep 6, 2017
c227463
erge branch 'master' of https://github.com/biocore/qiita
antgonza Sep 7, 2017
22d52f0
Transfer update delete templates (#2274)
josenavas Sep 8, 2017
fb60c20
Merge branch 'remove-moi' of git://github.com/biocore/qiita into jobs…
ElDeveloper Sep 8, 2017
0440cb7
BUG: Fix job updates
ElDeveloper Sep 8, 2017
8178bab
Merge branch 'dev' of https://github.com/biocore/qiita
antgonza Sep 9, 2017
fb65ff1
Fixing the redis DB (#2277)
josenavas Sep 9, 2017
61e66a8
Merge branch 'remove-moi' of https://github.com/biocore/qiita into re…
antgonza Sep 10, 2017
caaf730
redbiom install
antgonza Sep 10, 2017
7b906b9
redbiom to install_requires
antgonza Sep 10, 2017
ecfbaf7
Merge branch 'remove-moi' of https://github.com/biocore/qiita into mo…
antgonza Sep 10, 2017
0a9182f
mv moi-ws to qiita_websocket
antgonza Sep 11, 2017
4ed9285
Merge pull request #2279 from antgonza/moi.send
josenavas Sep 11, 2017
45e0175
Merge pull request #2260 from biocore/remove-moi
josenavas Sep 11, 2017
6525487
Merge branch 'dev' of https://github.com/biocore/qiita into redbiom-i…
antgonza Sep 11, 2017
5e99089
init commit
antgonza Sep 11, 2017
84d1ebd
addressing @wasade comment
antgonza Sep 11, 2017
21549c1
rm webdis.log
antgonza Sep 11, 2017
8ab4066
cleaning code for initial review
antgonza Sep 13, 2017
d3590f6
install latest redbiom
antgonza Sep 13, 2017
ab397c1
fix test
antgonza Sep 13, 2017
42dd9a9
Merge pull request #2278 from antgonza/redbiom-install
josenavas Sep 13, 2017
eef49b1
Merge branch 'dev' of https://github.com/biocore/qiita into initial-r…
antgonza Sep 13, 2017
c808c63
ENH: Change phrasing of upload text (#2281)
ElDeveloper Sep 13, 2017
e482bce
addressing @wasade comments and adding other tests
antgonza Sep 13, 2017
25ee54f
flake8
antgonza Sep 13, 2017
079f4eb
addressing @josenavas comments
antgonza Sep 14, 2017
9e1c1b5
Merge pull request #2282 from antgonza/initial-redbiom-code
josenavas Sep 14, 2017
e4e8ffd
fix #2258
antgonza Sep 14, 2017
49015c2
fix #2258
antgonza Sep 14, 2017
955d5cd
fix #858 (#2286)
antgonza Sep 15, 2017
d8c4a72
addressing @ElDeveloper and @josenavas comments
antgonza Sep 15, 2017
b482b4e
@ElDeveloper :|
antgonza Sep 15, 2017
a9aa1c4
Merge pull request #2287 from antgonza/fix-2258
josenavas Sep 15, 2017
d4cc989
redbiom now adds per sample studies to analysis
antgonza Sep 15, 2017
525102e
Merge branch 'jobs-list-as-modal' of https://github.com/ElDeveloper/q…
antgonza Sep 15, 2017
7906727
jobs-list-as-modal
antgonza Sep 15, 2017
de75346
addresssing @josenavas comments
antgonza Sep 15, 2017
b8e3da4
rm () from update_processing_job_data
antgonza Sep 15, 2017
46b174e
add prints to review errors
antgonza Sep 16, 2017
38e5cd7
rm prints
antgonza Sep 16, 2017
91f0051
Merge pull request #2289 from antgonza/jobs-list-as-modal
josenavas Sep 18, 2017
ae3dc0c
Merge pull request #2288 from antgonza/redbiom-per-sample
josenavas Sep 18, 2017
c9045ff
Fix 2190 (#2292)
josenavas Sep 18, 2017
15b849f
add is_from_analysis to artifact_handlers (#2293)
antgonza Sep 18, 2017
81bd7b3
WIP: rm sudo from travis
antgonza Sep 18, 2017
191199c
adding sed for config file
antgonza Sep 18, 2017
53579aa
fix sed
antgonza Sep 18, 2017
d12ed87
rm &
antgonza Sep 18, 2017
ea5d647
cat redis.conf
antgonza Sep 18, 2017
4c40d83
using local redis.conf
antgonza Sep 18, 2017
fad8935
# protected-mode yes
antgonza Sep 18, 2017
91bdbbc
# supervised no
antgonza Sep 18, 2017
e0d83bc
redis-server --port 7777 &
antgonza Sep 18, 2017
1b7e38c
Fix 1293 (#2291)
antgonza Sep 18, 2017
6adf8b1
rm redis.conf
antgonza Sep 18, 2017
20226ed
fix awaiting_approval list bug
antgonza Sep 19, 2017
d5ecf8a
Merge pull request #2295 from antgonza/rm-sudo
josenavas Sep 19, 2017
33054b2
Merge pull request #2296 from antgonza/awaiting_approval-list
josenavas Sep 19, 2017
064d35a
Fix #2276 (#2294)
josenavas Sep 19, 2017
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-2212
  • Loading branch information
josenavas committed Aug 29, 2017
commit 7d5da5c8276951e23afd80c5502262f248c04a20
8 changes: 8 additions & 0 deletions qiita_pet/templates/artifact_ajax/artifact_summary.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@
function validate_new_name() {
$("#update-name-btn").prop('disabled', $("#new-artifact-name").val() === "");
}

$(document).ready(function() {
// Set the focus on the text input when the modal to change the artifact
// name is shown
$('#update-artifact-name').on('shown.bs.modal', function() {
$('#new-artifact-name').focus();
});
});
</script>
<div class='row'>
<div class='col-md-12'>
Expand Down