Permalink
Browse files

Major changes to support time tracking and Rails 3.1

  • Loading branch information...
1 parent 7fa95e9 commit 038b2502e1baec9806a802fd7d475b1451384a73 @sachac committed Dec 26, 2011
Showing with 9,395 additions and 49,736 deletions.
  1. +15 −5 Gemfile
  2. +105 −57 Gemfile.lock
  3. +9 −0 app/assets/javascripts/application.js
  4. +0 −2 public/javascripts/application.js → app/assets/javascripts/quantified.js
  5. 0 app/{ → assets}/stylesheets/_forms.sass
  6. 0 app/{ → assets}/stylesheets/_mixins.sass
  7. 0 app/{ → assets}/stylesheets/_patterns.sass
  8. 0 app/{ → assets}/stylesheets/_reset.sass
  9. 0 app/{ → assets}/stylesheets/_scaffolding.sass
  10. 0 app/{ → assets}/stylesheets/_tables.sass
  11. 0 app/{ → assets}/stylesheets/_type.sass
  12. 0 app/{ → assets}/stylesheets/_variables.sass
  13. +116 −0 app/assets/stylesheets/application.sass
  14. 0 app/{ → assets}/stylesheets/compass_bootstrap.sass
  15. 0 app/{ → assets}/stylesheets/ie.sass
  16. 0 app/{ → assets}/stylesheets/mobile.sass
  17. 0 app/{ → assets}/stylesheets/print.sass
  18. 0 app/{ → assets}/stylesheets/screen.sass
  19. +12 −2 app/{stylesheets/application.sass → assets/stylesheets/style.css.sass}
  20. +106 −0 app/assets/stylesheets/style.sass
  21. +31 −0 app/controllers/application_controller.rb
  22. +123 −0 app/controllers/record_categories_controller.rb
  23. +122 −0 app/controllers/records_controller.rb
  24. +50 −170 app/controllers/time_controller.rb
  25. +68 −1 app/helpers/application_helper.rb
  26. +2 −0 app/helpers/record_categories_helper.rb
  27. +2 −0 app/helpers/records_helper.rb
  28. +1 −1 app/models/ability.rb
  29. +151 −0 app/models/record.rb
  30. +141 −0 app/models/record_category.rb
  31. +4 −223 app/models/time_tracker_log.rb
  32. +15 −1 app/models/user.rb
  33. 0 app/views/{partials → application}/_clothing_log_entry.html.haml
  34. 0 app/views/{partials → application}/_clothing_thumbnails.html.erb
  35. 0 app/views/{partials → application}/_colours.html.haml
  36. +13 −0 app/views/application/_filters.html.haml
  37. 0 app/views/{partials → application}/_login.html.haml
  38. 0 app/views/{partials → application}/_sidebar.html.haml
  39. 0 app/views/{partials → application}/_time_sparklines.html.erb
  40. +14 −13 app/views/home/index.html.haml
  41. +12 −17 app/views/layouts/application.html.haml
  42. +50 −0 app/views/record_categories/_activity_summary.html.haml
  43. +14 −0 app/views/record_categories/_form.html.haml
  44. +23 −0 app/views/record_categories/_list.html.haml
  45. +7 −0 app/views/record_categories/edit.html.haml
  46. +5 −0 app/views/record_categories/index.html.haml
  47. +5 −0 app/views/record_categories/new.html.haml
  48. +28 −0 app/views/record_categories/show.html.haml
  49. +9 −0 app/views/records/_form.html.haml
  50. +25 −0 app/views/records/_summary.html.haml
  51. +8 −0 app/views/records/edit.html.haml
  52. +21 −0 app/views/records/index.html.haml
  53. +5 −0 app/views/records/new.html.haml
  54. +37 −0 app/views/records/show.html.haml
  55. +0 −1 app/views/tap_log_records/show.html.haml
  56. +54 −0 app/views/time/_activity_summary.html.haml
  57. +65 −0 app/views/time/_activity_summary_daily.html.haml
  58. +44 −0 app/views/time/_activity_summary_weekly.html.haml
  59. +4 −3 app/views/time/_nav.html.haml
  60. +16 −0 app/views/time/dashboard.html.haml
  61. +32 −35 app/views/time/graph.html.erb
  62. +1 −6 app/views/time/refresh.html.haml
  63. +15 −0 app/views/time/review.html.haml
  64. +4 −3 config/application.rb
  65. +1 −0 config/cucumber.yml
  66. +8 −1 config/environments/development.rb
  67. +10 −4 config/environments/production.rb
  68. +8 −1 config/environments/test.rb
  69. +1 −0 config/initializers/formtastic.rb
  70. 0 public/javascripts/Examples/css/HeatMap.css → config/initializers/sass.rb
  71. +1 −0 config/initializers/will_paginate.rb
  72. +14 −0 config/initializers/wrap_parameters.rb
  73. +16 −0 config/locales/en.yml
  74. +19 −3 config/routes.rb
  75. +17 −0 db/migrate/20111223144028_create_record_categories.rb
  76. +20 −0 db/migrate/20111223154542_create_records.rb
  77. +9 −0 db/migrate/20111223191834_add_nolink_to_record_category.rb
  78. +5 −0 db/migrate/20111224130846_add_date_to_record.rb
  79. +15 −0 db/migrate/20111224174240_move_old_time_records.rb
  80. +5 −0 db/migrate/20111225133526_add_color_to_record_category.rb
  81. +36 −1 db/schema.rb
  82. +16 −0 features/record_categories.feature
  83. +4 −4 features/step_definitions/life_steps.rb
  84. +27 −0 features/step_definitions/steps.rb
  85. +123 −0 lib/old_records.rb
  86. +0 −61 public/javascripts/Examples/AreaChart/example1.html
  87. +0 −146 public/javascripts/Examples/AreaChart/example1.js
  88. +0 −56 public/javascripts/Examples/BarChart/example1.html
  89. +0 −143 public/javascripts/Examples/BarChart/example1.js
  90. +0 −56 public/javascripts/Examples/BarChart/example2.html
  91. +0 −142 public/javascripts/Examples/BarChart/example2.js
  92. +0 −59 public/javascripts/Examples/ForceDirected/example1.html
  93. +0 −592 public/javascripts/Examples/ForceDirected/example1.js
  94. +0 −61 public/javascripts/Examples/ForceDirected/example2.html
  95. +0 −639 public/javascripts/Examples/ForceDirected/example2.js
  96. +0 −57 public/javascripts/Examples/Hypertree/example1.html
  97. +0 −435 public/javascripts/Examples/Hypertree/example1.js
  98. +0 −58 public/javascripts/Examples/Hypertree/example2.html
  99. +0 −320 public/javascripts/Examples/Hypertree/example2.js
  100. +0 −199 public/javascripts/Examples/Hypertree/example3.html
  101. +0 −625 public/javascripts/Examples/Hypertree/example3.js
  102. +0 −82 public/javascripts/Examples/Icicle/example1.html
  103. +0 −3,497 public/javascripts/Examples/Icicle/example1.js
  104. +0 −83 public/javascripts/Examples/Icicle/example2.html
  105. +0 −7,151 public/javascripts/Examples/Icicle/example2.js
  106. +0 −58 public/javascripts/Examples/Other/example1.html
  107. +0 −569 public/javascripts/Examples/Other/example1.js
  108. +0 −58 public/javascripts/Examples/Other/example2.html
  109. +0 −295 public/javascripts/Examples/Other/example2.js
  110. +0 −58 public/javascripts/Examples/Other/example3.html
  111. +0 −309 public/javascripts/Examples/Other/example3.js
  112. +0 −57 public/javascripts/Examples/PieChart/example1.html
  113. +0 −135 public/javascripts/Examples/PieChart/example1.js
  114. +0 −58 public/javascripts/Examples/RGraph/example1.html
  115. +0 −478 public/javascripts/Examples/RGraph/example1.js
  116. +0 −58 public/javascripts/Examples/RGraph/example2.html
  117. +0 −341 public/javascripts/Examples/RGraph/example2.js
  118. +0 −199 public/javascripts/Examples/RGraph/example3.html
  119. +0 −617 public/javascripts/Examples/RGraph/example3.js
  120. +0 −58 public/javascripts/Examples/RGraph/example4.html
  121. +0 −568 public/javascripts/Examples/RGraph/example4.js
  122. +0 −115 public/javascripts/Examples/Spacetree/example1.html
  123. +0 −899 public/javascripts/Examples/Spacetree/example1.js
  124. +0 −90 public/javascripts/Examples/Spacetree/example2.html
  125. +0 −216 public/javascripts/Examples/Spacetree/example2.js
  126. +0 −75 public/javascripts/Examples/Spacetree/example3.html
  127. +0 −865 public/javascripts/Examples/Spacetree/example3.js
  128. +0 −78 public/javascripts/Examples/Spacetree/example4.html
  129. +0 −899 public/javascripts/Examples/Spacetree/example4.js
  130. +0 −172 public/javascripts/Examples/Spacetree/example5.html
  131. +0 −303 public/javascripts/Examples/Spacetree/example5.js
  132. +0 −58 public/javascripts/Examples/Sunburst/example1.html
  133. +0 −325 public/javascripts/Examples/Sunburst/example1.js
  134. +0 −57 public/javascripts/Examples/Sunburst/example2.html
  135. +0 −772 public/javascripts/Examples/Sunburst/example2.js
  136. +0 −87 public/javascripts/Examples/Treemap/example1.html
  137. +0 −977 public/javascripts/Examples/Treemap/example1.js
  138. +0 −86 public/javascripts/Examples/Treemap/example2.html
  139. +0 −165 public/javascripts/Examples/Treemap/example2.js
  140. +0 −87 public/javascripts/Examples/Treemap/example3.html
  141. +0 −1,025 public/javascripts/Examples/Treemap/example3.js
  142. +0 −114 public/javascripts/Examples/css/AreaChart.css
  143. +0 −112 public/javascripts/Examples/css/BarChart.css
  144. +0 −27 public/javascripts/Examples/css/ForceDirected.css
  145. +0 −12 public/javascripts/Examples/css/ForceDirected3D.css
  146. +0 −3 public/javascripts/Examples/css/Hypertree.css
  147. +0 −79 public/javascripts/Examples/css/Icicle.css
  148. +0 −8 public/javascripts/Examples/css/Other.css
  149. +0 −112 public/javascripts/Examples/css/PieChart.css
  150. +0 −59 public/javascripts/Examples/css/Spacetree.css
  151. +0 −32 public/javascripts/Examples/css/Sunburst.css
  152. +0 −113 public/javascripts/Examples/css/TimeGraph.css
  153. +0 −109 public/javascripts/Examples/css/Treemap.css
  154. +0 −123 public/javascripts/Examples/css/base.css
  155. BIN public/javascripts/Examples/css/col1.png
  156. BIN public/javascripts/Examples/css/col2.png
  157. BIN public/javascripts/Examples/css/gradient.png
  158. +0 −1,416 public/javascripts/Extras/excanvas.js
  159. BIN public/javascripts/Jit-2.0.1.zip
  160. +0 −11,729 public/javascripts/jquery-ui.js
  161. +0 −8,981 public/javascripts/jquery.js
  162. +456 −423 public/stylesheets/application.css
  163. 0 public/{javascripts/Examples/css/RGraph.css → stylesheets/record_summary.css.css}
  164. +3,132 −0 public/stylesheets/style.css
  165. +3,132 −0 public/stylesheets/style.css.css
  166. +0 −1 script/rails
  167. +157 −0 spec/controllers/record_categories_controller_spec.rb
  168. +157 −0 spec/controllers/records_controller_spec.rb
  169. +12 −0 spec/factories/record_categories.rb
  170. +14 −0 spec/factories/records.rb
  171. +7 −0 spec/factories/signups.rb
  172. +15 −0 spec/helpers/record_categories_helper_spec.rb
  173. +15 −0 spec/helpers/records_helper_spec.rb
  174. +5 −0 spec/models/record_category_spec.rb
  175. +5 −0 spec/models/record_spec.rb
  176. +5 −0 spec/models/signup_spec.rb
  177. +11 −0 spec/requests/record_categories_spec.rb
  178. +11 −0 spec/requests/records_spec.rb
  179. +35 −0 spec/routing/record_categories_routing_spec.rb
  180. +35 −0 spec/routing/records_routing_spec.rb
  181. +28 −0 spec/views/record_categories/edit.html.haml_spec.rb
  182. +40 −0 spec/views/record_categories/index.html.haml_spec.rb
  183. +28 −0 spec/views/record_categories/new.html.haml_spec.rb
  184. +30 −0 spec/views/record_categories/show.html.haml_spec.rb
  185. +28 −0 spec/views/records/edit.html.haml_spec.rb
  186. +40 −0 spec/views/records/index.html.haml_spec.rb
  187. +28 −0 spec/views/records/new.html.haml_spec.rb
  188. +30 −0 spec/views/records/show.html.haml_spec.rb
  189. 0 {public → vendor/assets}/javascripts/autocomplete-rails.js
  190. 0 {public → vendor/assets}/javascripts/bootstrap-alerts.js
  191. 0 {public → vendor/assets}/javascripts/bootstrap-dropdown.js
  192. 0 {public → vendor/assets}/javascripts/bootstrap-modal.js
  193. 0 {public → vendor/assets}/javascripts/bootstrap-popover.js
  194. 0 {public → vendor/assets}/javascripts/bootstrap-scrollspy.js
  195. 0 {public → vendor/assets}/javascripts/bootstrap-tabs.js
  196. 0 {public → vendor/assets}/javascripts/bootstrap-twipsy.js
  197. 0 {public → vendor/assets}/javascripts/g.pie-min.js
  198. 0 {public → vendor/assets}/javascripts/g.raphael-min.js
  199. 0 {public → vendor/assets}/javascripts/jit-yc.js
  200. 0 {public → vendor/assets}/javascripts/jit.js
  201. 0 {public → vendor/assets}/javascripts/jquery-ui.min.js
  202. 0 {public → vendor/assets}/javascripts/jquery.min.js
  203. 0 {public → vendor/assets}/javascripts/jquery.sparkline.min.js
  204. 0 {public → vendor/assets}/javascripts/jquery_ujs.js
  205. 0 {public → vendor/assets}/javascripts/protovis.min.js
  206. 0 {public → vendor/assets}/javascripts/raphael-min.js
  207. BIN vendor/cache/abstract-1.0.0.gem
  208. BIN vendor/cache/actionmailer-3.0.10.gem
  209. BIN vendor/cache/actionpack-3.0.10.gem
  210. BIN vendor/cache/activemodel-3.0.10.gem
  211. BIN vendor/cache/activerecord-3.0.10.gem
  212. BIN vendor/cache/activeresource-3.0.10.gem
  213. BIN vendor/cache/activesupport-3.0.10.gem
  214. BIN vendor/cache/arel-2.0.10.gem
  215. BIN vendor/cache/builder-2.1.2.gem
  216. BIN vendor/cache/erubis-2.6.6.gem
  217. BIN vendor/cache/i18n-0.5.0.gem
  218. BIN vendor/cache/mail-2.2.19.gem
  219. BIN vendor/cache/mime-types-1.16.gem
  220. BIN vendor/cache/multi_json-1.0.3.gem
  221. BIN vendor/cache/polyglot-0.3.2.gem
  222. BIN vendor/cache/rack-mount-0.6.14.gem
  223. BIN vendor/cache/rack-test-0.5.7.gem
  224. BIN vendor/cache/rails-3.0.10.gem
  225. BIN vendor/cache/railties-3.0.10.gem
  226. BIN vendor/cache/rake-0.9.2.gem
  227. BIN vendor/cache/tzinfo-0.3.29.gem
