Merge branch 'release-0.14.0'

.gitignore

@@ -37,10 +37,6 @@ external_modules.log
 # ignore test coverage files
 /coverage/
 
-# ignore vendor binary files
-/vendor/bin/*
-/vendor
-
 # ignore generated api documentation
 /doc
 /.yardoc/

CHANGELOG.md

@@ -1,13 +1,54 @@
 # Changelog
 
+## [Release 0.14.0](https://github.com/QutBioacoustics/baw-server/releases/tag/0.14.0) (2015-03-22)
+
+ - 2015-03-22
+    - Removed audio event library endpoint [#128](https://github.com/QutBioacoustics/baw-server/issues/128)
+    - Added ability to filter by calculated fields
+
+ - 2015-03-17
+    - Enhancement: filter api now supports filtering by neighbouring models [#176](https://github.com/QutBioacoustics/baw-server/issues/176)
+
+ - 2015-03-16
+    - Regression fixed: paging link format [#169](https://github.com/QutBioacoustics/baw-server/issues/169)
+    - Regression fixed: Projections options now respected [#170](https://github.com/QutBioacoustics/baw-server/issues/170)
+
+ - 2015-03-13
+    - Small UI bug fixes
+    - Added links to play audio and visualise projects and sites [#164](https://github.com/QutBioacoustics/baw-server/issues/164) [#172](https://github.com/QutBioacoustics/baw-server/issues/172)
+    - Changed filter default items per page to 25 [#171](https://github.com/QutBioacoustics/baw-server/issues/171)
+    - added ability to opt out of filter paging [#160](https://github.com/QutBioacoustics/baw-server/issues/160)
+    - Made it more obvious that confirming an account involves checking email [#149](https://github.com/QutBioacoustics/baw-server/issues/149)
+
+ - 2015-03-09
+    - More changes to project and site pages [#164](https://github.com/QutBioacoustics/baw-server/issues/164)
+
+ - 2015-03-08
+    - Improved site lat/long obfuscation calculation [#91](https://github.com/QutBioacoustics/baw-server/issues/91)
+    - Refactored permission code to prepare for project logged in and anon permissions (this was a quite large and sweeping change) [#99](https://github.com/QutBioacoustics/baw-server/issues/99)
+
+ - 2015-03-07
+    - Added last_seen_at column for users [#167](https://github.com/QutBioacoustics/baw-server/issues/167)
+    - Added ability to disable paging for filters and enforced max item count [#160](https://github.com/QutBioacoustics/baw-server/issues/160)
+    - Added foreign keys [#151](https://github.com/QutBioacoustics/baw-server/issues/151)
+    - Added Timezone setting for sites and users [#116](https://github.com/QutBioacoustics/baw-server/issues/116)
+    - Added links to visualise page [#155](https://github.com/QutBioacoustics/baw-server/issues/155)
+    - Modify site show page to remove audio recording list [#164](https://github.com/QutBioacoustics/baw-server/issues/164)
+
 ## [Release 0.13.1](https://github.com/QutBioacoustics/baw-server/releases/tag/0.13.1) (2015-03-02)
 
+ - 2015-03-06
+    - Fix: ignored ffmpeg warning for channel layout
+    - Fix: case insensitive compare when chaning audio event tags
+    - Added admin-only page to fix orphaned audio recordings [#153](https://github.com/QutBioacoustics/baw-server/issues/153)
+
+
  - 2015-02-28
-   - Fix: site paging
-   - Fix: Admin changing user's email
-   - Enhancement: additional user info for Admin
-   - Fix: error accessing sites/filter when logged in as Admin
-   - Enhancement: added tests to ensure numbers in json are not quoted
+    - Fix: site paging
+    - Fix: Admin changing user's email [#158](https://github.com/QutBioacoustics/baw-server/issues/158)
+    - Enhancement: additional user info for Admin [#159](https://github.com/QutBioacoustics/baw-server/issues/159)
+    - Fix: error accessing sites/filter when logged in as Admin
+    - Enhancement: added tests to ensure numbers in json are not quoted [#152](https://github.com/QutBioacoustics/baw-server/issues/152)
 
 ## [Release 0.13.0](https://github.com/QutBioacoustics/baw-server/releases/tag/0.13.0) (2015-02-20)
 
@@ -18,15 +59,15 @@
     - added rake task to export audio recordings to csv
 
  - 2015-01-24
-    - Fixed annotation library not filtering using query string parameters.
+    - Fixed annotation library not filtering using query string parameters [#148](https://github.com/QutBioacoustics/baw-server/issues/148)
 
  - 2015-01-18
     - delete actions improved, archive headers added and fixed
     - standardised controller authorisation
     - added audio event filter action
 
  - 2015-01-06
-    - Fixed CORS responses.
+    - Fixed CORS responses [#140](https://github.com/QutBioacoustics/baw-server/issues/140)
     - Added ability to poll Resque for job completion rather than polling filesystem.
     - Bug fix: added more strict validation and more tests for 'in' filter.
 

Gemfile

@@ -60,6 +60,7 @@ gem 'gmaps4rails', '< 2'
 # git grep --full-name --name-only '.fa-play' $(git rev-list --all) > font-awesome-find.txt
 
 # Don't update this, as site still uses bootstrap v2. Need to update this when bootstrap is updated.
+# https://github.com/seyhunak/twitter-bootstrap-rails/tree/38476dbd7f9a99179388bffb101826d844029949
 gem 'twitter-bootstrap-rails', git: 'https://github.com/seyhunak/twitter-bootstrap-rails.git', branch: :master, ref: '38476dbd7f'
 
 gem 'bootstrap-timepicker-rails', '~> 0.1.3'
@@ -69,6 +70,10 @@ gem 'will_paginate', '~> 3.0.7'
 gem 'dotiw', git: 'https://github.com/radar/dotiw.git', branch: :master, ref: '89d936adc6'
 gem 'recaptcha', '~> 0.3.6',  require: 'recaptcha/rails'
 
+# for proper timezone support
+gem 'tzinfo', '~> 1.2.2'
+gem 'tzinfo-data', '~> 1.2015.1'
+
 # USERS & PERMISSIONS
 # -------------------------------------
 # https://github.com/plataformatec/devise/blob/master/CHANGELOG.md
@@ -110,7 +115,7 @@ require 'rbconfig'
 # MONITORING
 # -------------------------------------
 gem 'exception_notification', '~> 4.0.1'
-gem 'newrelic_rpm', '~> 3.10.0'
+gem 'newrelic_rpm', '~> 3.11.0'
 
 # Documentation & UI
 # -------------------------------------
@@ -121,16 +126,16 @@ gem 'raddocs', '~> 0.4.0'
 # MEDIA
 # -------------------------------------
 # set to a specific commit when releasing to master branch
-gem 'baw-audio-tools', git: 'https://github.com/QutBioacoustics/baw-audio-tools.git', branch: :master, ref: '3750e2fc9a'
+gem 'baw-audio-tools', git: 'https://github.com/QutBioacoustics/baw-audio-tools.git', branch: :master, ref: '3ea03c6b65'
 gem 'rack-rewrite', '~> 1.5.1'
 
 # ASYNC JOBS
 # ------------------------------------
 gem 'resque', '~> 1.25.2'
 gem 'resque-job-stats', git: 'https://github.com/echannel/resque-job-stats.git', branch: :master, ref: '8932c036ae'
-gem 'resque-status', '~> 0.4.3'
+gem 'resque-status', '~> 0.5.0'
 # set to a specific commit when releasing to master branch
-gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: 'cac9715c73'
+gem 'baw-workers', git: 'https://github.com/QutBioacoustics/baw-workers.git', branch: :master, ref: '9b51d7a82a'
 
 # Gems restricted by environment and/or platform
 # ====================================================
@@ -155,7 +160,7 @@ group :development, :test do
   gem 'spring', '~> 1.3.0'
 
   # Run `rails console` in the browser. Read more: https://github.com/rails/web-console
-  gem 'web-console', '~> 2.0.0'
+  #gem 'web-console', '~> 2.1.1'
 
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', '~> 0.4.0'