Permalink
Browse files

Merge branch 'development'

  • Loading branch information...
2 parents f16c5a3 + 0038669 commit ff539e46eaba551c627acf4607935a8e567a8aaa @noctivityinc committed Jul 25, 2011
Showing with 3,706 additions and 1,507 deletions.
  1. +36 −4 .rvmrc
  2. +9 −0 .rvmrc.07.25.2011-11:38:23
  3. +41 −0 .rvmrc.07.25.2011-11:38:24
  4. +2 −15 Gemfile
  5. +97 −0 Gemfile.lock
  6. +243 −0 README
  7. +44 −0 app/controllers/invites_controller.rb
  8. +0 −1 app/controllers/user_sessions_controller.rb
  9. +6 −6 app/stylesheets/partials/_base.sass
  10. +9 −9 app/stylesheets/partials/_boxes.sass
  11. +306 −274 app/stylesheets/partials/_formtastic_base.sass
  12. +4 −4 app/stylesheets/partials/_skintastic.sass
  13. +24 −25 app/stylesheets/public.sass
  14. +24 −0 app/views/invites/_form.html.haml
  15. +8 −0 app/views/invites/edit.html.haml
  16. +21 −0 app/views/invites/index.html.haml
  17. +5 −0 app/views/invites/new.html.haml
  18. +24 −0 app/views/invites/show.html.haml
  19. +21 −0 app/views/layouts/_toolbar.html.haml
  20. 0 app/views/layouts/null
  21. +3 −0 app/views/postoffice/forgot_password.haml
  22. +3 −0 app/views/postoffice/share.haml
  23. 0 app/views/public/todos/null
  24. +12 −0 app/views/tag_groups/_form.html.haml
  25. +8 −0 app/views/tag_groups/edit.html.haml
  26. +15 −0 app/views/tag_groups/index.html.haml
  27. +5 −0 app/views/tag_groups/new.html.haml
  28. +15 −0 app/views/tag_groups/show.html.haml
  29. +1 −1 config/environment.rb
  30. +17 −0 db/migrate/20100416214801_create_shares.rb
  31. +0 −52 default.gems
  32. +63 −0 lib/postgres_extensions.rb
  33. +2,229 −0 public/javascripts/cached/all.js
  34. +81 −89 public/stylesheets/compiled/ie.css
  35. +81 −315 public/stylesheets/compiled/print.css
  36. +103 −127 public/stylesheets/compiled/public.css
  37. +83 −584 public/stylesheets/compiled/screen.css
  38. +62 −0 public/stylesheets/jquery.contextMenu.css
  39. +1 −1 vendor/plugins/haml/init.rb