View
20 Gemfile
@@ -1,11 +1,11 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.10'
+gem 'rails', '3.1'
# Bundle edge Rails instead:
#gem 'rails', :git => 'git://github.com/rails/rails.git'
#gem 'arel', :git => 'git://github.com/rails/arel.git'
#gem 'journey', :git => 'git://github.com/rails/journey.git'
-
+gem 'rails-dev-tweaks'
gem 'jquery-rails'
gem 'sqlite3'
gem 'isbndb'
@@ -16,6 +16,8 @@ gem 'haml-rails'
gem 'color'
gem 'narray'
gem 'formtastic'
+gem 'rails3-jquery-autocomplete'
+gem 'formtastic-bootstrap'
gem 'handles_sortable_columns'
gem 'gdata'
gem 'cancan'
@@ -47,13 +49,23 @@ gem 'statsample'
gem 'rails3-jquery-autocomplete'
gem 'acts-as-taggable-on', :git => 'git://github.com/mbleigh/acts-as-taggable-on.git'
gem 'chronic'
+gem 'acts-as-tree-with-dotted-ids'
+gem 'nifty-generators'
#gem 'sparklines'
#gem 'sparklines_generator'
gem 'workflow'
gem 'devise'
gem 'web-app-theme'
gem 'ruby_parser'
-gem 'sass'
+group :assets do
+ gem 'therubyracer'
+ gem 'sass-rails', "~> 3.1.0.rc"
+ gem 'coffee-rails', "~> 3.1.0.rc"
+ gem 'uglifier'
+ gem 'compass'
+ gem 'compass-bootstrap'
+end
+
gem 'barometer'
gem 'mechanize'
gem 'rails-settings-cached', :require => 'rails-settings'
@@ -72,8 +84,6 @@ group :development, :test do
gem 'forgery'
gem 'database_cleaner'
gem 'cucumber_factory', :git => 'https://github.com/makandra/cucumber_factory.git'
- gem 'compass'
- gem 'compass-bootstrap'
end
gem 'yaml_db'
gem 'email_validator'
View
@@ -21,40 +21,44 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.10)
- actionpack (= 3.0.10)
- mail (~> 2.2.19)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- activesupport (3.0.10)
- arel (2.0.10)
+ actionmailer (3.1.0)
+ actionpack (= 3.1.0)
+ mail (~> 2.3.0)
+ actionpack (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.0.3)
+ 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)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ activesupport (3.1.0)
+ multi_json (~> 1.0)
+ acts-as-tree-with-dotted-ids (1.0.0)
+ activerecord (>= 3.0.0)
+ arel (2.2.1)
barometer (0.7.3)
httparty (>= 0.4.5)
nokogiri
tzinfo (>= 0.3.14)
bcrypt-ruby (3.0.1)
- builder (2.1.2)
+ builder (3.0.0)
cancan (1.6.7)
capybara (1.1.1)
mime-types (>= 1.16)
@@ -68,6 +72,13 @@ GEM
chronic (0.6.4)
chunky_png (1.2.5)
clbustos-rtf (0.4.2)
+ coffee-rails (3.1.1)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.1.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
color (1.4.1)
compass (0.11.5)
chunky_png (~> 1.2)
@@ -95,8 +106,9 @@ GEM
distribution (0.7.0)
email_validator (1.2.4)
activemodel
- erubis (2.6.6)
- abstract (>= 1.0.0)
+ erubis (2.7.0)
+ execjs (1.2.13)
+ multi_json (~> 1.0)
extendmatrix (0.3.1)
factory_girl (2.2.0)
activesupport
@@ -108,6 +120,9 @@ GEM
forgery (0.5.0)
formtastic (2.0.0)
rails (~> 3.0)
+ formtastic-bootstrap (1.1.2)
+ formtastic
+ rails (~> 3.1.0)
fssm (0.2.7)
gdata (1.1.2)
gherkin (2.6.2)
@@ -119,11 +134,12 @@ GEM
haml (~> 3.0)
railties (~> 3.0)
handles_sortable_columns (0.1.3)
+ hike (1.2.1)
hpricot (0.8.4)
httparty (0.8.0)
multi_json
multi_xml
- i18n (0.5.0)
+ i18n (0.6.0)
isbndb (1.5.5)
activesupport
i18n
@@ -133,11 +149,11 @@ GEM
jquery-rails (1.0.14)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.1)
+ json (1.6.3)
json_pure (1.6.1)
+ libv8 (3.3.10.4)
libxml-ruby (2.2.2)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -146,19 +162,20 @@ GEM
net-http-persistent (~> 1.8)
nokogiri (~> 1.4)
webrobots (~> 0.0, >= 0.0.9)
- mime-types (1.16)
+ mime-types (1.17.2)
minimization (0.2.1)
text-table (~> 1.2)
- multi_json (1.0.3)
+ multi_json (1.0.4)
multi_xml (0.4.1)
mysql (2.8.1)
n_gram (0.0.1)
narray (0.6.0.1)
net-http-digest_auth (1.1.1)
net-http-persistent (1.9)
+ nifty-generators (0.4.6)
nokogiri (1.5.0)
orm_adapter (0.0.5)
- polyglot (0.3.2)
+ polyglot (0.3.3)
prawn (0.8.4)
prawn-core (>= 0.8.4, < 0.9)
prawn-layout (>= 0.8.4, < 0.9)
@@ -169,32 +186,40 @@ GEM
prawn-svg (0.9.1.10)
prawn (>= 0.8.4)
prawn-core (>= 0.8.4)
- rack (1.2.4)
- rack-mount (0.6.14)
+ rack (1.3.5)
+ rack-cache (1.0.3)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.10)
- actionmailer (= 3.0.10)
- actionpack (= 3.0.10)
- activerecord (= 3.0.10)
- activeresource (= 3.0.10)
- activesupport (= 3.0.10)
+ rails (3.1.0)
+ actionmailer (= 3.1.0)
+ actionpack (= 3.1.0)
+ activerecord (= 3.1.0)
+ activeresource (= 3.1.0)
+ activesupport (= 3.1.0)
bundler (~> 1.0)
- railties (= 3.0.10)
+ railties (= 3.1.0)
+ rails-dev-tweaks (0.5.2)
+ rails (~> 3.1.0)
rails-settings-cached (0.1.2)
rails (>= 3.0.0)
rails3-jquery-autocomplete (1.0.4)
rails (~> 3.0)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
+ railties (3.1.0)
+ actionpack (= 3.1.0)
+ activesupport (= 3.1.0)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (0.9.2)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
rcov (0.9.11)
- rdoc (3.9.4)
+ rdoc (3.12)
+ json (~> 1.4)
reportbuilder (1.4.1)
clbustos-rtf (~> 0.4.0)
prawn (~> 0.8.4)
@@ -220,6 +245,12 @@ GEM
rubyvis (0.4.1)
rubyzip (0.9.4)
sass (3.1.7)
+ sass-rails (3.1.4)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (>= 3.1.4)
+ sprockets (~> 2.0.0)
+ tilt (~> 1.3.2)
selenium-webdriver (2.10.0)
childprocess (>= 0.2.1)
ffi (= 1.0.9)
@@ -228,6 +259,10 @@ GEM
sexp_processor (3.0.7)
spreadsheet (0.6.5.9)
ruby-ole (>= 1.0)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.4)
statsample (1.1.0)
dirty-memoize (~> 0.0)
@@ -244,11 +279,17 @@ GEM
distribution (~> 0.6)
term-ansicolor (1.0.7)
text-table (1.2.2)
+ therubyracer (0.9.9)
+ libv8 (~> 3.3.10)
thor (0.14.6)
+ tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.29)
+ tzinfo (0.3.31)
+ uglifier (1.2.0)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
warden (1.0.5)
rack (>= 1.0)
web-app-theme (0.7.0)
@@ -265,10 +306,12 @@ PLATFORMS
DEPENDENCIES
acts-as-taggable-on!
+ acts-as-tree-with-dotted-ids
barometer
cancan
capybara
chronic
+ coffee-rails (~> 3.1.0.rc)
color
compass
compass-bootstrap
@@ -282,6 +325,7 @@ DEPENDENCIES
fastercsv
forgery
formtastic
+ formtastic-bootstrap
gdata
haml
haml-rails
@@ -293,17 +337,21 @@ DEPENDENCIES
mysql
n_gram
narray
- rails (= 3.0.10)
+ nifty-generators
+ rails (= 3.1)
+ rails-dev-tweaks
rails-settings-cached
rails3-jquery-autocomplete
rcov
rspec
rspec-rails
ruby_parser
- sass
+ sass-rails (~> 3.1.0.rc)
sqlite3
statsample
subdomain-fu!
+ therubyracer
+ uglifier
web-app-theme
will_paginate
workflow
@@ -0,0 +1,9 @@
+// Place your application-specific JavaScript functions and classes here
+// This file is automatically included by javascript_include_tag :defaults
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require autocomplete-rails
+//= require raphael-min
+//= require jquery.sparkline.min
+//= require_tree .
@@ -1,5 +1,3 @@
-// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults
$(document).ready(function() {
$('.datepicker').datepicker({dateFormat: 'yy-m-d'});
$('.sparkline-bar').sparkline('html', {type: 'bar', barColor: '#85acaa', chartRangeMin: 0});
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 038b250

Please sign in to comment.