Merge

.gitignore

@@ -10,7 +10,6 @@ __pycache__/
 env/
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/
@@ -76,3 +75,5 @@ db.*
 # Accounts DB
 *.sqlite3
 
+# venv
+py3/**

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "2.7"
+  - "3.6"
 sudo: false
 services:
   - mongodb
@@ -11,17 +11,27 @@ addons:
     packages:
     - mongodb-org-server
     - mongodb-org-shell
+    - google-chrome-stable
+    - apache2-dev
 # command to install dependencies
 install:
-  - pip install -r requirements.txt
-  - pip install git+https://github.com/AymRod/pyoidc
-  - pip install git+http://github.com/django-nonrel/[email protected]
-  - pip install git+http://github.com/django-nonrel/django-dbindexer@master
-  - pip install git+http://github.com/django-nonrel/djangotoolbox@master
-  - pip install git+https://github.com/django-nonrel/mongodb-engine
+  - pip install -r b2note_api/requirements.txt
+  - npm install aurelia-cli -g
 # command to run tests
 before_script:
   - sleep 15
-  - mongo test_database --eval 'db.createUser({"user":"tester","pwd":"abc123", roles:["readWrite"]});'
+  - echo preparing
+  - mongo ${MONGODB_NAME} --eval 'db.createUser({"user":"'${MONGODB_USR}'","pwd":"'${MONGODB_PWD}'", roles:["readWrite"]});'
+  - cd b2note_app
+  - npm install
+  - cd ..
 script:
-  - python manage.py test b2note_app
+  - echo Backend API unit tests
+  - cd b2note_api
+  - python -m unittest
+  - echo Frontend APP UI unit tests
+  - cd ..
+  - cd b2note_app
+  - au test
+  - echo Frontend APP UI e2e tests
+  - au run & sleep 10; au teste2e

LICENSE.txt

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2017 
+Copyright (c) 2019 Tomas Kulhanek
+Copyright (c) 2017 e-Science Data Factory
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,4 @@
-B2NOTE
-======
+# B2NOTE
 
 A [EUDAT](https://www.eudat.eu) service for creating, storing and managing annotations about online resources.
 
@@ -17,16 +16,18 @@ Master | [![Build Status](https://travis-ci.org/EUDAT-B2NOTE/b2note.svg?branch=m
 Development | [![Build Status](https://travis-ci.org/EUDAT-B2NOTE/b2note.svg?branch=development)](https://travis-ci.org/EUDAT-B2NOTE/b2note)
 
 
-##Contributors
+## Contributors
+
 
  Name  |  Affiliation | Contact
 -------|-------|-------
-Dr. Yann Le Franc   | e-Science Data Factory | [email protected]
-Dr. Antoine Brémaud | e-Science Data Factory | [[email protected]](mailto:[email protected])
-Mr. Pablo Ródenas Barquero | Barcelona Supercomputing Center | [email protected]
+Dr. Yann Le Franc   | e-Science Data Factory | ylefranc at esciencefactory.com
+Dr. Antoine Brémaud | e-Science Data Factory | abremaud at esciencefactory.com
+Mr. Pablo Ródenas Barquero | Barcelona Supercomputing Center | pablo.rodenas at bsc.es
+Dr. Tomas Kulhanek | e-Science Data Factory | tkulhanek at esciencefactory.com
 
 
-##Instructions for contributing
+## Instructions for contributing
 
 Please follow along guidelines outlined at:
 
@@ -47,7 +48,7 @@ In short:
     1. May require preemptive alignment to target branch latest code.
 
 
-##Copyright
+## Copyright
 
 Copyright © e-Science Data Factory, 2015-2016