Permalink
Browse files

updated phono

  • Loading branch information...
chrismatthieu committed Nov 22, 2011
1 parent 4dd7987 commit 0f976390d7b7cc4a916236e7dfa19b6d2128b537
Showing with 1,364 additions and 363 deletions.
  1. BIN .DS_Store
  2. +6 −20 Gemfile
  3. +81 −89 Gemfile.lock
  4. +1 −1 Rakefile
  5. BIN app/.DS_Store
  6. BIN app/assets/.DS_Store
  7. BIN app/assets/images/7593172.tmp
  8. BIN app/assets/images/7606867.tmp
  9. BIN app/assets/images/call-icon.png
  10. BIN app/assets/images/chat-icon.png
  11. BIN app/assets/images/checkbox_no.png
  12. BIN app/assets/images/checkbox_yes.png
  13. BIN app/assets/images/close-btn.png
  14. BIN app/assets/images/coolphone.gif
  15. BIN app/assets/images/dial_icon.png
  16. BIN app/assets/images/hangup-icon-small.png
  17. BIN app/assets/images/hangup-icon.png
  18. BIN app/assets/images/hangup_icon.png
  19. BIN app/assets/images/headset-icon.png
  20. BIN app/assets/images/pagetop.gif
  21. BIN app/assets/images/phone-call-up-blu.png
  22. BIN app/assets/images/phone-digit-up-blu.png
  23. BIN app/assets/images/phone-endcall-up-blu.png
  24. BIN app/assets/images/phone-icon-small.png
  25. BIN app/assets/images/phone-talk-up-blu.png
  26. BIN app/assets/images/phone_icon.gif
  27. BIN app/assets/images/phone_icon_bw.gif
  28. BIN app/assets/images/redbox_spinner.gif
  29. BIN app/assets/images/remove-user.png
  30. BIN app/assets/images/spaz-icon-alpha.png
  31. BIN app/assets/images/spaz-icon-alpha_16.png
  32. BIN app/assets/images/spaz-icon-alpha_32.png
  33. BIN app/assets/images/spaz-icon-alpha_48.png
  34. BIN app/assets/images/status-phone.png
  35. BIN app/assets/images/tab-icon-phone.png
  36. BIN app/assets/images/telephonetextlogo.png
  37. BIN app/assets/images/twelephone.png
  38. BIN app/assets/images/twelephone4blacklogo.png
  39. BIN app/assets/images/voxeo-icon.png
  40. BIN app/assets/images/webphone.jpg
  41. +3 −0 app/assets/javascripts/api.js.coffee
  42. +0 −5 app/assets/javascripts/application.js
  43. +235 −0 app/assets/javascripts/callme.js.erb
  44. +3 −0 app/assets/stylesheets/api.css.scss
  45. +25 −13 app/assets/stylesheets/application.css
  46. +420 −0 app/assets/stylesheets/telephone.css.scss
  47. +21 −0 app/controllers/api_controller.rb
  48. +18 −8 app/controllers/sessions_controller.rb
  49. +49 −0 app/controllers/static_controller.rb
  50. +13 −34 app/controllers/users_controller.rb
  51. +2 −0 app/helpers/api_helper.rb
  52. +2 −2 app/mailers/notifier.rb
  53. +0 −3 app/models/user.rb
  54. +1 −0 app/views/api/address.json.erb
  55. +50 −39 app/views/layouts/application.html.erb
  56. +0 −4 app/views/sessions/new.html.erb
  57. +1 −4 app/views/static/about.html.erb
  58. +4 −23 app/views/static/index.html.erb
  59. +316 −0 app/views/static/telephone.html.erb
  60. +1 −1 app/views/users/_form.html.erb
  61. +1 −1 app/views/users/_profile.html.erb
  62. +1 −1 app/views/users/allfeed.html.erb
  63. +1 −1 app/views/users/edit.html.erb
  64. +0 −3 app/views/users/new.html.erb
  65. +48 −45 app/views/users/show.html.erb
  66. +1 −1 config.ru
  67. +1 −1 config/application.rb
  68. +3 −3 config/database.yml
  69. +1 −1 config/environment.rb
  70. +1 −1 config/environments/development.rb
  71. +1 −1 config/environments/production.rb
  72. +1 −1 config/environments/test.rb
  73. +1 −1 config/initializers/secret_token.rb
  74. +2 −2 config/initializers/session_store.rb
  75. +1 −1 config/initializers/wrap_parameters.rb
  76. +10 −27 config/routes.rb
  77. BIN db/.DS_Store
  78. BIN db/migrate/.DS_Store
  79. +6 −0 db/migrate/20111025010503_add_sip_to_users.rb
  80. +5 −0 db/migrate/20111028035341_add_background_to_users.rb
  81. +8 −0 db/migrate/20111028042653_add_desc_to_users.rb
  82. +8 −26 db/schema.rb
  83. BIN public/favicon.ico
  84. +7 −0 test/functional/api_controller_test.rb
  85. +4 −0 test/unit/helpers/api_helper_test.rb
