Merge pull request #145 from privly/develop

Release 0.5.1
privly · Jan 6, 2016 · 093e79d · 093e79d
2 parents 0af412b + d75efd3
commit 093e79d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ before_install:
 - git clone https://github.com/privly/privly-web.git # clone the webserver
 language: ruby
 rvm:
-- 1.9.3
+- 2.2.4
 env:
   global:
   - DB=mysql
@@ -26,6 +26,8 @@ before_script:
 - rake db:schema:load #Loads the Scheme
 - rake db:seed #Seeds the DB
 - "bundle exec rails server -p 3000 &"
-- cd ../privly-applications/test/selenium/
+- cd ../privly-applications/test/
+- bundle install #Installs gems required for selenium testing
+- cd selenium
 addons:
   sauce_connect: true
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Privly",
   "short_name": "Privly",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "The Official Privly extension for Google Chrome.",
   "author": "The Privly Foundation",
   "manifest_version": 2,

diff --git a/privly-applications b/privly-applications
+35 −1		Login/test/new.js
+100 −43		Message/show.html
+1 −1		Pages/ChromeOptions.html.subtemplate
+30 −33		Pages/js/options.js
+58 −0		Pages/js/tests/OptionsSpec.js
+100 −43		PlainPost/show.html
+6 −4		README.md
+9 −1		build.py
+2 −0		development.md
+147 −8		shared/css/top/top.css
+18 −2		shared/javascripts/network_service.js
+26 −25		shared/javascripts/tooltip.js
+44 −18		shared/javascripts/viewAdapters/show.js
+80 −0		shared/test/context_messenger.js
+61 −7		shared/test/tooltip.js
+3 −3		templates/partials/navigation.html.subtemplate
+140 −100		templates/show.html.template
+4 −3		test/Gemfile
+16 −15		test/Gemfile.lock
+1 −1		test/karma.conf-ci.js
+35 −14		test/selenium/configurations.rb
+4 −4		test/selenium/run_all.rb
+1 −1		test/selenium/specs/tc_extension_options.rb
+3 −3		test/selenium/specs/tc_history.rb
+2 −2		test/selenium/specs/tc_message.rb
+5 −5		test/selenium/specs/tc_new.rb
+3 −3		test/selenium/specs/tc_posting_process.rb
+3 −3		test/selenium/specs/tc_privly_button.rb
+15 −8		test/selenium/specs/tc_seamless_posting_forward.rb
+1 −1		test/selenium/specs/tc_show.rb
+3 −1		test/selenium/specs/ts_all_specs.rb
+0 −33		test/selenium/tc_chrome_helper.rb