Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into stable_release

Conflicts:
	lib/acts_as_moderatable.rb
  • Loading branch information...
commit 3113189108b7cd8854af7bee6b9416e52b92ee98 2 parents 897ae6e + 126dd51
@chewbranca chewbranca authored
Showing with 699 additions and 316 deletions.
  1. +5 −0 .gitignore
  2. +6 −0 .travis.yml
  3. +53 −47 Gemfile
  4. +341 −250 Gemfile.lock
  5. +261 −0 README
  6. +30 −3 README.md
  7. +3 −16 Rakefile
  8. 0  {public/stylesheets → app/assets/images}/active_scaffold/DO_NOT_EDIT
  9. 0  {public → app/assets}/images/active_scaffold/default/add.gif
  10. 0  {public → app/assets}/images/active_scaffold/default/arrow_down.gif
  11. 0  {public → app/assets}/images/active_scaffold/default/arrow_up.gif
  12. 0  {public → app/assets}/images/active_scaffold/default/close.gif
  13. 0  {public → app/assets}/images/active_scaffold/default/cross.png
  14. 0  {public → app/assets}/images/active_scaffold/default/indicator-small.gif
  15. 0  {public → app/assets}/images/active_scaffold/default/indicator.gif
  16. 0  {public → app/assets}/images/active_scaffold/default/magnifier.png
  17. 0  {public → app/assets}/images/admin/btn-off.gif
  18. 0  {public → app/assets}/images/admin/btn-on.gif
  19. 0  {public → app/assets}/images/arrow/down.png
  20. 0  {public → app/assets}/images/arrow/down_dark.png
  21. 0  {public → app/assets}/images/arrow/left.png
  22. 0  {public → app/assets}/images/arrow/left_dark.png
  23. 0  {public → app/assets}/images/arrow/navigator.png
  24. 0  {public → app/assets}/images/arrow/right.png
  25. 0  {public → app/assets}/images/arrow/right_dark.png
  26. 0  {public → app/assets}/images/arrow/up.png
  27. 0  {public → app/assets}/images/arrow/up_dark.png
  28. 0  {public → app/assets}/images/arrows-ffffff.png
  29. 0  {public → app/assets}/images/asc.gif
  30. 0  {public → app/assets}/images/authbuttons/aol_128.png
  31. 0  {public → app/assets}/images/authbuttons/aol_256.png
  32. 0  {public → app/assets}/images/authbuttons/aol_32.png
  33. 0  {public → app/assets}/images/authbuttons/aol_64.png
  34. 0  {public → app/assets}/images/authbuttons/basecamp_128.png
  35. 0  {public → app/assets}/images/authbuttons/basecamp_256.png
  36. 0  {public → app/assets}/images/authbuttons/basecamp_32.png
  37. 0  {public → app/assets}/images/authbuttons/basecamp_64.png
  38. 0  {public → app/assets}/images/authbuttons/campfire_128.png
  39. 0  {public → app/assets}/images/authbuttons/campfire_256.png
  40. 0  {public → app/assets}/images/authbuttons/campfire_32.png
  41. 0  {public → app/assets}/images/authbuttons/campfire_64.png
  42. 0  {public → app/assets}/images/authbuttons/facebook_128.png
  43. 0  {public → app/assets}/images/authbuttons/facebook_256.png
  44. 0  {public → app/assets}/images/authbuttons/facebook_32.png
  45. 0  {public → app/assets}/images/authbuttons/facebook_64.png
  46. 0  {public → app/assets}/images/authbuttons/github_128.png
  47. 0  {public → app/assets}/images/authbuttons/github_256.png
  48. 0  {public → app/assets}/images/authbuttons/github_32.png
  49. 0  {public → app/assets}/images/authbuttons/github_64.png
  50. 0  {public → app/assets}/images/authbuttons/google_128.png
  51. 0  {public → app/assets}/images/authbuttons/google_256.png
  52. 0  {public → app/assets}/images/authbuttons/google_32.png
  53. 0  {public → app/assets}/images/authbuttons/google_64.png
  54. 0  {public → app/assets}/images/authbuttons/linkedin_128.png
  55. 0  {public → app/assets}/images/authbuttons/linkedin_256.png
  56. 0  {public → app/assets}/images/authbuttons/linkedin_32.png
  57. 0  {public → app/assets}/images/authbuttons/linkedin_64.png
  58. 0  {public → app/assets}/images/authbuttons/myspace_128.png
  59. 0  {public → app/assets}/images/authbuttons/myspace_256.png
  60. 0  {public → app/assets}/images/authbuttons/myspace_32.png
  61. 0  {public → app/assets}/images/authbuttons/myspace_64.png
  62. 0  {public → app/assets}/images/authbuttons/openid_128.png
  63. 0  {public → app/assets}/images/authbuttons/openid_256.png
  64. 0  {public → app/assets}/images/authbuttons/openid_32.png
  65. 0  {public → app/assets}/images/authbuttons/openid_64.png
  66. 0  {public → app/assets}/images/authbuttons/presently_128.png
  67. 0  {public → app/assets}/images/authbuttons/presently_256.png
  68. 0  {public → app/assets}/images/authbuttons/presently_32.png
  69. 0  {public → app/assets}/images/authbuttons/presently_64.png
  70. 0  {public → app/assets}/images/authbuttons/twitter_128.png
  71. 0  {public → app/assets}/images/authbuttons/twitter_256.png
  72. 0  {public → app/assets}/images/authbuttons/twitter_32.png
  73. 0  {public → app/assets}/images/authbuttons/twitter_64.png
  74. 0  {public → app/assets}/images/authbuttons/yahoo_128.png
  75. 0  {public → app/assets}/images/authbuttons/yahoo_256.png
  76. 0  {public → app/assets}/images/authbuttons/yahoo_32.png
  77. 0  {public → app/assets}/images/authbuttons/yahoo_64.png
  78. 0  {public → app/assets}/images/bg.gif
  79. BIN  app/assets/images/default/ad-bg-title.gif
  80. 0  {public/images/site → app/assets/images/default}/advertise_here.png
  81. BIN  app/assets/images/default/bookmarklet-BG.gif
  82. BIN  app/assets/images/default/bookmarklet-demo.png
  83. BIN  app/assets/images/default/bookmarklet-header-BG.png
  84. BIN  app/assets/images/default/btn-off.gif
  85. BIN  app/assets/images/default/btn-on.gif
  86. BIN  app/assets/images/default/bullet1.gif
  87. 0  {public/images/site → app/assets/images/default}/caption-bg.png
  88. 0  {public/images/site → app/assets/images/default}/curtain.png
  89. BIN  app/assets/images/default/default_thumb.gif
  90. BIN  app/assets/images/default/default_thumb_b.gif
  91. BIN  app/assets/images/default/disabled-btn.gif
  92. BIN  app/assets/images/default/dropdown_arrow.gif
  93. BIN  app/assets/images/default/favicon.gif
  94. BIN  app/assets/images/default/form-btn-off.png
  95. BIN  app/assets/images/default/form-btn-on.png
  96. 0  {public/images/site → app/assets/images/default}/form-tab.png
  97. BIN  app/assets/images/default/hdr-logo.png
  98. BIN  app/assets/images/default/hdr_bg.gif
  99. 0  {public/images/site → app/assets/images/default}/home-icon-off.png
  100. 0  {public/images/site → app/assets/images/default}/home-icon-selected.png
  101. BIN  app/assets/images/default/house-ad-banner.jpg
  102. BIN  app/assets/images/default/house-ad-bg.gif
  103. BIN  app/assets/images/default/house-ad-profile.jpg
  104. BIN  app/assets/images/default/icon-answer.png
  105. BIN  app/assets/images/default/icon-article.png
  106. BIN  app/assets/images/default/icon-comment.png
  107. BIN  app/assets/images/default/icon-event.png
  108. BIN  app/assets/images/default/icon-fan-app.gif
  109. 0  {public/images/skin → app/assets/images/default}/icon-host-badge.png
  110. BIN  app/assets/images/default/icon-idea.png
  111. BIN  app/assets/images/default/icon-mod-badge.png
  112. BIN  app/assets/images/default/icon-question.png
  113. BIN  app/assets/images/default/icon-resource.png
  114. BIN  app/assets/images/default/icon_facebook.gif
  115. BIN  app/assets/images/default/icon_flag.gif
  116. BIN  app/assets/images/default/icon_newscloud.gif
  117. BIN  app/assets/images/default/icon_photo.gif
  118. BIN  app/assets/images/default/icon_rss.png
  119. BIN  app/assets/images/default/icon_thumbs.gif
  120. BIN  app/assets/images/default/icon_tweet.gif
  121. BIN  app/assets/images/default/icon_twitter.gif
  122. BIN  app/assets/images/default/icon_video.gif
  123. BIN  app/assets/images/default/icon_vote_down.gif
  124. BIN  app/assets/images/default/icon_vote_up.gif
  125. BIN  app/assets/images/default/medium_watermark.jpg
  126. BIN  app/assets/images/default/pagetab-bg-hover.gif
  127. BIN  app/assets/images/default/pagetab-bg-off.gif
  128. BIN  app/assets/images/default/pagetab-bg-on.gif
  129. BIN  ..._backend_database/lib/public/images/percentImage_back2.png → app/assets/images/default/reply_arrow.png
  130. BIN  app/assets/images/default/site/ad-title-bg.gif
  131. BIN  app/assets/images/default/site/btn-gradient.png
  132. BIN  app/assets/images/default/site/btn-highlight.png
  133. BIN  app/assets/images/default/site/dropdown-arrow.png
  134. BIN  app/assets/images/default/site/featured-panel-bg.png
  135. BIN  app/assets/images/default/site/icon-email.png
  136. BIN  app/assets/images/default/site/icon-facebook.png
  137. BIN  app/assets/images/default/site/icon-friends.png
  138. BIN  app/assets/images/default/site/icon-rss.png
  139. BIN  app/assets/images/default/site/icon-twitter.png
  140. BIN  app/assets/images/default/site/mark-active-sml-d.png
  141. BIN  app/assets/images/default/site/mark-active-sml.png
  142. BIN  app/assets/images/default/site/mark-active.png
  143. BIN  app/assets/images/default/site/mark-blogs-sml-d.png
  144. BIN  app/assets/images/default/site/mark-blogs-sml.png
  145. BIN  app/assets/images/default/site/mark-blogs.png
  146. BIN  app/assets/images/default/site/mark-classifieds-sml-d.png
  147. BIN  app/assets/images/default/site/mark-classifieds.png
  148. BIN  app/assets/images/default/site/mark-comments-sml-d.png
  149. BIN  app/assets/images/default/site/mark-comments.png
  150. BIN  app/assets/images/default/site/mark-events-sml-d.png
  151. BIN  app/assets/images/default/site/mark-events.png
  152. BIN  app/assets/images/default/site/mark-forums-sml-d.png
  153. BIN  app/assets/images/default/site/mark-forums.png
  154. BIN  app/assets/images/default/site/mark-forumtopics-sml-d.png
  155. BIN  app/assets/images/default/site/mark-forumtopics.png
  156. BIN  app/assets/images/default/site/mark-ideas-sml-d.png
  157. BIN  app/assets/images/default/site/mark-ideas.png
  158. BIN  app/assets/images/default/site/mark-latest.png
  159. BIN  app/assets/images/default/site/mark-media-sml-d.png
  160. BIN  app/assets/images/default/site/mark-media.png
  161. BIN  app/assets/images/default/site/mark-news-sml-d.png
  162. BIN  app/assets/images/default/site/mark-news.png
  163. BIN  app/assets/images/default/site/mark-predictions-sml-d.png
  164. BIN  app/assets/images/default/site/mark-predictions.png
  165. BIN  app/assets/images/default/site/mark-qa-sml-d.png
  166. BIN  app/assets/images/default/site/mark-qa.png
  167. BIN  app/assets/images/default/site/meta-bullet.gif
  168. 0  public/images/site/bg-hdr-actions.png → app/assets/images/default/site/meta-links-bg.png
  169. BIN  app/assets/images/default/site/tdv-shadow.png
  170. BIN  app/assets/images/default/spacer.gif
  171. 0  {public/images/site → app/assets/images/default}/spinner-tiny.gif
  172. 0  {public/images/site → app/assets/images/default}/spinner.gif
  173. BIN  app/assets/images/default/sponsor-bg-title.gif
  174. BIN  ...backend_database/lib/public/images/percentImage_back1.png → app/assets/images/default/sponsor-logo.png
  175. BIN  app/assets/images/default/test-profile-pic.jpg
  176. 0  {public/images/site → app/assets/images/default}/thumb-down.gif
  177. 0  {public/images/site → app/assets/images/default}/thumb-up.gif
  178. BIN  app/assets/images/default/topbar-bg.gif
  179. BIN  app/assets/images/default/topic_arrow.gif
  180. BIN  app/assets/images/default/tweet_button.gif
  181. 0  {public/images/site → app/assets/images/default}/vertical_bg_animation.gif
  182. BIN  app/assets/images/default/watermark.jpg
  183. 0  {public → app/assets}/images/desc.gif
  184. 0  {public → app/assets}/images/featured/banner.jpg
  185. 0  {public → app/assets}/images/featured/loading.gif
  186. 0  {public → app/assets}/images/featured/template_1.jpg
  187. 0  {public → app/assets}/images/featured/template_10.jpg
  188. 0  {public → app/assets}/images/featured/template_2.jpg
  189. 0  {public → app/assets}/images/featured/template_3.jpg
  190. 0  {public → app/assets}/images/featured/template_32.jpg
  191. 0  {public → app/assets}/images/featured/template_4.jpg
  192. 0  {public → app/assets}/images/featured/template_5.jpg
  193. 0  {public → app/assets}/images/featured/template_52.jpg
  194. 0  {public → app/assets}/images/featured/template_6.jpg
  195. 0  {public → app/assets}/images/featured/template_7.jpg
  196. 0  {public → app/assets}/images/featured/template_8.jpg
  197. 0  {public → app/assets}/images/featured/template_9.jpg
  198. 0  {public → app/assets}/images/jquery.wysiwyg.gif
  199. 0  {public → app/assets}/images/jquery.wysiwyg.jpg
  200. 0  {public → app/assets}/images/m/jqt/back_button.png
  201. 0  {public → app/assets}/images/m/jqt/back_button_clicked.png
  202. 0  {public → app/assets}/images/m/jqt/button.png
  203. 0  {public → app/assets}/images/m/jqt/button_clicked.png
  204. 0  {public → app/assets}/images/m/jqt/chevron.png
  205. 0  {public → app/assets}/images/m/jqt/chevron_circle.png
  206. 0  {public → app/assets}/images/m/jqt/grayButton.png
  207. 0  {public → app/assets}/images/m/jqt/loading.gif
  208. 0  {public → app/assets}/images/m/jqt/on_off.png
  209. 0  {public → app/assets}/images/m/jqt/rowhead.png
  210. 0  {public → app/assets}/images/m/jqt/toggle.png
  211. 0  {public → app/assets}/images/m/jqt/toggleOn.png
  212. 0  {public → app/assets}/images/m/jqt/toolbar.png
  213. 0  {public → app/assets}/images/m/jqt/whiteButton.png
  214. 0  {public → app/assets}/images/next-horizontal.png
  215. 0  {public → app/assets}/images/next-vertical.png
  216. 0  {public → app/assets}/images/overlay/apple-close.png
  217. 0  {public → app/assets}/images/overlay/apple.png
  218. 0  {public → app/assets}/images/overlay/black.png
  219. 0  {public → app/assets}/images/overlay/close.png
  220. 0  {public → app/assets}/images/overlay/flowplayer.png
  221. 0  {public → app/assets}/images/overlay/gray.png
  222. 0  {public → app/assets}/images/overlay/petrol.png
  223. 0  {public → app/assets}/images/overlay/red.png
  224. 0  {public → app/assets}/images/overlay/transparent.png
  225. 0  {public → app/assets}/images/overlay/white.png
  226. 0  {public → app/assets}/images/overlay/white_chromebutton.png
  227. 0  {public → app/assets}/images/overlay/white_close.png
  228. 0  {public/images/prettyPhoto/light_square → app/assets/images/prettyPhoto/dark_rounded}/btnNext.png
  229. 0  {public/images/prettyPhoto/light_square → app/assets/images/prettyPhoto/dark_rounded}/btnPrevious.png
  230. 0  {public → app/assets}/images/prettyPhoto/dark_rounded/contentPattern.png
  231. 0  ...ic/images/prettyPhoto/light_square → app/assets/images/prettyPhoto/dark_rounded}/default_thumbnail.gif
  232. 0  {public/images/prettyPhoto/dark_square → app/assets/images/prettyPhoto/dark_rounded}/loader.gif
  233. 0  {public → app/assets}/images/prettyPhoto/dark_rounded/sprite.png
  234. 0  {public/images/prettyPhoto/light_rounded → app/assets/images/prettyPhoto/dark_square}/btnNext.png
  235. 0  {public/images/prettyPhoto/light_rounded → app/assets/images/prettyPhoto/dark_square}/btnPrevious.png
  236. 0  {public → app/assets}/images/prettyPhoto/dark_square/contentPattern.png
  237. 0  ...ic/images/prettyPhoto/light_rounded → app/assets/images/prettyPhoto/dark_square}/default_thumbnail.gif
  238. 0  {public/images/prettyPhoto/dark_rounded → app/assets/images/prettyPhoto/dark_square}/loader.gif
  239. 0  {public/images/prettyPhoto/light_square → app/assets/images/prettyPhoto/dark_square}/sprite.png
  240. 0  {public → app/assets}/images/prettyPhoto/facebook/btnNext.png
  241. 0  {public → app/assets}/images/prettyPhoto/facebook/btnPrevious.png
  242. 0  {public → app/assets}/images/prettyPhoto/facebook/contentPatternBottom.png
  243. 0  {public → app/assets}/images/prettyPhoto/facebook/contentPatternLeft.png
  244. 0  {public → app/assets}/images/prettyPhoto/facebook/contentPatternRight.png
  245. 0  {public → app/assets}/images/prettyPhoto/facebook/contentPatternTop.png
  246. 0  {public → app/assets}/images/prettyPhoto/facebook/default_thumbnail.gif
  247. 0  {public/images/prettyPhoto/light_square → app/assets/images/prettyPhoto/facebook}/loader.gif
  248. 0  {public → app/assets}/images/prettyPhoto/facebook/sprite.png
  249. 0  {public/images/prettyPhoto/dark_square → app/assets/images/prettyPhoto/light_rounded}/btnNext.png
  250. 0  {public/images/prettyPhoto/dark_square → app/assets/images/prettyPhoto/light_rounded}/btnPrevious.png
  251. 0  ...ic/images/prettyPhoto/dark_square → app/assets/images/prettyPhoto/light_rounded}/default_thumbnail.gif
  252. 0  {public → app/assets}/images/prettyPhoto/light_rounded/loader.gif
  253. 0  {public → app/assets}/images/prettyPhoto/light_rounded/sprite.png
  254. 0  {public/images/prettyPhoto/dark_rounded → app/assets/images/prettyPhoto/light_square}/btnNext.png
  255. 0  {public/images/prettyPhoto/dark_rounded → app/assets/images/prettyPhoto/light_square}/btnPrevious.png
  256. 0  ...ic/images/prettyPhoto/dark_rounded → app/assets/images/prettyPhoto/light_square}/default_thumbnail.gif
  257. 0  {public/images/prettyPhoto/facebook → app/assets/images/prettyPhoto/light_square}/loader.gif
  258. 0  {public/images/prettyPhoto/dark_square → app/assets/images/prettyPhoto/light_square}/sprite.png
  259. 0  {public → app/assets}/images/prev-horizontal.png
  260. 0  {public → app/assets}/images/prev-vertical.png
  261. 0  {public → app/assets}/images/rails.png
  262. 0  {public → app/assets}/images/shadow.png
  263. BIN  app/assets/images/site/advertise_here.png
  264. 0  {public → app/assets}/images/site/bg-ad-title.gif
  265. BIN  app/assets/images/site/bg-hdr-actions.png
  266. 0  {public → app/assets}/images/site/bg-sponsor-title.gif
  267. 0  {public → app/assets}/images/site/bookmarklet-demo.png
  268. 0  {public → app/assets}/images/site/btn-close.gif
  269. BIN  app/assets/images/site/caption-bg.png
  270. BIN  app/assets/images/site/curtain.png
  271. BIN  app/assets/images/site/form-tab.png
  272. BIN  app/assets/images/site/home-icon-off.png
  273. BIN  app/assets/images/site/home-icon-selected.png
  274. 0  {public → app/assets}/images/site/ir-arrows.png
  275. BIN  app/assets/images/site/spinner-tiny.gif
  276. BIN  app/assets/images/site/spinner.gif
  277. BIN  app/assets/images/site/thumb-down.gif
  278. BIN  app/assets/images/site/thumb-up.gif
  279. BIN  app/assets/images/site/vertical_bg_animation.gif
  280. 0  {public → app/assets}/images/skin/bg-header.gif
  281. 0  {public → app/assets}/images/skin/bg-header.png
  282. 0  {public → app/assets}/images/skin/generic-profile-pic.jpg
  283. 0  {public → app/assets}/images/skin/header-logo.png
  284. 0  {public → app/assets}/images/skin/icon-fan-app.gif
  285. BIN  app/assets/images/skin/icon-host-badge.png
  286. 0  {public → app/assets}/images/skin/icon-mod-badge.png
  287. 0  {public → app/assets}/images/skin/medium_watermark.jpg
  288. 0  {public → app/assets}/images/skin/watermark.jpg
  289. 0  {public → app/assets}/javascripts/FBjqRY-LICENSE
  290. 0  {public → app/assets}/javascripts/FBjqRY.js
  291. 0  {public → app/assets}/javascripts/Utility.js
  292. 0  {public → app/assets}/javascripts/active_scaffold/DO_NOT_EDIT
  293. 0  {public → app/assets}/javascripts/active_scaffold/default/active_scaffold.js
  294. 0  {public → app/assets}/javascripts/active_scaffold/default/dhtml_history.js
  295. 0  {public → app/assets}/javascripts/active_scaffold/default/form_enhancements.js
  296. 0  {public → app/assets}/javascripts/active_scaffold/default/rico_corner.js
  297. 0  {public → app/assets}/javascripts/admin.js
  298. 0  {public → app/assets}/javascripts/anytime.js
  299. 0  {public → app/assets}/javascripts/anytimec.js
  300. 0  {public → app/assets}/javascripts/anytimetz.js
