Code

Merge upstream#1

Code

Open

kleag wants to merge 97 commits intoaymara:masteraymara/brat:masterfrom nlplab:masternlplab/brat:masterCopy head branch name to clipboard

+10,386-7,872

Commits

Commits on Mar 25, 2014

• Paging configuration params

  

  Goran Topic

  committed
  87e13ee

  Copy full SHA for 87e13ee

• Discussion on #995 (paging, first iteration, buggy)

  

  Goran Topic

  committed
  f0f5da7

  Copy full SHA for f0f5da7

Commits on Mar 26, 2014

• Issue #995 (paging; rendering tentatively done)

  

  Goran Topic

  committed
  8b291f6

  Copy full SHA for 8b291f6

• Issue #995 (changed API)

  Show description for 796eea0
  

  Goran Topic

  committed
  796eea0

  Copy full SHA for 796eea0

• Issue #995 (paging; API changed back)

  

  Goran Topic

  committed
  5d76411

  Copy full SHA for 5d76411

• Issue #995 (paging; undefined & last word fixes)

  Show description for 297835b
  

  Goran Topic

  committed
  297835b

  Copy full SHA for 297835b

Commits on Apr 1, 2014

• Issue #995 (paging hopefully done)

  Show description for 4009086
  

  Goran Topic

  committed
  4009086

  Copy full SHA for 4009086

Commits on Apr 3, 2014

• Unneeded row

  

  Goran Topic

  committed
  1c1b42f

  Copy full SHA for 1c1b42f

Commits on Apr 4, 2014

• Issue #995 (paging - prevent reset on edit)

  

  Goran Topic

  committed
  8a387a1

  Copy full SHA for 8a387a1

Commits on Jul 6, 2018

• python 3; fix imports and formatting

  benman1

  committed
  a9dd31c

  Copy full SHA for a9dd31c

• fix: python3; imports

  benman1

  committed
  725b118

  Copy full SHA for 725b118

Commits on Jul 8, 2018

• fix more unicode and json; annotations work in python3!

  benman1

  committed
  32182ce

  Copy full SHA for 32182ce

• fix import order

  benman1

  committed
  0acabcb

  Copy full SHA for 0acabcb

Commits on Sep 3, 2018

• Merge branch 'paging'

  amadanmath

  committed
  a6a40a3

  Copy full SHA for a6a40a3

• Merge branch 'master' of https://github.com/benman1/brat into benman1-master

  amadanmath

  committed
  c4a08bd

  Copy full SHA for c4a08bd

• Merge branch 'benman1-master'

  amadanmath

  committed
  75b6ff3

  Copy full SHA for 75b6ff3

• Add benman1 as major contributor, remove simplejson

  amadanmath

  committed
  17a395c

  Copy full SHA for 17a395c

• Python 3 touch-ups

  amadanmath

  committed
  e3c5d4f

  Copy full SHA for e3c5d4f

Commits on Sep 7, 2018

• Fix incompatibilities with sort

  amadanmath

  committed
  3727c5f

  Copy full SHA for 3727c5f

• Implement Arcs bundle:hide

  amadanmath

  committed
  2fc8315

  Copy full SHA for 2fc8315

Commits on Oct 31, 2018

• Fix an unwanted comma

  amadanmath

  committed
  3bd0e5a

  Copy full SHA for 3bd0e5a

• Add C-H to repeat an edit

  amadanmath

  committed
  b0814e9

  Copy full SHA for b0814e9

Commits on Nov 8, 2018

• backwards compatibility

  spyysalo

  committed
  c8373cf

  Copy full SHA for c8373cf

• fix import error

  spyysalo

  committed
  38da123

  Copy full SHA for 38da123

Commits on Nov 22, 2018

• Removed several more encodes

  amadanmath

  committed
  d9f8039

  Copy full SHA for d9f8039

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  35b948d

  Copy full SHA for 35b948d

• Change normalisation search default

  amadanmath

  committed
  765337f

  Copy full SHA for 765337f

• Fill span dialog with first configured normalization

  amadanmath

  committed
  c9bb6a3

  Copy full SHA for c9bb6a3

Commits on Nov 26, 2018

• Fix an error when using Enter

  amadanmath

  committed
  15eb2f0

  Copy full SHA for 15eb2f0

• Fix a session naming bug

  amadanmath

  committed
  063fde3

  Copy full SHA for 063fde3

Commits on Nov 28, 2018