View
BIN .DS_Store
Binary file not shown.
View
26 Gemfile
@@ -1,18 +1,13 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.2'
-gem 'omniauth'
-gem 'twitter'
+gem 'omniauth', '~> 0.3.2'
+gem 'twitter', '1.7.2'
gem "will_paginate"
gem 'gravatar_image_tag', '1.0.0.pre2'
-
-gem 'on_the_spot_in_tree', :git=>'https://github.com/ciscoriordan/on_the_spot_in_tree'
-
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'bcrypt-ruby'
group :deployment do
gem 'mysql2'
@@ -26,22 +21,13 @@ end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', " ~> 3.1.0"
- gem 'coffee-rails', "~> 3.1.0"
+ gem 'sass-rails', " ~> 3.1.2"
+ gem 'coffee-rails', "~> 3.1.1"
gem 'uglifier'
end
gem 'jquery-rails'
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
group :test do
# Pretty printed test output
gem 'turn', :require => false
View
@@ -1,46 +1,38 @@
-GIT
- remote: https://github.com/ciscoriordan/on_the_spot_in_tree
- revision: 244be9a9f8bd835fe57552b0149a93d29633797f
- specs:
- on_the_spot_in_tree (0.0.98)
- json_pure (>= 1.4.6)
-
GEM
remote: http://rubygems.org/
specs:
XMLCanonicalizer (1.0.1)
log4r (>= 1.0.4)
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.2)
+ actionpack (= 3.1.2)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.1.0)
+ activemodel (3.1.2)
+ activesupport (= 3.1.2)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
+ activesupport (3.1.2)
multi_json (~> 1.0)
addressable (2.2.6)
- ansi (1.3.0)
+ ansi (1.4.1)
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
@@ -50,82 +42,82 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
+ coffee-script-source (1.1.3)
erubis (2.7.0)
execjs (1.2.9)
multi_json (~> 1.0)
- faraday (0.7.4)
+ faraday (0.7.5)
addressable (~> 2.2.6)
- multipart-post (~> 1.1.0)
+ multipart-post (~> 1.1.3)
rack (< 2, >= 1.1.0)
faraday_middleware (0.7.0)
faraday (~> 0.7.3)
gravatar_image_tag (1.0.0.pre2)
hashie (1.1.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.14)
+ jquery-rails (1.0.18)
railties (~> 3.0)
thor (~> 0.14)
- json_pure (1.6.1)
+ json (1.6.1)
log4r (1.1.9)
- macaddr (1.4.0)
- systemu (~> 2.2.0)
+ macaddr (1.5.0)
+ systemu (>= 2.4.0)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
+ mime-types (1.17.2)
multi_json (1.0.3)
- multi_xml (0.4.0)
+ multi_xml (0.4.1)
multipart-post (1.1.3)
- mysql2 (0.3.7)
+ mysql2 (0.3.10)
net-ldap (0.2.2)
nokogiri (1.5.0)
- oa-basic (0.3.0)
- oa-core (= 0.3.0)
+ oa-basic (0.3.2)
+ oa-core (= 0.3.2)
rest-client (~> 1.6.0)
- oa-core (0.3.0)
- oa-enterprise (0.3.0)
+ oa-core (0.3.2)
+ oa-enterprise (0.3.2)
XMLCanonicalizer (~> 1.0.1)
addressable (~> 2.2.6)
net-ldap (~> 0.2.2)
nokogiri (~> 1.5.0)
- oa-core (= 0.3.0)
+ oa-core (= 0.3.2)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
uuid
- oa-more (0.3.0)
+ oa-more (0.3.2)
multi_json (~> 1.0.0)
- oa-core (= 0.3.0)
+ oa-core (= 0.3.2)
rest-client (~> 1.6.0)
- oa-oauth (0.3.0)
+ oa-oauth (0.3.2)
faraday (~> 0.7.3)
multi_json (~> 1.0.0)
multi_xml (~> 0.4.0)
- oa-core (= 0.3.0)
+ oa-core (= 0.3.2)
oauth (~> 0.4.0)
oauth2 (~> 0.5.0)
- oa-openid (0.3.0)
- oa-core (= 0.3.0)
+ oa-openid (0.3.2)
+ oa-core (= 0.3.2)
rack-openid (~> 1.3.1)
ruby-openid-apps-discovery (~> 1.2.0)
oauth (0.4.5)
- oauth2 (0.5.0)
- faraday (< 0.8, >= 0.6.1)
- multi_json (~> 1.0.0)
- omniauth (0.3.0)
- oa-basic (= 0.3.0)
- oa-core (= 0.3.0)
- oa-enterprise (= 0.3.0)
- oa-more (= 0.3.0)
- oa-oauth (= 0.3.0)
- oa-openid (= 0.3.0)
+ oauth2 (0.5.1)
+ faraday (~> 0.7.4)
+ multi_json (~> 1.0.3)
+ omniauth (0.3.2)
+ oa-basic (= 0.3.2)
+ oa-core (= 0.3.2)
+ oa-enterprise (= 0.3.2)
+ oa-more (= 0.3.2)
+ oa-oauth (= 0.3.2)
+ oa-openid (= 0.3.2)
pg (0.11.0)
- polyglot (0.3.2)
+ polyglot (0.3.3)
pyu-ruby-sasl (0.0.3.3)
- rack (1.3.3)
- rack-cache (1.0.3)
+ rack (1.3.5)
+ rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
@@ -136,78 +128,78 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.2)
+ actionmailer (= 3.1.2)
+ actionpack (= 3.1.2)
+ activerecord (= 3.1.2)
+ activeresource (= 3.1.2)
+ activesupport (= 3.1.2)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.2)
+ railties (3.1.2)
+ actionpack (= 3.1.2)
+ activesupport (= 3.1.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.9.4)
+ rake (0.9.2.2)
+ rdoc (3.11)
+ json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
- sass (3.1.7)
- sass-rails (3.1.2)
+ sass (3.1.10)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
simple_oauth (0.1.5)
- sprockets (2.0.0)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
- systemu (2.2.0)
+ systemu (2.4.1)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
+ turn (0.8.3)
+ ansi
twitter (1.7.2)
faraday (~> 0.7.4)
faraday_middleware (~> 0.7.0)
hashie (~> 1.1.0)
multi_json (~> 1.0.0)
multi_xml (~> 0.4.0)
simple_oauth (~> 0.1.5)
- tzinfo (0.3.29)
- uglifier (1.0.3)
+ tzinfo (0.3.31)
+ uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
uuid (2.3.4)
macaddr (~> 1.0)
- will_paginate (3.0.1)
+ will_paginate (3.0.2)
PLATFORMS
ruby
DEPENDENCIES
- coffee-rails (~> 3.1.0)
+ bcrypt-ruby
+ coffee-rails (~> 3.1.1)
gravatar_image_tag (= 1.0.0.pre2)
jquery-rails
mysql2
- omniauth
- on_the_spot_in_tree!
+ omniauth (~> 0.3.2)
pg
- rails (= 3.1.0)
- sass-rails (~> 3.1.0)
+ rails (= 3.1.2)
+ sass-rails (~> 3.1.2)
turn
- twitter
+ twitter (= 1.7.2)
uglifier
will_paginate
View
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
-Maywehelp::Application.load_tasks
+Twlephono::Application.load_tasks
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -6,8 +6,3 @@
//
//= require jquery
//= require jquery_ujs
-//= require_tree .
-//= require jquery.treeTable
-//= require jquery.jeditable.mini
-//= require jquery.jeditable.datepicker
-//= require on_the_spot_in_tree
Oops, something went wrong.

0 comments on commit 0f97639

Please sign in to comment.