Merge branch 'develop'

molbiodiv · Apr 8, 2016 · 4af398c · 4af398c
2 parents e7a9fb3 + c49f3c0
commit 4af398c
Show file tree

Hide file tree

Showing 82 changed files with 6,096 additions and 389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ bower_components/
 src/webroot/css/*.map
 src/webroot/.sass-cache
 /.sass-cache
+test/php/cover/
diff --git a/README.org b/README.org
@@ -1,5 +1,13 @@
 * Fennec Web
 ** Changes
+*** 0.1.0 <2016-04-08 Fr>
+ - add version picker
+ - add support for multiple db versions
+ - add project page design
+ - add community page design
+ - clean pages
+ - add new level to interactive browse
+ - add apigen documentation for webservices
 *** 0.0.5 <2016-03-23 Mi>
  - display all traits of an organism
  - add progress bar on organism page

diff --git a/apigen.neon b/apigen.neon
@@ -0,0 +1,5 @@
+source:
+  - ./src/webservice/ajax/listing/Organisms.php
+
+destination: ./doc/webservice
+templateTheme: bootstrap
diff --git a/bower.json b/bower.json
@@ -26,6 +26,8 @@
     "plotly.js": "^1.6.3",
     "file-saver.js": "^1.20150507.2",
     "underscore": "^1.8.3",
-    "jquery-progresstimer": "^1.0.7"
+    "jquery-progresstimer": "^1.0.7",
+    "datatables": "^1.10.11",
+    "bootstrap-select": "^1.10.0"
   }
 }
diff --git a/composer.json b/composer.json
@@ -7,7 +7,8 @@
     "require-dev": {
         "phpunit/phpunit": "5.0.*",
         "phpunit/php-invoker": "*",
-        "phpunit/dbunit": ">=1.2"
+        "phpunit/dbunit": ">=1.2",
+        "apigen/apigen": ">=4.1"
     },
     "autoload": {
         "psr-4": { "": "src/webservice/",