• Prevent resize breaking the display

  amadanmath

  committed
  9b05ca2

  Copy full SHA for 9b05ca2

• Recalculate popup position when norm info comes

  amadanmath

  committed
  a517b2d

  Copy full SHA for a517b2d

Commits on Nov 29, 2018

• Fix unresponsive collapser bug

  amadanmath

  committed
  cfdf628

  Copy full SHA for cfdf628

Commits on Dec 3, 2018

• Make session saving atomic

  amadanmath

  committed
  e99ce7b

  Copy full SHA for e99ce7b

Commits on Dec 4, 2018

• Fixes #1296

  amadanmath

  committed
  8de323b

  Copy full SHA for 8de323b

• Solve XML space issue bug regarding matchFocus

  amadanmath

  committed
  0876c81

  Copy full SHA for 0876c81

Commits on Dec 17, 2018

• Allow selection in case of multiple normalisations

  amadanmath

  committed
  2e1e8f5

  Copy full SHA for 2e1e8f5

• Merge branch 'multinorm'

  amadanmath

  committed
  5a022ee

  Copy full SHA for 5a022ee

Commits on Dec 19, 2018

• Fixes the bug with non-Boolean attributes

  amadanmath

  committed
  0776d0c

  Copy full SHA for 0776d0c

Commits on Dec 26, 2018

• Add support for simstring-pure

  Show description for cbe0708
  amadanmath

  committed
  cbe0708

  Copy full SHA for cbe0708

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  4675e3a

  Copy full SHA for 4675e3a

Commits on Mar 22, 2019

• Support for simstring-pure

  amadanmath

  committed
  9c34b78

  Copy full SHA for 9c34b78

• Fix Unicode bug

  amadanmath

  committed
  370b2e4

  Copy full SHA for 370b2e4

• bugfixes

  spyysalo

  committed
  731e564

  Copy full SHA for 731e564

• Merge branch 'master' of github.com:nlplab/brat

  spyysalo

  committed
  50ca6df

  Copy full SHA for 50ca6df

Commits on Apr 9, 2019

• Fix encoding problem in hash

  amadanmath

  committed
  6be2b71

  Copy full SHA for 6be2b71

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  06b286b

  Copy full SHA for 06b286b

Commits on Apr 24, 2019

• Merge branch 'master' of github.com:nlplab/brat

  

  Goran Topic

  committed
  86bc3a9

  Copy full SHA for 86bc3a9

Commits on Jun 25, 2019

• Change standalone.py to use Python3

  amadanmath

  committed
  e22866f

  Copy full SHA for e22866f

Commits on Jul 12, 2019

• Update the troubleshooting script to Python3

  amadanmath

  committed
  c411494

  Copy full SHA for c411494

Commits on Jan 20, 2020

• Fix for Python 3.8: cgi.escape moved to html.escape

  amadanmath

  committed
  7a58bbe

  Copy full SHA for 7a58bbe

Commits on Mar 31, 2020

• Simstring rework

  amadanmath

  committed
  580a45d

  Copy full SHA for 580a45d

Commits on Apr 7, 2020

• Integrate new simstring module

  amadanmath

  committed
  be68912

  Copy full SHA for be68912

Commits on Apr 10, 2020

• Make multinormalization interface work

  amadanmath

  committed
  1909339

  Copy full SHA for 1909339

Commits on Apr 13, 2020

• Fix the broken dialog sequencing

  amadanmath

  committed
  20ea1b5

  Copy full SHA for 20ea1b5

Commits on Apr 17, 2020

• Make normalization UI work

  amadanmath

  committed
  0f06504

  Copy full SHA for 0f06504

• Bugfix: simstring detection and correct span type detection

  amadanmath

  committed
  081e5f1

  Copy full SHA for 081e5f1

Commits on Apr 22, 2020

• Add normalization URLs, remove dead code

  amadanmath

  committed
  54ef420

  Copy full SHA for 54ef420

Commits on Apr 23, 2020

• Merge branch 'feature-simstringrework'

  Show description for 35fd824
  amadanmath

  committed
  35fd824

  Copy full SHA for 35fd824

Commits on Apr 24, 2020

• Fix norm_db_init

  amadanmath

  committed
  75779e6

  Copy full SHA for 75779e6

Commits on Apr 27, 2020

• Issue #1115 (support astral characters)

  amadanmath

  committed
  db78d87

  Copy full SHA for db78d87

Commits on Apr 29, 2020

• Remove debug output

  amadanmath

  committed
  94008a6

  Copy full SHA for 94008a6

