https://github.com/ENCODE-DCC/encoded

sort by:
Revision Author Date Message Commit Date
6711b0c Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4250-pennants 27 July 2016, 01:21:02 UTC
2a37811 Add nhgri pennant back Had replaced it with new ENCODE pennant. 27 July 2016, 01:20:48 UTC
80755b8 Merge pull request #1454 from ENCODE-DCC/revert-1448-4201-treatment-ant-bio Revert "4201 treatment ant bio" 27 July 2016, 00:20:57 UTC
29a40e0 Revert "4201 treatment ant bio" 27 July 2016, 00:20:47 UTC
3a75ff9 Merge pull request #1453 from ENCODE-DCC/4088-archived-files 4088 Display archived files in file tables and graphs 27 July 2016, 00:19:51 UTC
0a6fc85 Merge pull request #1448 from ENCODE-DCC/4201-treatment-ant-bio 4201 treatment ant bio 27 July 2016, 00:18:58 UTC
023f43f Updated ENCODE pennant Redmine #4250 26 July 2016, 23:04:04 UTC
9f8b8f0 Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4250-pennants 26 July 2016, 23:03:03 UTC
13b2d5a calling the new field in treatment: 'biosamples_used' 26 July 2016, 22:46:23 UTC
d79013a Merge branch 'master' into 4201-treatment-ant-bio 26 July 2016, 17:45:21 UTC
e7c0694 renaming biosamples in treatment into biosample_components 26 July 2016, 17:45:18 UTC
16a3110 Merge pull request #1451 from ENCODE-DCC/4265-host 4265 host 26 July 2016, 17:34:19 UTC
2d4ff6a Merge pull request #1450 from ENCODE-DCC/4180-platforms 4180 platforms 26 July 2016, 17:33:33 UTC
c66768f Merge pull request #1449 from ENCODE-DCC/4308-nested-tad 4308 nested tad 26 July 2016, 17:32:33 UTC
40d2a4f Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4088-archived-files 26 July 2016, 17:24:38 UTC
627c6c2 Merge pull request #1447 from ENCODE-DCC/4312-lock-tags locked internal tags 26 July 2016, 17:23:50 UTC
b765d4a Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4088-archived-files 26 July 2016, 17:18:31 UTC
d9757b3 Update ENCODE pennant 26 July 2016, 14:37:24 UTC
bde0163 Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4250-pennants 26 July 2016, 14:35:22 UTC
c34daca added treatment with antibody to inserts 25 July 2016, 20:02:54 UTC
213680b Merge branch 'master' into 4201-treatment-ant-bio 25 July 2016, 19:51:15 UTC
d2c3f68 added to output_category 25 July 2016, 15:54:20 UTC
bf4f80e removed unnecessary test 23 July 2016, 05:46:39 UTC
d2c6537 locked internal tags 23 July 2016, 04:51:00 UTC
48cfbc9 merging master and resolving conflicts 23 July 2016, 04:43:48 UTC
40bfa83 resolved conflicts # Conflicts: # src/encoded/audit/experiment.py # src/encoded/audit/file.py # src/encoded/tests/test_audit_experiment.py 23 July 2016, 04:40:32 UTC
c50d503 Merge branch 'master' into 4265-host 23 July 2016, 04:03:40 UTC
88b66fd fixed insert 23 July 2016, 04:03:30 UTC
9117414 Merge pull request #1445 from ENCODE-DCC/4297-tags-audit 4297 tags audit 23 July 2016, 02:52:53 UTC
d4683ce started addition of biosample and antibody to treatments 23 July 2016, 00:08:39 UTC
63a69d4 adding host property to biosample 22 July 2016, 23:49:19 UTC
2a38593 Merge branch 'master' into 4297-tags-audit 22 July 2016, 23:28:51 UTC
d0f7490 Merge branch 'master' into 4297-tags-audit 22 July 2016, 23:28:42 UTC
20ddee9 Merge pull request #1444 from ENCODE-DCC/4300-mapped_read_length Add mapped_read_length property to file object 22 July 2016, 22:29:20 UTC
a3829b1 Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4088-archived-files # Conflicts: # src/encoded/static/components/globals.js 22 July 2016, 21:17:28 UTC
6639dc2 Allow archived files while logged out Involves changing dataset.py to include archived along with released files. Should be reviewed. 22 July 2016, 18:48:28 UTC
e65e555 Merge pull request #1443 from ENCODE-DCC/3294-antibody-status 3494 Antibody Status 22 July 2016, 18:38:36 UTC
cc4253c Merge pull request #1441 from ENCODE-DCC/4296-checkfiles-fix excluding 'replaced' files from uniqueness of content_md5sum requirement 22 July 2016, 18:38:07 UTC
cf7f87b Merge pull request #1440 from ENCODE-DCC/4222-encylopaedia-version 4222 Add encyclopedia version to matrix view of annotations 22 July 2016, 18:37:33 UTC
e9d267a Merge pull request #1439 from ENCODE-DCC/4288-S-cycle Added S to cell cycle phase in biosample.json 22 July 2016, 18:37:00 UTC
81d5973 Merge pull request #1442 from ENCODE-DCC/4242-502-search 4242 Eliminate 502 error when parens in search query string 22 July 2016, 18:35:12 UTC
54e558d Added nested tads to output_type in file.json 22 July 2016, 16:33:22 UTC
f2e81e5 Add mapped_read_length property to file object 21 July 2016, 23:59:31 UTC
4e093bf restricting only for ENTEx and SESCC 21 July 2016, 22:40:20 UTC
46200cc excluding DREAM from inconsistent internal_tags audit 21 July 2016, 18:33:08 UTC
f76f450 fixing audit message 21 July 2016, 17:55:12 UTC
d18c0f5 Just add to matrix y facet list 20 July 2016, 23:55:53 UTC
763d2c8 Added “archived” to unreleased files list 20 July 2016, 19:01:13 UTC
3a7c9c9 Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4242-502-search 20 July 2016, 15:40:13 UTC
9a46690 Add antibody status display Added to both search result pages and antibody pages. 20 July 2016, 15:38:21 UTC
fa38a2d Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4250-pennants 20 July 2016, 15:01:43 UTC
f5030c6 added inconsistent internal tags between biosamples belonging to the same experiment audit 19 July 2016, 23:03:21 UTC
b52857a introduced internal tag audit for experiments 19 July 2016, 22:24:45 UTC
f9e3ca7 excluding 'replaced' files from uniqueness of content_md5sum requirement 19 July 2016, 21:12:42 UTC
52681eb Added S to cell cycle phase in biosample.json 19 July 2016, 20:55:54 UTC
4ae4258 Merge pull request #1438 from ENCODE-DCC/html5lib 4250 Lock html5lib version 19 July 2016, 16:24:05 UTC
26f8279 Add pennant images 19 July 2016, 15:07:37 UTC
9bb20fe Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into html5lib 18 July 2016, 22:50:41 UTC
4726d1c Merge pull request #1437 from ENCODE-DCC/4216-excluding-dream 4216 excluding dream 18 July 2016, 16:59:37 UTC
de0c015 Update to setuptools 18.5 Also correct xcode-select line. 17 July 2016, 04:30:40 UTC
641091a Try versions.cfg update for html5lib 17 July 2016, 03:31:36 UTC
5984186 Try different html5lib install 16 July 2016, 17:06:55 UTC
8663838 Try install html5lib 1.0b8 16 July 2016, 16:55:22 UTC
d520f72 Update travis.yml 16 July 2016, 06:02:08 UTC
c362254 Update setuptools version 16 July 2016, 06:00:22 UTC
52e1630 adding internal_tags to concrete classes 15 July 2016, 18:15:43 UTC
75c9d6e Merge branch 'master' into 4216-excluding-dream 15 July 2016, 18:00:42 UTC
879415f Merge pull request #1435 from ENCODE-DCC/4216-excluding-dream 4216 excluding dream 14 July 2016, 18:06:13 UTC
ec3cfc2 Merge pull request #1434 from ENCODE-DCC/4270-butlr-files Update to take btr files 14 July 2016, 18:05:57 UTC
3897c2e Merge branch 'master' of https://github.com/ENCODE-DCC/encoded into 4216-excluding-dream 14 July 2016, 01:49:15 UTC
22413d9 Change tags to internal_tags Also name change on graphic file because of enum change in internal_tags for entex. 14 July 2016, 01:49:06 UTC
5117ce1 Merge pull request #1433 from ENCODE-DCC/4263-bdsc-dbxref Add linkout for BDSC dbxrefs 14 July 2016, 01:00:49 UTC
56432bd Update to take btr files 13 July 2016, 22:54:05 UTC
57731f0 renamed cues into internal_tags 13 July 2016, 22:46:15 UTC
0f9b420 Add linkout for BDSC dbxrefs 13 July 2016, 22:42:46 UTC
4871e5b Replace encodeURIComponent Now use one defined in globals.js that calls the original encodeURIComponent and in addition encodes parentheses. 13 July 2016, 15:43:08 UTC
a8ccfab changes GTEx into ENTEx in insert 12 July 2016, 20:10:43 UTC
c735e01 fixed inserts, and audits and test to have 'cues' instead of 'tags' 12 July 2016, 19:14:54 UTC
34c5d99 Merge branch 'master' into 4216-excluding-dream 12 July 2016, 19:11:22 UTC
fdc1551 Merge pull request #1432 from ENCODE-DCC/4159-fileindexer-status 4159 fileindexer status 12 July 2016, 17:36:10 UTC
740ce42 Merge pull request #1431 from ENCODE-DCC/4252-tech-reps 4252 tech reps 12 July 2016, 15:31:26 UTC
7c3d4e7 Merge pull request #1430 from ENCODE-DCC/4200-fix fixed the derived_from audit 12 July 2016, 15:30:30 UTC
91f8040 Merge pull request #1429 from ENCODE-DCC/4194-fix 4194 fix 12 July 2016, 15:30:06 UTC
7f0fb52 changed tags to cues boosted the cues in dataset, bisample and donor 12 July 2016, 00:17:52 UTC
d2fa403 Merge branch 'master' into 4216-excluding-dream 12 July 2016, 00:11:50 UTC
7fa32b5 Merge branch 'master' into 4252-tech-reps 12 July 2016, 00:02:37 UTC
14eeecb fixed the derived_from audit 11 July 2016, 19:06:51 UTC
5f2cbf8 Merge branch 'master' into 4194-fix 11 July 2016, 18:39:58 UTC
5adc255 Merge pull request #1428 from ENCODE-DCC/4205-travis-for-slack 4205 travis for slack 09 July 2016, 18:55:24 UTC
04f5d6b Merge pull request #1425 from ENCODE-DCC/4257-biosample-audits 4257 biosample audits 09 July 2016, 18:54:25 UTC
ec63beb removing extra spaces after links to objects in audit messages generated by Forrest 08 July 2016, 23:04:30 UTC
155d830 forcing the tags in datasets/biosamples/donors to be unique, preventing addition of the same tag multiple times changing the EN-Tex tag to be GTEx 08 July 2016, 22:53:25 UTC
5eee0aa Merge branch 'master' into 4216-excluding-dream 08 July 2016, 22:43:03 UTC
129bc66 Merge branch 'master' into 4252-tech-reps 08 July 2016, 20:52:31 UTC
0c7628a added missing update step of file from 7 to 8 08 July 2016, 20:52:29 UTC
d425faf Merge branch '4205-travis-for-slack' of https://github.com/ENCODE-DCC/encoded into 4205-travis-for-slack correcting conflicting issues for merge 08 July 2016, 20:13:57 UTC
48d0a91 re-edited yml file for theproper key 08 July 2016, 20:13:32 UTC
0f66441 fixing merge 08 July 2016, 20:13:32 UTC
a43ae50 fixing merge 08 July 2016, 20:13:32 UTC
3aa2a2e merging issues 08 July 2016, 20:13:32 UTC
back to top