https://github.com/OpenTreeOfLife/opentree

sort by:
Revision Author Date Message Commit Date
24220e2 Enable reference-select behavior 21 March 2023, 17:48:30 UTC
44afadf Load study list AFTER tab is properly loaded Otherwise we have no reliable test for the Analyses tab 21 March 2023, 17:24:52 UTC
2cea0f0 Init lookup form AFTER reaching new tab 21 March 2023, 16:39:56 UTC
7e5c9d8 Load study list (for lookup) on page load 21 March 2023, 16:26:06 UTC
b8d9e5a Generalize form init and action selectors 21 March 2023, 16:19:01 UTC
d05fbf3 Wrap optional UI in hidden DIV 21 March 2023, 03:24:07 UTC
2530f42 Show basic feedback on incoming tree URL 14 March 2023, 17:59:33 UTC
fc04be9 Parse incoming URL to get study+tree ids 14 March 2023, 17:19:57 UTC
dfce484 Mock up conflict info in case of errors 14 March 2023, 17:03:11 UTC
e529a5a Revert "Remove call w/o conflict details" This reverts commit 0a8706b92088df8ff24d02086d9cc731a1825325. 14 March 2023, 16:58:09 UTC
0a8706b Remove call w/o conflict details 14 March 2023, 16:52:22 UTC
e993c36 Working through alternative cases... 14 March 2023, 16:45:35 UTC
81f8380 Isolate UI refresh for incoming URLs? 14 March 2023, 16:33:24 UTC
d84fd21 Update study+tree selectors even if conflict fails 14 March 2023, 15:33:48 UTC
3ed0399 Cosmetic tweaks; prep for incoming URL 14 March 2023, 15:19:21 UTC
652a00a Use '@' instead of '#' (else History breaks) This is a slightly confusing hack. Suffice to say that the browser's History (session history) ignores URL fragments signified by '#', so it doesn't recognize when we choose a different target tree in the same study. Encoding it as '%23' in the History state doesn't seem to matter, as it's decoded when the address bar is updated. By substituting '@' in our code and URLs, we should satisfy both History and the conflict API, which expects to see '%23' 14 March 2023, 06:22:14 UTC
33fb973 More safety for dangerous # in URL 14 March 2023, 04:55:36 UTC
f741da9 Double encode non-hash octothorpe in URL? 14 March 2023, 04:26:44 UTC
3d6ef6f Encode URI for conflict info 14 March 2023, 03:52:39 UTC
283302b Gather study+tree IDs for API call (and history) 14 March 2023, 03:03:34 UTC
da60a21 Alignment fixes 14 March 2023, 00:03:33 UTC
82f6253 Refactor CSS to show link to selected study 13 March 2023, 23:31:47 UTC
11e62cc Load study list and (re)bind UI as needed 13 March 2023, 22:55:33 UTC
1c1c15a Cleanup for alt contexts 13 March 2023, 22:29:22 UTC
15004ca Add results list for study+tree lookup 13 March 2023, 21:59:15 UTC
5af1a1c comment cleanup 13 March 2023, 21:48:58 UTC
5ee7dce Refactoring for multiple contexts 13 March 2023, 19:00:16 UTC
1d2e408 Remove extra GO button 13 March 2023, 16:50:23 UTC
b1d0062 Add cloned UI for study+tree lookup 07 March 2023, 18:40:42 UTC
d2c7c51 typo 07 March 2023, 18:28:20 UTC
8422934 Extra test for single-tree viewer 07 March 2023, 18:22:57 UTC
7c5372d Dynamic UI for single-tree popup 07 March 2023, 18:12:11 UTC
d65bc53 Merge branch 'master' into conflict-with-source-tree2 07 March 2023, 13:55:49 UTC
5aa3602 Merge pull request #1303 from OpenTreeOfLife/allow-reusing-taxon-names Allow reusing taxon names 28 February 2023, 19:18:31 UTC
3685a14 Improvemed warning messages 28 February 2023, 06:40:00 UTC
4a02c2d Relax our blocking of new taxa with existing names This was previously blocked, but we want to allow for this. 28 February 2023, 06:32:53 UTC
dafb269 Merge pull request #1292 from OpenTreeOfLife/2nexml-missing-bug fix of misleading error message on misconfigure 28 February 2023, 06:17:31 UTC
5b1bd31 Add study+tree ID option for tree conflict 20 February 2023, 18:56:11 UTC
bdb9edb Try to stop extra study-search results This pops up a list of matching studies, even AFTER someone has selected one. Hopefully killing the timeout immediately will fix this. 14 February 2023, 18:21:18 UTC
8ccd624 Fix study-lookup reset 14 February 2023, 17:11:23 UTC
0576509 Find container to reset study lookup 14 February 2023, 17:03:27 UTC
a5a8be7 Smarter test for collection editor 14 February 2023, 16:58:31 UTC
6b454e5 Return missing value 10 February 2023, 19:57:52 UTC
23b865b More prep for flexible tree+study lookup 30 January 2023, 23:03:54 UTC
dd1f404 Add context test for study+tree lookup UI 30 January 2023, 18:49:18 UTC
1fb1d2c Quickly determine context for tree/study search UI 20 January 2023, 18:15:10 UTC
d2f83fd Enhanced conflict UI for Analysis tab This adds choosers for study+tree (not yet enabled) on a second row. 13 January 2023, 03:19:23 UTC
0a64c04 Add source-tree option to Analysis tab UI 12 January 2023, 20:13:30 UTC
37fc875 trying python3 as exe 09 January 2023, 22:14:58 UTC
9ba3f78 fix of misleading error message on misconfigure 06 January 2023, 15:14:55 UTC
f9bace1 Merge pull request #1290 from OpenTreeOfLife/fix-taxonomy-browser Update taxonomy browser to python3 13 December 2022, 19:18:42 UTC
003484b Update to use python3 09 December 2022, 18:56:32 UTC
b84bbf9 Adding lock file for jQueryFileUpload 20 September 2022, 23:49:54 UTC
a49f5ec Attempted fixes for jQueryFileUpload 20 September 2022, 23:49:13 UTC
5e3bd4d Updated bundled JS file for TNRS 20 September 2022, 23:22:22 UTC
78744db Fix npm engine requirements in package.json 19 September 2022, 19:05:37 UTC
8008560 Restore actual fix for URL-slash bug Also adding some clarifying code when user is on the read-only View Study page. 19 September 2022, 18:55:22 UTC
a118c80 Merge remote-tracking branch 'origin/master' into fix-for-frozen-bulk-tnrs 19 September 2022, 18:48:54 UTC
871feeb Merge pull request #1279 from OpenTreeOfLife/smarter-csv-parsing Smarter CSV parsing 12 September 2022, 19:25:47 UTC
4b31034 Merge pull request #1283 from OpenTreeOfLife/fix-delete-collection-button Fix delete collection button 29 August 2022, 18:13:40 UTC
d3c6d88 Fix massive typo on Delete Collection button 19 August 2022, 19:07:17 UTC
6147111 Revert "typo" This reverts commit 99cd5329c5d6357f650db6a3eb1a29fe237e0ec7. 19 August 2022, 19:05:44 UTC
f1ad596 typo 19 August 2022, 19:05:05 UTC
036a822 Merge pull request #1282 from OpenTreeOfLife/data-license data license info 12 August 2022, 22:04:27 UTC
cc66d5e Adjusted data-rights language based on feedback 09 August 2022, 23:46:59 UTC
bd9d537 data license info 07 July 2022, 19:12:32 UTC
0414157 Fix for frozen bulk-TNRS w/o trailing slash Fixes a user-reported bug. There's no Github issue for this, but I believe there's a discussion on Gitter or in our ot-dev meeting notes. 29 June 2022, 00:12:59 UTC
a5ff6c7 Remove chatter; try to support CSV delimiter ', ' 20 April 2022, 04:13:25 UTC
27b955d pinning 20 April 2022, 00:10:09 UTC
c6ec328 Merge pull request #1280 from OpenTreeOfLife/pinned-jwcrypto-v pinning 20 April 2022, 00:09:14 UTC
83f5430 pinning 19 April 2022, 18:55:40 UTC
a3f24a7 Remove console chatter 19 April 2022, 16:13:01 UTC
2005144 Show errors if parsing failed/aborted If some of the nameset was OK, we just send these details to the JS console. If parsing actually fails/aborts, we show all the gory details in the footer so a savvy contributor can try to fix their own data. 19 April 2022, 16:00:16 UTC
25d0c15 Update TNRS bundle file 19 April 2022, 07:07:15 UTC
f1bf5f5 typo 19 April 2022, 07:06:53 UTC
d43c50e Use Papa Parse to parse CSV and TSV names 19 April 2022, 06:18:18 UTC
37958b3 Update TNRS bundle with security + papaparse 19 April 2022, 03:56:06 UTC
81e2325 Audit/fix all Node vulnerablilities in TNRS 19 April 2022, 03:52:01 UTC
44417be Install papaparse via NPM 19 April 2022, 03:50:34 UTC
1a3b8f8 Note to add explicit test for Windows line endings 19 April 2022, 03:40:06 UTC
a713502 Tweak README to use relative paths 29 November 2021, 16:30:10 UTC
c421ebe Updating Node dependencies to fix vulnerabilities. NB - While the master branch had an up-to-date package.json file, we also need to update the resulting bundle! 17 November 2021, 17:24:11 UTC
b2f56c7 Merge pull request #1273 from OpenTreeOfLife/dependabot/npm_and_yarn/curator/static/js/tnrs/jszip-3.7.0 Bump jszip from 3.1.3 to 3.7.0 in /curator/static/js/tnrs 27 October 2021, 18:30:20 UTC
f1cdb44 Bump jszip from 3.1.3 to 3.7.0 in /curator/static/js/tnrs Bumps [jszip](https://github.com/Stuk/jszip) from 3.1.3 to 3.7.0. - [Release notes](https://github.com/Stuk/jszip/releases) - [Changelog](https://github.com/Stuk/jszip/blob/master/CHANGES.md) - [Commits](https://github.com/Stuk/jszip/compare/v3.1.3...v3.7.0) --- updated-dependencies: - dependency-name: jszip dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> 27 October 2021, 18:28:46 UTC
da203d6 Merge pull request #1257 from OpenTreeOfLife/dependabot/npm_and_yarn/curator/static/js/tnrs/elliptic-6.5.4 Bump elliptic from 6.5.3 to 6.5.4 in /curator/static/js/tnrs 27 October 2021, 18:28:19 UTC
fda58d4 Merge pull request #1270 from OpenTreeOfLife/dependabot/npm_and_yarn/curator/static/js/tnrs/path-parse-1.0.7 Bump path-parse from 1.0.6 to 1.0.7 in /curator/static/js/tnrs 27 October 2021, 18:26:32 UTC
1cd8c41 Bump path-parse from 1.0.6 to 1.0.7 in /curator/static/js/tnrs Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> 11 August 2021, 01:08:58 UTC
d2789fa Merge pull request #1267 from OpenTreeOfLife/synth13.4 Merging after review and test (parse as JSON) of the latest stats files. 22 June 2021, 03:12:54 UTC
9a42c58 new stats 18 June 2021, 20:55:59 UTC
87bbc48 Merge pull request #1262 from OpenTreeOfLife/otu-mapping-fixes OTU mapping fixes 17 May 2021, 17:34:06 UTC
d66c703 Merge branch 'auto-accept-exact-matches-and-synonyms' 13 May 2021, 16:19:33 UTC
e6df0d6 Merge pull request #1263 from OpenTreeOfLife/import-tnrs-nameset-in-curation Import TNRS nameset in curation 13 May 2021, 15:19:53 UTC
603acdc Clarify callable options for bulk-TNRS mapping 12 May 2021, 19:54:15 UTC
4e05f28 Adapt auto-acceptance for bulk TNRS 12 May 2021, 19:47:06 UTC
06ac1f1 Add auto-accept to bulk-TNRS nameset model 12 May 2021, 19:42:11 UTC
40d0104 Fix binding of auto-accept checkbox 12 May 2021, 19:27:45 UTC
4207407 typo 12 May 2021, 19:18:10 UTC
f2028b8 Add auto-accept mapping hint to existing studies. 12 May 2021, 19:12:44 UTC
479e0be Allow auto-accept of exact taxon name or synonym If this works properly in the OTU Mapping tab of the study curator, adapt these changes for use in the bulk TNRS tool. 12 May 2021, 18:27:12 UTC
586da0a Cleanup of shared nameset popup 12 May 2021, 01:39:34 UTC
back to top