View
40 .rvmrc
@@ -1,9 +1,41 @@
#!/usr/bin/env bash
-# .rvmrc file for tdt application
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
-if [[ "Darwin" = "$(uname)" ]] ; then
- rvm ruby-1.9.1@todo
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p180@todopia"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+ && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+ \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+ if [[ -s ".rvm/hooks/after_use" ]]
+ then
+ . ".rvm/hooks/after_use"
+ fi
else
- rvm ruby-1.9.1@todo
+ # If the environment file has not yet been created, use the RVM CLI to select.
+ if ! rvm --create "$environment_id"
+ then
+ echo "Failed to create RVM environment 'ruby-1.9.2-p180@instaback'."
+ fi
fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+# rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# .rvmrc file for tdt application
+
+if [[ "Darwin" = "$(uname)" ]] ; then
+ rvm ruby-1.9.1@todo
+else
+ rvm ruby-1.9.1@todo
+fi
View
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# This is an RVM Project .rvmrc file, used to automatically load the ruby
+# development environment upon cd'ing into the directory
+
+# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
+environment_id="ruby-1.9.2-p180@todopia"
+
+#
+# First we attempt to load the desired environment directly from the environment
+# file. This is very fast and efficient compared to running through the entire
+# CLI and selector. If you want feedback on which environment was used then
+# insert the word 'use' after --create as this triggers verbose mode.
+#
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+ && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
+then
+ \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
+
+ if [[ -s ".rvm/hooks/after_use" ]]
+ then
+ . ".rvm/hooks/after_use"
+ fi
+else
+ # If the environment file has not yet been created, use the RVM CLI to select.
+ if ! rvm --create "$environment_id"
+ then
+ echo "Failed to create RVM environment ''."
+ fi
+fi
+
+#
+# If you use an RVM gemset file to install a list of gems (*.gems), you can have
+# it be automatically loaded. Uncomment the following and adjust the filename if
+# necessary.
+#
+# filename=".gems"
+# if [[ -s "$filename" ]] ; then
+# rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
+# fi
+
View
17 Gemfile
@@ -1,21 +1,15 @@
-source 'http://rubygems.org'
-source 'http://gems.github.com'
source :gemcutter
-gem 'bundler', :require => nil
-gem 'rubygems-update', :require => nil
+gem 'rails', '2.3.11'
-gem 'rails', '2.3.8', :require => nil
-
-gem 'pg', '0.8.0'
+gem 'pg'
gem "authlogic"
gem 'haml'
gem 'compass'
gem 'acts-as-taggable-on'
gem "friendly_id", "~> 2.3"
gem 'formtastic'
-gem 'annotate-models'
gem 'hoptoad_notifier'
gem 'chronic'
gem 'whenever'
@@ -29,15 +23,8 @@ gem 'unicorn'
# Bundle the extra gems:
gem 'nokogiri'
-gem 'hpricot'
gem 'hirb'
-# Bundle gems for certain environments:
-# gem 'rspec', :group => :test
-# group :test do
-# gem 'webrat'
-# end
-
group :development do
gem 'ruby-debug19'
end
View
@@ -0,0 +1,97 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ RedCloth (4.2.7)
+ aaronh-chronic (0.3.9)
+ actionmailer (2.3.11)
+ actionpack (= 2.3.11)
+ actionpack (2.3.11)
+ activesupport (= 2.3.11)
+ rack (~> 1.1.0)
+ activerecord (2.3.11)
+ activesupport (= 2.3.11)
+ activeresource (2.3.11)
+ activesupport (= 2.3.11)
+ activesupport (2.3.11)
+ acts-as-taggable-on (2.0.6)
+ archive-tar-minitar (0.5.2)
+ authlogic (2.1.6)
+ activesupport
+ builder (3.0.0)
+ chronic (0.6.1)
+ chunky_png (1.2.0)
+ columnize (0.3.4)
+ compass (0.11.5)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ formtastic (1.2.4)
+ actionpack (>= 2.3.7)
+ activesupport (>= 2.3.7)
+ i18n (~> 0.4)
+ friendly_id (2.3.4)
+ activerecord (>= 2.2)
+ activesupport (>= 2.2)
+ fssm (0.2.7)
+ haml (3.1.2)
+ hirb (0.4.5)
+ hoptoad_notifier (2.4.11)
+ activesupport
+ builder
+ i18n (0.6.0)
+ kgio (2.6.0)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
+ nifty-generators (0.4.6)
+ nokogiri (1.5.0)
+ pg (0.11.0)
+ rack (1.1.2)
+ rails (2.3.11)
+ actionmailer (= 2.3.11)
+ actionpack (= 2.3.11)
+ activerecord (= 2.3.11)
+ activeresource (= 2.3.11)
+ activesupport (= 2.3.11)
+ rake (>= 0.8.3)
+ raindrops (0.7.0)
+ rake (0.9.2)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
+ sass (3.1.4)
+ unicorn (4.0.1)
+ kgio (~> 2.4)
+ rack
+ raindrops (~> 0.6)
+ whenever (0.6.8)
+ aaronh-chronic (>= 0.3.9)
+ activesupport (>= 2.3.4)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ RedCloth
+ acts-as-taggable-on
+ authlogic
+ chronic
+ compass
+ formtastic
+ friendly_id (~> 2.3)
+ haml
+ hirb
+ hoptoad_notifier
+ nifty-generators
+ nokogiri
+ pg
+ rails (= 2.3.11)
+ ruby-debug19
+ unicorn
+ whenever
Oops, something went wrong.

0 comments on commit ff539e4

Please sign in to comment.