• Fix offsets on span selection

  amadanmath

  committed
  7f1e280

  Copy full SHA for 7f1e280

Commits on Apr 30, 2020

• Remove redundant code

  amadanmath

  committed
  f1289ef

  Copy full SHA for f1289ef

• Stop requiring simstring

  amadanmath

  committed
  c7e87f9

  Copy full SHA for c7e87f9

Commits on May 24, 2020

• Let be used by itself

  amadanmath

  committed
  49c8a1e

  Copy full SHA for 49c8a1e

Commits on May 25, 2020

• Add convenience to

  amadanmath

  committed
  96aad08

  Copy full SHA for 96aad08

• Rename work_dir -> lock_dir

  amadanmath

  committed
  2e7552c

  Copy full SHA for 2e7552c

• Fix logic error when text is provided

  amadanmath

  committed
  106f90e

  Copy full SHA for 106f90e

• Save As; fix readonly bug

  amadanmath

  committed
  a7543fc

  Copy full SHA for a7543fc

• Add usage sample to annotation.py

  amadanmath

  committed
  3b8db66

  Copy full SHA for 3b8db66

• Rename a constant

  amadanmath

  committed
  c8d3b1b

  Copy full SHA for c8d3b1b

• Add overview of annotation classes

  amadanmath

  committed
  6de1c2a

  Copy full SHA for 6de1c2a

Commits on May 26, 2020

• Fix bug with norms of misconfigured spans

  amadanmath

  committed
  913de38

  Copy full SHA for 913de38

Commits on Jun 23, 2020

• Fix error when simstring is not set

  amadanmath

  committed
  683d31c

  Copy full SHA for 683d31c

Commits on Aug 14, 2020

• Closes #1356

  amadanmath

  committed
  9ab78dd

  Copy full SHA for 9ab78dd

• Closes #1350

  amadanmath

  committed
  660db9b

  Copy full SHA for 660db9b

• Closes #1351

  amadanmath

  committed
  0de9ea4

  Copy full SHA for 0de9ea4

Commits on Sep 9, 2020

• Merge branch 'master' of github.com:nlplab/brat

  

  Goran Topic

  committed
  eb80468

  Copy full SHA for eb80468

• Add simple bioes2standoff tool

  

  Goran Topic

  committed
  fa3cb1a

  Copy full SHA for fa3cb1a

• Make bioes2standoff more programmer-friendly

  

  Goran Topic

  committed
  44178b6

  Copy full SHA for 44178b6

Commits on Sep 23, 2020

• py3

  spyysalo

  committed
  f110f2e

  Copy full SHA for f110f2e

• Add rank info

  spyysalo

  committed
  80be116

  Copy full SHA for 80be116

Commits on Oct 8, 2020

• Support sentence comments

  amadanmath

  committed
  d8d9945

  Copy full SHA for d8d9945

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  523048b

  Copy full SHA for 523048b

• Fix style for sentence comments

  amadanmath

  committed
  550ff1b

  Copy full SHA for 550ff1b

Commits on Nov 10, 2020

• Fix UnicodeString handling in span form

  amadanmath

  committed
  268f8e5

  Copy full SHA for 268f8e5

Commits on Nov 20, 2020

• fix import for recent py3

  spyysalo

  committed
  8289525

  Copy full SHA for 8289525

Commits on Apr 7, 2021

• Fix collection download bug

  amadanmath

  committed
  694bc4c

  Copy full SHA for 694bc4c

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  1848f7f

  Copy full SHA for 1848f7f

Commits on Jun 28, 2021

• Allow annotations to be read from string

  amadanmath

  committed
  cf786c7

  Copy full SHA for cf786c7

• Fix issue with gaussian blur

  amadanmath

  committed
  26034fd

  Copy full SHA for 26034fd

• Add setting to allow anonymous editing

  amadanmath

  committed
  0060ce7

  Copy full SHA for 0060ce7

• Fix bug with anonymous edit mode

  amadanmath

  committed
  e297176

  Copy full SHA for e297176

• Fix typo

  amadanmath

  committed
  23f8ffb

  Copy full SHA for 23f8ffb

Commits on Oct 4, 2021

• Prevent a reentrancy bug

  amadanmath

  committed
  c667cd1

  Copy full SHA for c667cd1

• Merge branch 'master' of github.com:nlplab/brat

  amadanmath

  committed
  44ecd82

  Copy full SHA for 44ecd82