Sorry, we could not display the entire diff because too many files (1,635) changed.
View
5 .gitignore
@@ -2,6 +2,7 @@
public/maintenance.*
public/sitemap*
public/uploads
+public/assets
public/cache/*
!public/cache/.gitignore
tmp
@@ -32,6 +33,7 @@ config/deploy/*.json
!config/deploy/example_site.rb
*.pid
ical
+log/*.db
db/*.db
db/*.sqlite3
config/initializers/your_site_host.rb
@@ -54,3 +56,6 @@ capybara*.html
auto-save-list
tramp
.\#*
+.rspec
+.rvmrc
+.idea
View
6 .travis.yml
@@ -0,0 +1,6 @@
+before_script:
+ - "mysql -e 'create database n2_test'; mysql n2_test < db/development_structure.sql"
+ - "mysql -e 'create database n2_development'; mysql n2_development < db/development_structure.sql"
+
+script:
+ - "echo $PWD; ruby script/copy_configs.rb; bundle exec rake db:migrate db:setup db:test:clone_structure spec"
View
100 Gemfile
@@ -1,89 +1,95 @@
source :gemcutter
-gem "rails", "2.3.11"
-gem "rack", '1.1.0'
-
-
-gem "haml", "3.1.3"
-gem 'compass', '0.11.5'
+gem "rails", "3.1.3"
+gem "acts_as_tree"
+gem "sprockets"
+gem 'haml'
+gem "sass-rails"
+gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :ref => "8c84869b0b6bc5396e264fea15c71d4e346ac5d0"
gem 'compass-960-plugin'
-gem 'json', '1.4.6'
-gem 'json_pure', '1.5.1'
-gem 'mogli'
+gem 'json'
+gem 'mogli', :git => 'git://github.com/adahmash/mogli.git'
+gem "thumbs_up"
+gem "prototype-rails"
-gem "formtastic", "1.1.0"
-gem "friendly_id", '2.2.7'
-gem 'will_paginate', '~> 2.3.11'
-gem "tzinfo", '0.3.23'
-gem "oauth"
-gem "twitter"
-gem "mysql"
+gem "formtastic", :git => "git://github.com/joevandyk/formtastic.git", :ref => "90e58f7"
+gem "friendly_id", '3.3.1'
+gem 'will_paginate'
+gem "oauth-plugin", ">= 0.4.0.pre1"
+gem "twitter", :git => "https://github.com/jnunemaker/twitter.git"
+gem "mysql2"
gem "bitly"
gem "redis"
gem "redis-namespace"
-gem "resque"
+gem "resque", :git => 'git://github.com/defunkt/resque.git'
+gem "resque-retry"
gem "resque-scheduler", :require => 'resque_scheduler'
gem 'sitemap_generator'
gem "SystemTimer"
gem "aasm"
gem "aws-s3"
+gem "aws-sdk"
gem "acl9"
gem "paperclip"
-#gem "ruby-aaws"
gem 'amazon-ecs'
+gem 'routing-filter'
-# switched from vendor/plugins
-gem "hoptoad_notifier"
-gem "newrelic_rpm"
-gem "acts-as-taggable-on", '2.0.0.rc1'
+# JVD: having problems getting this working with an empty database
+# The gem tries to load the locales table before it exists.
+# Patched this to fix issues with the Translation model
+gem 'i18n_backend_database', :git => "git://github.com/chewbranca/i18n_backend_database.git"
+# JVD: Use this when developing, checkout the i18n_backend_database to ../
+# gem 'i18n_backend_database', :path => "../i18n_backend_database"
-#gem 'redis-store', '= 1.0.0.beta2', :git => 'https://github.com/jodosha/redis-store.git', :ref => '20d5a4d3741095b3509d'
-gem 'redis-store', '= 1.0.0.beta5'
+#gem "hoptoad_notifier"
+gem "airbrake"
+gem "acts-as-taggable-on"
-# Rails_xss plugin requirements
-gem 'erubis'
+gem 'redis-store'
# Feedzirra related
gem 'nokogiri'
-gem 'loofah', '0.4.7'
-gem 'builder', '2.1.2'
-gem 'curb', :git => 'git://github.com/taf2/curb.git'
-gem 'sax-machine', :git => 'git://github.com/pauldix/sax-machine.git'
-
-gem "omniauth", "~> 0.2.6"
+gem 'loofah'
+gem 'feedzirra', :git => 'https://github.com/pauldix/feedzirra.git'
+#gem 'curb', :git => 'git://github.com/taf2/curb.git'
+#gem 'sax-machine', :git => 'git://github.com/pauldix/sax-machine.git'
-source("http://gems.github.com") { gem "mdalessio-dryopteris", "0.1.2" }
+gem "omniauth", '1.0.1'
+gem "omniauth-facebook", :git => "git://github.com/mkdynamic/omniauth-facebook.git"
+gem "omniauth-twitter"
-#gem 'feedzirra', '0.0.18.1'
-gem 'feedzirra', :git => 'git://github.com/chewbranca/feedzirra.git'
group :development do
+ gem "rails-dev-tweaks"
gem "wirble"
gem "awesome_print"
- gem "faker"
gem "capistrano"
gem "capistrano-ext"
end
+group :development, :test do
+ gem "rspec"
+ gem "rspec-rails"
+end
+
group :test, :cucumber do
- gem "rspec", "1.3.0"
- gem "rspec-rails", "1.3.2"
- gem "faker"
- gem "database_cleaner", :git => "git://github.com/bmabey/database_cleaner.git"
- gem "capybara", :git => "git://github.com/jnicklas/capybara.git"
- #gem "capybara-envjs"
+ gem "database_cleaner", '0.7.0'
+ gem "capybara", '1.1.2'
gem "cucumber"
- gem "cucumber-rails", "0.3.2"
+ gem "cucumber-rails"
gem "factory_girl"
- #gem "email_spec"
gem "rcov"
- gem "faker"
gem "pickle"
gem "launchy"
- gem "ZenTest"
+ gem "ZenTest", "4.5.0"
gem "rr"
end
group :production do
- gem "unicorn"
+ gem "passenger"
+ gem "newrelic_rpm"
end
+
+#group :assets do
+ #gem 'uglifier'
+#end
View
591 Gemfile.lock
@@ -1,281 +1,368 @@
GIT
- remote: git://github.com/bmabey/database_cleaner.git
- revision: e8607e504eca348520260ccbfc2bdff85832e911
+ remote: git://github.com/adahmash/mogli.git
+ revision: 90d2a14cd64f735cde729201762c8792d3f18847
specs:
- database_cleaner (0.6.7)
+ mogli (0.0.36)
+ hashie (>= 1.1.0)
+ httmultiparty (>= 0.3.6)
+ httparty (>= 0.4.3)
+ multi_json (~> 1.0.3)
GIT
- remote: git://github.com/chewbranca/feedzirra.git
- revision: 48476ebcc6008f33e54a6705497de101c2107f0b
+ remote: git://github.com/chewbranca/i18n_backend_database.git
+ revision: 3c5be2c7b79ec9e0c3283de82d913e840e06c9c5
specs:
- feedzirra (0.0.24)
- activesupport (>= 2.3.4)
- builder (>= 2.1.2)
- curb (>= 0.2.3)
- loofah (>= 0.3.1)
- nokogiri (> 0.0.0)
- sax-machine (>= 0.0.12)
+ i18n_backend_database (0.0.1)
+ rails (>= 3)
GIT
- remote: git://github.com/jnicklas/capybara.git
- revision: 774ee9cfe3b8a74318c56aa923082d9b276f1eab
+ remote: git://github.com/chriseppstein/compass.git
+ revision: 8c84869b0b6bc5396e264fea15c71d4e346ac5d0
+ ref: 8c84869b0b6bc5396e264fea15c71d4e346ac5d0
specs:
- capybara (1.0.0.beta1)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- selenium-webdriver (~> 0.2.0)
- xpath (~> 0.1.4)
+ compass (0.12.alpha.4.8c84869)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
GIT
- remote: git://github.com/pauldix/sax-machine.git
- revision: 1e39f35c1bb727dcf1e3aeee356dcb9f719d39d8
+ remote: git://github.com/defunkt/resque.git
+ revision: 8aad2e1d78f913902ec75a91e3de4fba30eb2fb9
specs:
- sax-machine (0.0.16)
- nokogiri (> 0.0.0)
+ resque (1.19.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.0.2)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+
+GIT
+ remote: git://github.com/joevandyk/formtastic.git
+ revision: 90e58f782be8d62c9586a62bb3399d1784651d9c
+ ref: 90e58f7
+ specs:
+ formtastic (2.0.2)
+ rails (~> 3.0)
+
+GIT
+ remote: git://github.com/mkdynamic/omniauth-facebook.git
+ revision: 0a878f3520d21672772b6085442e13445e6e4784
+ specs:
+ omniauth-facebook (1.2.0)
+ omniauth-oauth2 (~> 1.0.0)
GIT
- remote: git://github.com/taf2/curb.git
- revision: a47439ae72397f5cf14a028c82cbb8878e21f1db
+ remote: https://github.com/jnunemaker/twitter.git
+ revision: 20bcc2aa717d86f8c17d969eb7c7d56b110c2f0d
specs:
- curb (0.7.15)
+ twitter (2.1.0)
+ activesupport (>= 2.3.9, < 4)
+ faraday (~> 0.7)
+ multi_json (~> 1.0)
+ simple_oauth (~> 0.1)
+
+GIT
+ remote: https://github.com/pauldix/feedzirra.git
+ revision: dee1454980e7b93022776cd047ad419da3999332
+ specs:
+ feedzirra (0.1.1)
+ activesupport (>= 3.0.8)
+ builder (>= 2.1.2)
+ curb (~> 0.7.15)
+ i18n (>= 0.5.0)
+ loofah (~> 1.2.0)
+ nokogiri (>= 1.4.4)
+ rake (>= 0.8.7)
+ rdoc (~> 3.8)
+ sax-machine (~> 0.1.0)
GEM
remote: http://rubygems.org/
- remote: http://gems.github.com/
specs:
SystemTimer (1.2.3)
ZenTest (4.5.0)
- aasm (2.2.0)
+ aasm (3.0.2)
+ activerecord
acl9 (0.12.0)
- 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.0.rc1)
- addressable (2.2.4)
- amazon-ecs (2.2.1)
- nokogiri (>= 1.4.0)
- ruby-hmac (>= 0.3.2)
- awesome_print (0.3.2)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
+ mail (~> 2.3.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ acts-as-taggable-on (2.2.2)
+ rails (~> 3.0)
+ acts_as_tree (0.1.1)
+ addressable (2.2.6)
+ airbrake (3.0.9)
+ activesupport
+ builder
+ amazon-ecs (2.2.4)
+ nokogiri (~> 1.4)
+ ruby-hmac (~> 0.3)
+ arel (2.2.1)
+ awesome_print (1.0.2)
aws-s3 (0.6.2)
builder
mime-types
xml-simple
- bitly (0.6.1)
+ aws-sdk (1.3.4)
+ httparty (~> 0.7)
+ json (~> 1.4)
+ nokogiri (>= 1.4.4)
+ uuidtools (~> 2.1)
+ babosa (0.3.6)
+ bitly (0.7.0)
crack (>= 0.1.4)
- httparty (>= 0.5.2)
- oauth2 (>= 0.1.1)
- builder (2.1.2)
- capistrano (2.5.10)
+ httparty (>= 0.7.6)
+ oauth2 (~> 0.5.0)
+ builder (3.0.0)
+ capistrano (2.9.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
- net-ssh-gateway (>= 1.0.0)
+ net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
- childprocess (0.1.8)
+ capybara (1.1.2)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (~> 2.0)
+ xpath (~> 0.1.4)
+ childprocess (0.3.1)
ffi (~> 1.0.6)
chunky_png (1.2.5)
- compass (0.11.5)
- chunky_png (~> 1.2)
- fssm (>= 0.2.7)
- sass (~> 3.1)
- compass-960-plugin (0.10.3)
+ cocaine (0.2.1)
+ compass-960-plugin (0.10.4)
compass (>= 0.10.0)
- configuration (1.2.0)
- crack (0.1.8)
- cucumber (0.10.2)
+ crack (0.3.1)
+ cucumber (1.1.4)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
- gherkin (>= 2.3.5)
+ gherkin (~> 2.7.1)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.5)
- cucumber-rails (0.3.2)
- cucumber (>= 0.8.0)
- diff-lcs (1.1.2)
+ term-ansicolor (>= 1.0.6)
+ cucumber-rails (1.2.1)
+ capybara (>= 1.1.2)
+ cucumber (>= 1.1.3)
+ nokogiri (>= 1.5.0)
+ curb (0.7.18)
+ daemon_controller (1.0.0)
+ database_cleaner (0.7.0)
+ diff-lcs (1.1.3)
erubis (2.7.0)
- factory_girl (1.3.3)
- faker (0.9.5)
- i18n (~> 0.4)
- faraday (0.6.1)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
- faraday_middleware (0.6.5)
- faraday (~> 0.6.0)
- ffi (1.0.7)
- rake (>= 0.8.7)
- formtastic (1.1.0)
- actionpack (>= 2.3.0)
- activesupport (>= 2.3.0)
- i18n (>= 0.4.0)
- friendly_id (2.2.7)
- activerecord (>= 2.2.3)
- activesupport (>= 2.2.3)
- fssm (0.2.7)
- gherkin (2.3.7)
+ factory_girl (2.5.2)
+ activesupport (>= 2.3.9)
+ faraday (0.7.6)
+ addressable (~> 2.2)
+ multipart-post (~> 1.1)
+ rack (~> 1.1)
+ fastthread (1.0.7)
+ ffi (1.0.11)
+ friendly_id (3.3.1)
+ babosa (~> 0.3.0)
+ fssm (0.2.8.1)
+ gherkin (2.7.7)
json (>= 1.4.6)
- haml (3.1.3)
- hashie (1.0.0)
- highline (1.6.1)
- hoptoad_notifier (2.4.9)
- activesupport
- builder
- httparty (0.7.8)
- crack (= 0.1.8)
- i18n (0.5.0)
- json (1.4.6)
- json_pure (1.5.1)
- kgio (2.4.0)
- launchy (0.4.0)
- configuration (>= 0.0.5)
- rake (>= 0.8.1)
- loofah (0.4.7)
- nokogiri (>= 1.3.3)
- mime-types (1.16)
- mogli (0.0.28)
- httparty (>= 0.4.3)
- multi_json (1.0.3)
- multi_xml (0.2.2)
- multipart-post (1.1.0)
- mysql (2.8.1)
- net-ldap (0.2.2)
- net-scp (1.0.2)
+ haml (3.1.4)
+ hashie (1.2.0)
+ highline (1.6.11)
+ hike (1.2.1)
+ httmultiparty (0.3.6)
+ httparty (>= 0.7.3)
+ multipart-post
+ httparty (0.8.1)
+ multi_json
+ multi_xml
+ i18n (0.6.0)
+ json (1.6.5)
+ launchy (2.0.5)
+ addressable (~> 2.2.6)
+ loofah (1.2.0)
+ nokogiri (>= 1.4.4)
+ mail (2.3.0)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
+ multi_xml (0.4.1)
+ multipart-post (1.1.5)
+ mysql2 (0.3.11)
+ net-scp (1.0.4)
net-ssh (>= 1.99.1)
- net-sftp (2.0.2)
+ net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.0.15)
- net-ssh-gateway (1.0.1)
+ net-ssh (2.3.0)
+ net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- newrelic_rpm (2.14.1)
- nokogiri (1.4.7)
- oa-basic (0.2.6)
- oa-core (= 0.2.6)
- rest-client (~> 1.6.0)
- oa-core (0.2.6)
- oa-enterprise (0.2.6)
- addressable (= 2.2.4)
- net-ldap (~> 0.2.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.6)
- pyu-ruby-sasl (~> 0.0.3.1)
- rubyntlm (~> 0.1.1)
- oa-more (0.2.6)
- multi_json (~> 1.0.0)
- oa-core (= 0.2.6)
- rest-client (~> 1.6.0)
- oa-oauth (0.2.6)
- faraday (~> 0.6.1)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.2.2)
- oa-core (= 0.2.6)
- oauth (~> 0.4.0)
- oauth2 (~> 0.4.1)
- oa-openid (0.2.6)
- oa-core (= 0.2.6)
- rack-openid (~> 1.3.1)
- ruby-openid-apps-discovery (~> 1.2.0)
+ newrelic_rpm (3.3.1)
+ nokogiri (1.5.0)
oauth (0.4.5)
- oauth2 (0.4.1)
- faraday (~> 0.6.1)
- multi_json (>= 0.0.5)
- omniauth (0.2.6)
- oa-basic (= 0.2.6)
- oa-core (= 0.2.6)
- oa-enterprise (= 0.2.6)
- oa-more (= 0.2.6)
- oa-oauth (= 0.2.6)
- oa-openid (= 0.2.6)
- paperclip (2.3.11)
+ oauth-plugin (0.4.0.rc2)
+ multi_json
+ oauth (~> 0.4.4)
+ oauth2
+ rack
+ oauth2 (0.5.2)
+ faraday (~> 0.7)
+ multi_json (~> 1.0)
+ omniauth (1.0.1)
+ hashie (~> 1.2)
+ rack
+ omniauth-oauth (1.0.0)
+ oauth
+ omniauth (~> 1.0)
+ omniauth-oauth2 (1.0.0)
+ oauth2 (~> 0.5.0)
+ omniauth (~> 1.0)
+ omniauth-twitter (0.0.8)
+ omniauth-oauth (~> 1.0)
+ paperclip (2.6.0)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
- pickle (0.4.7)
+ cocaine (>= 0.0.2)
+ mime-types
+ passenger (3.0.11)
+ daemon_controller (>= 0.2.5)
+ fastthread (>= 1.0.1)
+ rack
+ rake (>= 0.8.1)
+ pickle (0.4.10)
cucumber (>= 0.8)
rake
- pyu-ruby-sasl (0.0.3.3)
- rack (1.1.0)
- rack-openid (1.3.1)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
- rack-test (0.6.0)
+ polyglot (0.3.3)
+ prototype-rails (3.1.0)
+ rails (~> 3.1)
+ rack (1.3.6)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
+ rack (>= 1.0.0)
+ rack-protection (1.2.0)
+ rack
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- 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)
- rake (0.8.7)
- rcov (0.9.9)
- redis (2.2.0)
- redis-namespace (0.10.0)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
+ bundler (~> 1.0)
+ railties (= 3.1.3)
+ rails-dev-tweaks (0.6.1)
+ actionpack (~> 3.1)
+ railties (~> 3.1)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rcov (1.0.0)
+ rdoc (3.12)
+ json (~> 1.4)
+ redis (2.2.2)
+ redis-namespace (1.0.3)
redis (< 3.0.0)
- redis-store (1.0.0.beta5)
- redis (>= 2.0.0)
- redis (~> 2.2.0)
- resque (1.15.0)
- json (~> 1.4.6)
- redis-namespace (>= 0.10.0)
- sinatra (>= 0.9.2)
- vegas (~> 0.1.2)
+ redis-store (1.0.0.1)
+ redis (~> 2.2.1)
+ resque-retry (0.2.2)
+ rake
+ resque (>= 1.8.0)
+ resque-scheduler (>= 1.8.0)
resque-scheduler (1.9.9)
redis (>= 2.0.1)
resque (>= 1.8.0)
rufus-scheduler
- rest-client (1.6.7)
- mime-types (>= 1.16)
- rr (1.0.2)
- rspec (1.3.0)
- rspec-rails (1.3.2)
- rack (>= 1.0.0)
- rspec (>= 1.3.0)
+ routing-filter (0.3.0)
+ actionpack
+ rr (1.0.4)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
ruby-hmac (0.4.0)
- ruby-openid (2.1.8)
- ruby-openid-apps-discovery (1.2.0)
- ruby-openid (>= 2.1.7)
- rubyntlm (0.1.1)
- rubyzip (0.9.4)
- rufus-scheduler (2.0.9)
+ rubyzip (0.9.6.1)
+ rufus-scheduler (2.0.16)
tzinfo (>= 0.3.23)
- sass (3.1.10)
- selenium-webdriver (0.2.0)
- childprocess (>= 0.1.7)
- ffi (>= 1.0.7)
- json_pure
+ sass (3.1.15)
+ sass-rails (3.1.5)
+ actionpack (~> 3.1.0)
+ railties (~> 3.1.0)
+ sass (~> 3.1.10)
+ tilt (~> 1.3.2)
+ sax-machine (0.1.0)
+ nokogiri (> 0.0.0)
+ selenium-webdriver (2.19.0)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0.9)
+ multi_json (~> 1.0.4)
rubyzip
simple_oauth (0.1.5)
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
- sitemap_generator (1.5.2)
- term-ansicolor (1.0.5)
- tilt (1.3)
- twitter (1.6.0)
- faraday (~> 0.6.1)
- faraday_middleware (~> 0.6.3)
- hashie (~> 1.0.0)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.2.0)
- simple_oauth (~> 0.1.5)
- tzinfo (0.3.23)
- unicorn (3.6.2)
- kgio (~> 2.3)
- rack
- vegas (0.1.8)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ sitemap_generator (3.0.0)
+ builder
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ term-ansicolor (1.0.7)
+ thor (0.14.6)
+ thumbs_up (0.4.6)
+ activerecord
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.31)
+ uuidtools (2.1.2)
+ vegas (0.1.11)
rack (>= 1.0.0)
- will_paginate (2.3.15)
+ will_paginate (3.0.3)
wirble (0.1.3)
- xml-simple (1.0.12)
+ xml-simple (1.1.1)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -284,59 +371,63 @@ PLATFORMS
DEPENDENCIES
SystemTimer
- ZenTest
+ ZenTest (= 4.5.0)
aasm
acl9
- acts-as-taggable-on (= 2.0.0.rc1)
+ acts-as-taggable-on
+ acts_as_tree
+ airbrake
amazon-ecs
awesome_print
aws-s3
+ aws-sdk
bitly
- builder (= 2.1.2)
capistrano
capistrano-ext
- capybara!
- compass (= 0.11.5)
+ capybara (= 1.1.2)
+ compass!
compass-960-plugin
cucumber
- cucumber-rails (= 0.3.2)
- curb!
- database_cleaner!
- erubis
+ cucumber-rails
+ database_cleaner (= 0.7.0)
factory_girl
- faker
feedzirra!
- formtastic (= 1.1.0)
- friendly_id (= 2.2.7)
- haml (= 3.1.3)
- hoptoad_notifier
- json (= 1.4.6)
- json_pure (= 1.5.1)
+ formtastic!
+ friendly_id (= 3.3.1)
+ haml
+ i18n_backend_database!
+ json
launchy
- loofah (= 0.4.7)
- mogli
- mysql
+ loofah
+ mogli!
+ mysql2
newrelic_rpm
nokogiri
- oauth
- omniauth (~> 0.2.6)
+ oauth-plugin (>= 0.4.0.pre1)
+ omniauth (= 1.0.1)
+ omniauth-facebook!
+ omniauth-twitter
paperclip
+ passenger
pickle
- rack (= 1.1.0)
- rails (= 2.3.11)
+ prototype-rails
+ rails (= 3.1.3)
+ rails-dev-tweaks
rcov
redis
redis-namespace
- redis-store (= 1.0.0.beta5)
- resque
+ redis-store
+ resque!
+ resque-retry
resque-scheduler
+ routing-filter
rr
- rspec (= 1.3.0)
- rspec-rails (= 1.3.2)
- sax-machine!
+ rspec
+ rspec-rails
+ sass-rails
sitemap_generator
- twitter
- tzinfo (= 0.3.23)
- unicorn
- will_paginate (~> 2.3.11)
+ sprockets
+ thumbs_up
+ twitter!
+ will_paginate
wirble
View
261 README
@@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+ <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+ <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+ "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+ class WeblogController < ActionController::Base
+ def destroy
+ @weblog = Weblog.find(params[:id])
+ @weblog.destroy
+ logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+ end
+ end
+
+The result will be a message in your log file along the lines of:
+
+ Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+ class WeblogController < ActionController::Base
+ def index
+ @posts = Post.all
+ debugger
+ end
+ end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+ >> @posts.inspect
+ => "[#<Post:0x14a6be8
+ @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+ #<Post:0x14a6620
+ @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+ >> @posts.first.title = "hello from a debugger"
+ => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+ >> f = @posts.first
+ => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+ >> f.
+ Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+ made to the database.
+* Passing an environment name as an argument will load the corresponding
+ environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+ |-- app
+ | |-- assets
+ | |-- images
+ | |-- javascripts
+ | `-- stylesheets
+ | |-- controllers
+ | |-- helpers
+ | |-- mailers
+ | |-- models
+ | `-- views
+ | `-- layouts
+ |-- config
+ | |-- environments
+ | |-- initializers
+ | `-- locales
+ |-- db
+ |-- doc
+ |-- lib
+ | `-- tasks
+ |-- log
+ |-- public
+ |-- script
+ |-- test
+ | |-- fixtures
+ | |-- functional
+ | |-- integration
+ | |-- performance
+ | `-- unit
+ |-- tmp
+ | |-- cache
+ | |-- pids
+ | |-- sessions
+ | `-- sockets
+ `-- vendor
+ |-- assets
+ `-- stylesheets
+ `-- plugins
+
+app
+ Holds all the code that's specific to this particular application.
+
+app/assets
+ Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+ Holds controllers that should be named like weblogs_controller.rb for
+ automated URL mapping. All controllers should descend from
+ ApplicationController which itself descends from ActionController::Base.
+
+app/models
+ Holds models that should be named like post.rb. Models descend from
+ ActiveRecord::Base by default.
+
+app/views
+ Holds the template files for the view that should be named like
+ weblogs/index.html.erb for the WeblogsController#index action. All views use
+ eRuby syntax by default.
+
+app/views/layouts
+ Holds the template files for layouts to be used with views. This models the
+ common header/footer method of wrapping views. In your views, define a layout
+ using the <tt>layout :default</tt> and create a file named default.html.erb.
+ Inside default.html.erb, call <% yield %> to render the view using this
+ layout.
+
+app/helpers
+ Holds view helpers that should be named like weblogs_helper.rb. These are
+ generated for you automatically when using generators for controllers.
+ Helpers can be used to wrap functionality for your views into methods.
+
+config
+ Configuration files for the Rails environment, the routing map, the database,
+ and other dependencies.
+
+db
+ Contains the database schema in schema.rb. db/migrate contains all the
+ sequence of Migrations for your schema.
+
+doc
+ This directory is where your application documentation will be stored when
+ generated using <tt>rake doc:app</tt>
+
+lib
+ Application specific libraries. Basically, any kind of custom code that
+ doesn't belong under controllers, models, or helpers. This directory is in
+ the load path.
+
+public
+ The directory available for the web server. Also contains the dispatchers and the
+ default HTML files. This should be set as the DOCUMENT_ROOT of your web
+ server.
+
+script
+ Helper scripts for automation and generation.
+
+test
+ Unit and functional tests along with fixtures. When using the rails generate
+ command, template test files will be generated for you and placed in this
+ directory.
+
+vendor
+ External libraries that the application depends on. Also includes the plugins
+ subdirectory. If the app has frozen rails, those gems also go here, under
+ vendor/rails/. This directory is in the load path.
View
33 README.md
@@ -86,6 +86,7 @@ The primary(required) config files are:
* database.yml
* facebooker.yml -- remember to set callback_url to your base site, ie http://my.site.com
+ * locales.yml -- select the languagues you will be using
The optional config files for advanced settings are:
@@ -96,13 +97,21 @@ The optional config files for advanced settings are:
* menu.yml -- configure what menu items you want to appear in your application
* application.god for use with the [God monitoring system](http://god.rubyforge.org/)
* unicorn.conf.rb
- * locales.yml -- select the languagues you will be using
* There are a number of other advanced files in the config directory
We provide .sample files for the majority of these config files to facilitate easy setup.
As mentioned above, when you set your config options, **remember to use** http://my.site.com and **not** http://my.site.com/iframe/
+Internationalization (Locales)
+------------------------------
+
+For every language you add in the file config/locales.yml (there is a sample file named config/locales.yml.sample), you
+should be sure that you check all the files under /config/locales and create the right locale file for it.
+In example, if you add the language "Spanish" with the code "es", you should make sure that under the directory
+/config/locales, in each subdirectory, there is a file names es.yml with the right translation.
+
+
Install dependencies and setup the framework
--------------------------------------------
@@ -112,15 +121,33 @@ Now that we got the hard part out of the way, there are just a few commands left
sudo gem install bundler
# Install the required gems
bundle install
+ # Copy the locales file
+ cp config/locales.yml.sample config/locales.yml
+ # Copy the application file
+ cp config/application.yml.sample config/application.yml
+ # Copy the providers file
+ # Edit the providers file and enter your Facebook app ID and secret key in the appropriate spots
+ cp config/providers.yml.sample config/providers.yml
+ # Copy the databas file
+ cp config/database.yml.sample config/database.yml
+ # Create the database
+ bundle exec rake db:create
+ # Create a database user
+ # Temporary workaround for locales bootstrap issue
+ # This is strictly to initialize the database so there is at least a locales table in existence to
+ # prevent i18n_backend_database from exploding while bootstrapping itself.
+ mysql -u mydbuser -p my_n2_db < db/development_structure.sql
# Run the newscloud setup process, this will create your database along with configuring your application
- rake n2:setup
+ bundle exec rake n2:setup
+ # Load the default locales
+ bundle exec rake i18n:populate:update_from_rails
Post Installation
-----------------
You can now run your application in the typical rails fashion by doing:
- ruby script/server
+ rails server
or by whatever means you normally use.
View
19 Rakefile
@@ -1,23 +1,10 @@
+#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require 'thread'
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
+require File.expand_path('../config/application', __FILE__)
require 'resque/tasks'
require 'resque_scheduler/tasks'
-begin
- require 'sitemap_generator/tasks'
- rescue Exception => e
- puts "Warning, couldn't load gem tasks: #{e.message}! Skipping..."
-end
-
-# Load paperclip tasks
-import File.expand_path(File.join(Gem.datadir('paperclip'), '..', '..', 'lib', 'tasks', 'paperclip.rake'))
+N2::Application.load_tasks
View
0  ...c/stylesheets/active_scaffold/DO_NOT_EDIT → ...assets/images/active_scaffold/DO_NOT_EDIT
File renamed without changes
View
0  ...ic/images/active_scaffold/default/add.gif → ...ts/images/active_scaffold/default/add.gif
File renamed without changes
View
0  ...es/active_scaffold/default/arrow_down.gif → ...es/active_scaffold/default/arrow_down.gif
File renamed without changes
View
0  ...ages/active_scaffold/default/arrow_up.gif → ...ages/active_scaffold/default/arrow_up.gif
File renamed without changes
View
0  .../images/active_scaffold/default/close.gif → .../images/active_scaffold/default/close.gif
File renamed without changes
View
0  .../images/active_scaffold/default/cross.png → .../images/active_scaffold/default/cross.png
File renamed without changes
View
0  ...tive_scaffold/default/indicator-small.gif → ...tive_scaffold/default/indicator-small.gif
File renamed without changes
View
0  ...ges/active_scaffold/default/indicator.gif → ...ges/active_scaffold/default/indicator.gif
File renamed without changes
View
0  ...ges/active_scaffold/default/magnifier.png → ...ges/active_scaffold/default/magnifier.png
File renamed without changes
View
0  public/images/admin/btn-off.gif → app/assets/images/admin/btn-off.gif
File renamed without changes
View
0  public/images/admin/btn-on.gif → app/assets/images/admin/btn-on.gif
File renamed without changes
View
0  public/images/arrow/down.png → app/assets/images/arrow/down.png
File renamed without changes
View
0  public/images/arrow/down_dark.png → app/assets/images/arrow/down_dark.png
File renamed without changes
View
0  public/images/arrow/left.png → app/assets/images/arrow/left.png
File renamed without changes
View
0  public/images/arrow/left_dark.png → app/assets/images/arrow/left_dark.png
File renamed without changes
View
0  public/images/arrow/navigator.png → app/assets/images/arrow/navigator.png
File renamed without changes
View
0  public/images/arrow/right.png → app/assets/images/arrow/right.png
File renamed without changes
View
0  public/images/arrow/right_dark.png → app/assets/images/arrow/right_dark.png
File renamed without changes
View
0  public/images/arrow/up.png → app/assets/images/arrow/up.png
File renamed without changes
View
0  public/images/arrow/up_dark.png → app/assets/images/arrow/up_dark.png
File renamed without changes
View
0  public/images/arrows-ffffff.png → app/assets/images/arrows-ffffff.png
File renamed without changes
View
0  public/images/asc.gif → app/assets/images/asc.gif
File renamed without changes
View
0  public/images/authbuttons/aol_128.png → app/assets/images/authbuttons/aol_128.png
File renamed without changes
View
0  public/images/authbuttons/aol_256.png → app/assets/images/authbuttons/aol_256.png
File renamed without changes
View
0  public/images/authbuttons/aol_32.png → app/assets/images/authbuttons/aol_32.png
File renamed without changes
View
0  public/images/authbuttons/aol_64.png → app/assets/images/authbuttons/aol_64.png
File renamed without changes
View
0  public/images/authbuttons/basecamp_128.png → ...ssets/images/authbuttons/basecamp_128.png
Diff not rendered
View
0  public/images/authbuttons/basecamp_256.png → ...ssets/images/authbuttons/basecamp_256.png
Diff not rendered
View
0  public/images/authbuttons/basecamp_32.png → ...assets/images/authbuttons/basecamp_32.png
Diff not rendered
View
0  public/images/authbuttons/basecamp_64.png → ...assets/images/authbuttons/basecamp_64.png
Diff not rendered
View
0  public/images/authbuttons/campfire_128.png → ...ssets/images/authbuttons/campfire_128.png
Diff not rendered
View
0  public/images/authbuttons/campfire_256.png → ...ssets/images/authbuttons/campfire_256.png
Diff not rendered
View
0  public/images/authbuttons/campfire_32.png → ...assets/images/authbuttons/campfire_32.png
Diff not rendered
View
0  public/images/authbuttons/campfire_64.png → ...assets/images/authbuttons/campfire_64.png
Diff not rendered
View
0  public/images/authbuttons/facebook_128.png → ...ssets/images/authbuttons/facebook_128.png
Diff not rendered
View
0  public/images/authbuttons/facebook_256.png → ...ssets/images/authbuttons/facebook_256.png
Diff not rendered
View
0  public/images/authbuttons/facebook_32.png → ...assets/images/authbuttons/facebook_32.png
Diff not rendered
View
0  public/images/authbuttons/facebook_64.png → ...assets/images/authbuttons/facebook_64.png
Diff not rendered
View
0  public/images/authbuttons/github_128.png → app/assets/images/authbuttons/github_128.png
Diff not rendered
View
0  public/images/authbuttons/github_256.png → app/assets/images/authbuttons/github_256.png
Diff not rendered
View
0  public/images/authbuttons/github_32.png → app/assets/images/authbuttons/github_32.png
Diff not rendered
View
0  public/images/authbuttons/github_64.png → app/assets/images/authbuttons/github_64.png
Diff not rendered
View
0  public/images/authbuttons/google_128.png → app/assets/images/authbuttons/google_128.png
Diff not rendered
View
0  public/images/authbuttons/google_256.png → app/assets/images/authbuttons/google_256.png
Diff not rendered
View
0  public/images/authbuttons/google_32.png → app/assets/images/authbuttons/google_32.png
Diff not rendered
View
0  public/images/authbuttons/google_64.png → app/assets/images/authbuttons/google_64.png
Diff not rendered
View
0  public/images/authbuttons/linkedin_128.png → ...ssets/images/authbuttons/linkedin_128.png
Diff not rendered
View
0  public/images/authbuttons/linkedin_256.png → ...ssets/images/authbuttons/linkedin_256.png
Diff not rendered
View
0  public/images/authbuttons/linkedin_32.png → ...assets/images/authbuttons/linkedin_32.png
Diff not rendered
View
0  public/images/authbuttons/linkedin_64.png → ...assets/images/authbuttons/linkedin_64.png
Diff not rendered
View
0  public/images/authbuttons/myspace_128.png → ...assets/images/authbuttons/myspace_128.png
Diff not rendered
View
0  public/images/authbuttons/myspace_256.png → ...assets/images/authbuttons/myspace_256.png
Diff not rendered
View
0  public/images/authbuttons/myspace_32.png → app/assets/images/authbuttons/myspace_32.png
Diff not rendered
View
0  public/images/authbuttons/myspace_64.png → app/assets/images/authbuttons/myspace_64.png
Diff not rendered
View
0  public/images/authbuttons/openid_128.png → app/assets/images/authbuttons/openid_128.png
Diff not rendered
View
0  public/images/authbuttons/openid_256.png → app/assets/images/authbuttons/openid_256.png
Diff not rendered
View
0  public/images/authbuttons/openid_32.png → app/assets/images/authbuttons/openid_32.png
Diff not rendered
View
0  public/images/authbuttons/openid_64.png → app/assets/images/authbuttons/openid_64.png
Diff not rendered
View
0  public/images/authbuttons/presently_128.png → ...sets/images/authbuttons/presently_128.png
Diff not rendered
View
0  public/images/authbuttons/presently_256.png → ...sets/images/authbuttons/presently_256.png
Diff not rendered
View
0  public/images/authbuttons/presently_32.png → ...ssets/images/authbuttons/presently_32.png
Diff not rendered
View
0  public/images/authbuttons/presently_64.png → ...ssets/images/authbuttons/presently_64.png
Diff not rendered
View
0  public/images/authbuttons/twitter_128.png → ...assets/images/authbuttons/twitter_128.png
Diff not rendered
View
0  public/images/authbuttons/twitter_256.png → ...assets/images/authbuttons/twitter_256.png
Diff not rendered
View
0  public/images/authbuttons/twitter_32.png → app/assets/images/authbuttons/twitter_32.png
Diff not rendered
View
0  public/images/authbuttons/twitter_64.png → app/assets/images/authbuttons/twitter_64.png
Diff not rendered
View
0  public/images/authbuttons/yahoo_128.png → app/assets/images/authbuttons/yahoo_128.png
Diff not rendered
View
0  public/images/authbuttons/yahoo_256.png → app/assets/images/authbuttons/yahoo_256.png
Diff not rendered
View
0  public/images/authbuttons/yahoo_32.png → app/assets/images/authbuttons/yahoo_32.png
Diff not rendered
View
0  public/images/authbuttons/yahoo_64.png → app/assets/images/authbuttons/yahoo_64.png
Diff not rendered
View
0  public/images/bg.gif → app/assets/images/bg.gif
Diff not rendered
View
BIN  app/assets/images/default/ad-bg-title.gif
Diff not rendered
View
0  public/images/site/advertise_here.png → app/assets/images/default/advertise_here.png
Diff not rendered
View
BIN  app/assets/images/default/bookmarklet-BG.gif
Diff not rendered
View
BIN  app/assets/images/default/bookmarklet-demo.png
Diff not rendered
View
BIN  app/assets/images/default/bookmarklet-header-BG.png
Diff not rendered
View
BIN  app/assets/images/default/btn-off.gif
Diff not rendered
View
BIN  app/assets/images/default/btn-on.gif
Diff not rendered
View
BIN  app/assets/images/default/bullet1.gif
Diff not rendered
View
0  public/images/site/caption-bg.png → app/assets/images/default/caption-bg.png
Diff not rendered
View
0  public/images/site/curtain.png → app/assets/images/default/curtain.png
Diff not rendered
View
BIN  app/assets/images/default/default_thumb.gif
Diff not rendered
View
BIN  app/assets/images/default/default_thumb_b.gif
Diff not rendered
View
BIN  app/assets/images/default/disabled-btn.gif
Diff not rendered
View
BIN  app/assets/images/default/dropdown_arrow.gif
Diff not rendered
View
BIN  app/assets/images/default/favicon.gif
Diff not rendered
View
BIN  app/assets/images/default/form-btn-off.png
Diff not rendered
View
BIN  app/assets/images/default/form-btn-on.png
Diff not rendered
View
0  public/images/site/form-tab.png → app/assets/images/default/form-tab.png
Diff not rendered
View
BIN  app/assets/images/default/hdr-logo.png
Diff not rendered
View
BIN  app/assets/images/default/hdr_bg.gif
Diff not rendered
View
0  public/images/site/home-icon-off.png → app/assets/images/default/home-icon-off.png
Diff not rendered
View
0  public/images/site/home-icon-selected.png → ...ets/images/default/home-icon-selected.png
Diff not rendered
View
BIN  app/assets/images/default/house-ad-banner.jpg
Diff not rendered
View
BIN  app/assets/images/default/house-ad-bg.gif
Diff not rendered
View
BIN  app/assets/images/default/house-ad-profile.jpg
Diff not rendered
View
BIN  app/assets/images/default/icon-answer.png
Diff not rendered
View
BIN  app/assets/images/default/icon-article.png
Diff not rendered
View
BIN  app/assets/images/default/icon-comment.png
Diff not rendered
View
BIN  app/assets/images/default/icon-event.png
Diff not rendered
View
BIN  app/assets/images/default/icon-fan-app.gif
Diff not rendered
View
0  public/images/skin/icon-host-badge.png → ...assets/images/default/icon-host-badge.png
Diff not rendered
View
BIN  app/assets/images/default/icon-idea.png
Diff not rendered
View
BIN  app/assets/images/default/icon-mod-badge.png
Diff not rendered
View
BIN  app/assets/images/default/icon-question.png
Diff not rendered
View
BIN  app/assets/images/default/icon-resource.png
Diff not rendered
View
BIN  app/assets/images/default/icon_facebook.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_flag.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_newscloud.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_photo.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_rss.png
Diff not rendered
View
BIN  app/assets/images/default/icon_thumbs.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_tweet.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_twitter.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_video.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_vote_down.gif
Diff not rendered
View
BIN  app/assets/images/default/icon_vote_up.gif
Diff not rendered
View
BIN  app/assets/images/default/medium_watermark.jpg
Diff not rendered
View
BIN  app/assets/images/default/pagetab-bg-hover.gif
Diff not rendered
View
BIN  app/assets/images/default/pagetab-bg-off.gif
Diff not rendered
View
BIN  app/assets/images/default/pagetab-bg-on.gif
Diff not rendered
View
BIN  .../lib/public/images/percentImage_back2.png → app/assets/images/default/reply_arrow.png 100755 → 100644
Diff not rendered
View
BIN  app/assets/images/default/site/ad-title-bg.gif
Diff not rendered
View
BIN  app/assets/images/default/site/btn-gradient.png
Diff not rendered
View
BIN  app/assets/images/default/site/btn-highlight.png
Diff not rendered
View
BIN  app/assets/images/default/site/dropdown-arrow.png
Diff not rendered
View
BIN  app/assets/images/default/site/featured-panel-bg.png
Diff not rendered
View
BIN  app/assets/images/default/site/icon-email.png
Diff not rendered
View
BIN  app/assets/images/default/site/icon-facebook.png
Diff not rendered
View
BIN  app/assets/images/default/site/icon-friends.png
Diff not rendered
View
BIN  app/assets/images/default/site/icon-rss.png
Diff not rendered
View
BIN  app/assets/images/default/site/icon-twitter.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-active-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-active-sml.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-active.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-blogs-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-blogs-sml.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-blogs.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-classifieds-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-classifieds.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-comments-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-comments.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-events-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-events.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-forums-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-forums.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-forumtopics-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-forumtopics.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-ideas-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-ideas.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-latest.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-media-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-media.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-news-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-news.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-predictions-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-predictions.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-qa-sml-d.png
Diff not rendered
View
BIN  app/assets/images/default/site/mark-qa.png
Diff not rendered
View
BIN  app/assets/images/default/site/meta-bullet.gif
Diff not rendered
View
0  public/images/site/bg-hdr-actions.png → ...ets/images/default/site/meta-links-bg.png
Diff not rendered
View
BIN  app/assets/images/default/site/tdv-shadow.png
Diff not rendered
View
BIN  app/assets/images/default/spacer.gif
Diff not rendered
View
0  public/images/site/spinner-tiny.gif → app/assets/images/default/spinner-tiny.gif
Diff not rendered
View
0  public/images/site/spinner.gif → app/assets/images/default/spinner.gif
Diff not rendered
View
BIN  app/assets/images/default/sponsor-bg-title.gif
Diff not rendered
View
BIN  .../lib/public/images/percentImage_back1.png → app/assets/images/default/sponsor-logo.png 100755 → 100644
Diff not rendered
View
BIN  app/assets/images/default/test-profile-pic.jpg
Diff not rendered
View
0  public/images/site/thumb-down.gif → app/assets/images/default/thumb-down.gif
Diff not rendered
View
0  public/images/site/thumb-up.gif → app/assets/images/default/thumb-up.gif
Diff not rendered
View
BIN  app/assets/images/default/topbar-bg.gif
Diff not rendered
View
BIN  app/assets/images/default/topic_arrow.gif
Diff not rendered
View
BIN  app/assets/images/default/tweet_button.gif
Diff not rendered
View
0  public/images/site/vertical_bg_animation.gif → .../images/default/vertical_bg_animation.gif
Diff not rendered
View
BIN  app/assets/images/default/watermark.jpg
Diff not rendered
View
0  public/images/desc.gif → app/assets/images/desc.gif
Diff not rendered
View
0  public/images/featured/banner.jpg → app/assets/images/featured/banner.jpg
Diff not rendered
View
0  public/images/featured/loading.gif → app/assets/images/featured/loading.gif
Diff not rendered
View
0  public/images/featured/template_1.jpg → app/assets/images/featured/template_1.jpg
Diff not rendered
View
0  public/images/featured/template_10.jpg → app/assets/images/featured/template_10.jpg
Diff not rendered
View
0  public/images/featured/template_2.jpg → app/assets/images/featured/template_2.jpg
Diff not rendered
View
0  public/images/featured/template_3.jpg → app/assets/images/featured/template_3.jpg
Diff not rendered
View
0  public/images/featured/template_32.jpg → app/assets/images/featured/template_32.jpg
Diff not rendered
View
0  public/images/featured/template_4.jpg → app/assets/images/featured/template_4.jpg
Diff not rendered
View
0  public/images/featured/template_5.jpg → app/assets/images/featured/template_5.jpg
Diff not rendered
View
0  public/images/featured/template_52.jpg → app/assets/images/featured/template_52.jpg
Diff not rendered
View
0  public/images/featured/template_6.jpg → app/assets/images/featured/template_6.jpg
Diff not rendered
View
0  public/images/featured/template_7.jpg → app/assets/images/featured/template_7.jpg
Diff not rendered
View
0  public/images/featured/template_8.jpg → app/assets/images/featured/template_8.jpg
Diff not rendered
View
0  public/images/featured/template_9.jpg → app/assets/images/featured/template_9.jpg
Diff not rendered
View
0  public/images/jquery.wysiwyg.gif → app/assets/images/jquery.wysiwyg.gif
Diff not rendered
View
0  public/images/jquery.wysiwyg.jpg → app/assets/images/jquery.wysiwyg.jpg
Diff not rendered
View
0  public/images/m/jqt/back_button.png → app/assets/images/m/jqt/back_button.png
Diff not rendered
View
0  public/images/m/jqt/back_button_clicked.png → ...sets/images/m/jqt/back_button_clicked.png
Diff not rendered
View
0  public/images/m/jqt/button.png → app/assets/images/m/jqt/button.png
Diff not rendered
View
0  public/images/m/jqt/button_clicked.png → app/assets/images/m/jqt/button_clicked.png
Diff not rendered
View
0  public/images/m/jqt/chevron.png → app/assets/images/m/jqt/chevron.png
Diff not rendered
View
0  public/images/m/jqt/chevron_circle.png → app/assets/images/m/jqt/chevron_circle.png
Diff not rendered
View
0  public/images/m/jqt/grayButton.png → app/assets/images/m/jqt/grayButton.png
Diff not rendered
View
0  public/images/m/jqt/loading.gif → app/assets/images/m/jqt/loading.gif
Diff not rendered
View
0  public/images/m/jqt/on_off.png → app/assets/images/m/jqt/on_off.png
Diff not rendered
View
0  public/images/m/jqt/rowhead.png → app/assets/images/m/jqt/rowhead.png
Diff not rendered
View
0  public/images/m/jqt/toggle.png → app/assets/images/m/jqt/toggle.png
Diff not rendered
View
0  public/images/m/jqt/toggleOn.png → app/assets/images/m/jqt/toggleOn.png
Diff not rendered
View
0  public/images/m/jqt/toolbar.png → app/assets/images/m/jqt/toolbar.png
Diff not rendered
View
0  public/images/m/jqt/whiteButton.png → app/assets/images/m/jqt/whiteButton.png
Diff not rendered
View
0  public/images/next-horizontal.png → app/assets/images/next-horizontal.png
Diff not rendered
View
0  public/images/next-vertical.png → app/assets/images/next-vertical.png
Diff not rendered
View
0  public/images/overlay/apple-close.png → app/assets/images/overlay/apple-close.png
Diff not rendered
View
0  public/images/overlay/apple.png → app/assets/images/overlay/apple.png
Diff not rendered
View
0  public/images/overlay/black.png → app/assets/images/overlay/black.png
Diff not rendered
View
0  public/images/overlay/close.png → app/assets/images/overlay/close.png
Diff not rendered
View
0  public/images/overlay/flowplayer.png → app/assets/images/overlay/flowplayer.png
Diff not rendered
View
0  public/images/overlay/gray.png → app/assets/images/overlay/gray.png
Diff not rendered
View
0  public/images/overlay/petrol.png → app/assets/images/overlay/petrol.png
Diff not rendered