Merge pull request #4 from korpling/develop

update

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+What is the used ANNIS version?
+
+
+What browser and operating system did you use?
+
+
+What steps will reproduce the problem?
+1.
+2.
+3.
+
+What is the expected result?
+
+
+What happens instead?
+
+
+Please provide any additional information below. Also please add a screenshot if possible.
+

.gitignore

@@ -16,3 +16,5 @@ rebel.xml
 *.classpath
 .settings/
 *.jrebel_disabled
+/.idea/
+*.iml

CHANGELOG

@@ -1,3 +1,131 @@
+Version 3.4.3
+=============
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.3+is%3Aclosed
+
+[Fixed Bugs]
+ #514 not escaped user input in REST API
+
+Version 3.4.2
+=============
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.2+is%3Aclosed
+
+[Fixed Bugs]
+ #511 Embedded visualization keeps loading forever
+ #510 Wrong color in tree visualization for child nodes
+
+Version 3.4.1
+=============
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.1+is%3Aclosed
+
+[Fixed Bugs]
+ #509 Link from embedded visualization to search UI is gone in 3.4.0
+
+Version 3.4.0
+=============
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0+is%3Aclosed
+
+[Fixed Bugs]
+ #508 "X is not a valid annotation name" error is not removed when "Search" button is clicked.
+ #506 possible problems with Apache Collections library and serialization
+ #497 Can't close match reference window while preview is loading
+ #453 Dependencies not showing in Safari Browser
+
+Version 3.4.0-rc5
+=================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-rc5+is%3Aclosed
+
+[Fixed Bugs]
+ #499 GraphML output of the Salt type is not using the most specific class/type
+
+Version 3.4.0-rc4
+=================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-rc4+is%3Aclosed
+
+[Fixed Bugs]
+ #496 speaker icon in grid does nothing when visualization is embedded
+ #495 invalid GraphML
+ #494 fails to parse tok!="..." when used in the  AQL short form
+
+Version 3.4.0-rc3
+=================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-rc3+is%3Aclosed
+
+[Fixed Bugs]
+ #493 can't set "default-base-text-segmentation" property to token
+ #491 htmlvis won't output spans which have the same annotation name and the same token span
+
+[Enhancements]
+ #492 htmlvis should support a pseudoregion that covers all token
+
+Version 3.4.0-rc2
+=================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-rc2+is%3Aclosed
+
+[Fixed Bugs]
+ #490 LegacyGraphConverter modifies original Salt graph
+
+Version 3.4.0-rc1
+=================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-rc1+is%3Aclosed
+
+[Fixed Bugs]
+ #489 query builder won't work with "tok != "value"
+ #485 Reference links for single matches fail when annotation namespace has a space character
+
+[Enhancements]
+ #488 allow to test the UI with Selenium
+ #487 re-order the physical layout of the fact tables so that columns that are more likely to be used in a (Merge) join are at the beginning
+ #486 better PostgreSQL planner estimations for "same span" operator
+
+Version 3.4.0-preview10
+=======================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-preview10+is%3Aclosed
+
+[Fixed Bugs]
+ #483 fix wrong command: start needs to be launch
+ #479 color highlighting differs in KWIC
+ #478 htmlvis: can't use only "annis:BEGIN" or "annis:END"
+ #474 BEGIN and END instructions not working in htmlvis
+ #473 frequency definition: can't select more than one
+
+[Enhancements]
+ #484 update to jquery 2.2
+ #482 Better statistics for span and annotation columns
+ #481 update to Vaadin 7.6.x
+ #475 mapping properties contain "+" instead of spaces in embedded visualizer
+
+Version 3.4.0-preview9
+======================
+
+Changelog is also available on GitHub:
+https://github.com/korpling/ANNIS/issues?q=milestone%3A3.4.0-preview9+is%3Aclosed
+
+[Enhancements]
+ #472 don't output the same frequency definition twice
+ #471 Update to Salt 3.0
+ #469 grid: allow to choose which annotations should show their namespace
+
+
 Version 3.4.0-preview8
 ======================
 

Misc/benchmark_scripts/pcc2benchmark.txt

@@ -0,0 +1,11 @@
+set clear-caches to false
+record
+corpus pcc2
+
+benchmarkName TEST
+count cat="NP" & cat="NP" & #1 >[func="AG"] #2
+count cat="NP" & node & #1 >[func="AG"] #2
+benchmarkName CS
+count cat="CS" & cat="S" & #1 > #2
+
+benchmark 20

Misc/changelog.py

@@ -4,7 +4,7 @@
 import io
 from subprocess import call
 
-milestone_id = "38"
+milestone_id = "49"
 
 import http.client