Merge pull request #391 from openeyes/release/v1.15

Release/v1.15

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -13,9 +13,12 @@ tags
 /index.php
 /nbproject/
 /protected/data/*
+/protected/media_data/*
 /protected/models/ElementExample.php
 /protected/models/elements/ElementExample.php
-/protected/modules/*
+/protected/modules/sample
+/protected/modules/eyedraw
+/protected/modules/PASAPI
 /protected/runtime/
 /protected/tests/report/
 /protected/tests/test_results/
@@ -29,8 +32,8 @@ tags
 /protected/vendors
 *zip
 vendor
-/.sass-cache
-/node_modules
+.sass-cache
+node_modules
 /docs/templates/styleguide/public/css
 /docs/templates/styleguide/public/img
 /docs/public/styleguide/
@@ -43,7 +46,7 @@ vendor
 /assets/
 
 # Include core modules
-!/protected/modules/OphCiExamination/  
+!/protected/modules/OphCiExamination/
 !/protected/modules/OphCiPhasing/
 !/protected/modules/OphCoCorrespondence/
 !/protected/modules/OphCoTherapyapplication/
@@ -87,5 +90,3 @@ bin/phploc
 bin/phpmd
 bin/validate-json
 bin/yiic
-
-

bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "OpenEyes",
+  "name": "openeyes",
   "version": "0.1.7",
   "private": "true",
   "ignore": [
@@ -17,8 +17,11 @@
     "eventemitter2": "~0.4.13",
     "font-awesome": "~4.3.0",
     "chosen": "~1.4.2",
-    "material-design-lite": "~1.0",
-    "highcharts": "~4.2"
+    "material-design-lite": "~1.1",
+    "highcharts": "~4.2",
+    "jt.timepicker": "jquery-timepicker-jt#^1.11.1",
+    "rrule": "~2.1.0",
+    "jquery.tagsinput": "~1.3.6"
   },
   "devDependencies": {
     "google-code-prettify": "~1.0.0",

composer.json

@@ -3,7 +3,8 @@
   "description": "Electronic Patient Record system for use in Ophthalmology clinics",
   "minimum-stability": "dev",
   "require": {
-    "yiisoft/yii": "1.1.14"
+    "yiisoft/yii": "1.1.14",
+    "rlanvin/php-rrule": "1.*"
   },
   "require-dev": {
     "behat/behat": "~2",