Datasets:
numerata
/
diffs

Dataset card Data Studio Files
xet
 Community
1
repo
string
commit
string
message
string
diff
string
mreid/acrp
4a1ee62701745497a9778985ad7b2251da828123
Notes on configuration
diff --git a/README.markdown b/README.markdown index 29f3b5c..b88333c 100644 --- a/README.markdown +++ b/README.markdown @@ -1,28 +1,34 @@ ACRP Notes ========== Methodology ----------- A simple first question that can be asked of the data is whether there exist pairs of books (A,B) such that both A and B alon...
mreid/acrp
2fcc256dd8a4201c4a20072a61d56e654a219696
Early analysis
diff --git a/analysis.out b/analysis.out new file mode 100644 index 0000000..e71b806 --- /dev/null +++ b/analysis.out @@ -0,0 +1,218 @@ ++--------+--------+-----------+---------------------------------------------------------+---------------------------------------------------------+ +| Count1 | Count2 | BothCount | Ti...
smart/planet_anthem
d8a38249c40661312fe8e48606b5161d7953bf80
finally a tool tip fix
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index fe851e8..b340529 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,25 +1,34 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
4b8b280d98bc7c33db48991c953bb1410500b443
ruby 1.8.6 fix
diff --git a/app/presenters/product_presenter.rb b/app/presenters/product_presenter.rb index 1d1b2f8..9c73a18 100644 --- a/app/presenters/product_presenter.rb +++ b/app/presenters/product_presenter.rb @@ -1,54 +1,54 @@ class ProductPresenter DEFAULT_WIDTH = 900 DEFAULT_HEIGHT = 900 attr_reader :width, :height...
smart/planet_anthem
497d95c8948b70d80f3a8d81fefe4d463ee3817b
moving to json
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index e41e3a4..fe851e8 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,33 +1,25 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
efb3dda443ae9f68f5254366d8545f9b58edd846
moved from ajax to data attributes
diff --git a/app/views/products/_overlays.html.erb b/app/views/products/_overlays.html.erb index c74ab02..1373087 100644 --- a/app/views/products/_overlays.html.erb +++ b/app/views/products/_overlays.html.erb @@ -1,33 +1,33 @@ <script type="text/javascript"> $(function() { $("#grid").qtip({ content: '<d...
smart/planet_anthem
7b26ee9eb57a03e990c628a83abecbbf5f779dbb
more hab
diff --git a/app/models/product.rb b/app/models/product.rb index 61e4cfc..1f4a102 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,185 +1,185 @@ require 'net/http' require 'json' require 'money' class Product < ActiveRecord::Base validates_presence_of :number, :description, :cents, :qoh va...
smart/planet_anthem
80d86ee3ab7fd6c21cc7873f3e7a559afd4eda8b
opacity added at 85%
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index 42ecca4..782bfaa 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,156 +1,158 @@ body :background-color #000000 :font-family "Helvetica Neue",Helvetica,Arial,sans-serif h1 :font-size 48px :padding...
smart/planet_anthem
7ef61139469e2d79065d3364f97e0642ab9e228b
hab added
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index cdd6659..42ecca4 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,154 +1,156 @@ body :background-color #000000 :font-family "Helvetica Neue",Helvetica,Arial,sans-serif h1 :font-size 48px :padding...
smart/planet_anthem
7ff87ee9c588023ca3daabc985df8ac90e25d515
new iamges
diff --git a/public/images/products/signed_CD-dinner.jpg b/public/images/products/signed_CD-dinner.jpg index a3ed471..f2f2d6e 100644 Binary files a/public/images/products/signed_CD-dinner.jpg and b/public/images/products/signed_CD-dinner.jpg differ diff --git a/public/images/products/signed_CD-dinner_tile.jpg b/public/...
smart/planet_anthem
54828c69a54c7b9c23d631d162061c3a153646c5
donuts style
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index 5b18086..cdd6659 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,153 +1,154 @@ body :background-color #000000 :font-family "Helvetica Neue",Helvetica,Arial,sans-serif h1 :font-size 48px :padding...
smart/planet_anthem
e5dc57f099882c99152891cb5e7631229f6e2bc8
donuts and primary
diff --git a/app/models/product.rb b/app/models/product.rb index 76b2e39..61e4cfc 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,181 +1,185 @@ require 'net/http' require 'json' require 'money' class Product < ActiveRecord::Base validates_presence_of :number, :description, :cents, :qoh va...
smart/planet_anthem
d25a9d842b8249b983b36d70c7f427c84d1761ea
new overlay
diff --git a/app/views/products/_overlays.html.erb b/app/views/products/_overlays.html.erb index abb3635..c74ab02 100644 --- a/app/views/products/_overlays.html.erb +++ b/app/views/products/_overlays.html.erb @@ -1,28 +1,33 @@ <script type="text/javascript"> $(function() { $("#grid").qtip({ content: '<d...
smart/planet_anthem
0619d5f7e205dddc3ed3873d4c3e9d8456977527
new image styles
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index 8a3c45d..5b18086 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,132 +1,153 @@ body :background-color #000000 :font-family "Helvetica Neue",Helvetica,Arial,sans-serif h1 :font-size 48px :padding...
smart/planet_anthem
59e2bd22ba727543053e480c3c733ac295ae752c
new caching
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 985535e..e41e3a4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,37 +1,33 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
aee8e8e5cddb4692ab842e519005c084dc239a3f
better qtip
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index 2c7f6da..8a3c45d 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,119 +1,132 @@ body :background-color #000000 + :font-family "Helvetica Neue",Helvetica,Arial,sans-serif h1 :font-size 48px :padding...
smart/planet_anthem
40486e9276d7678b262c871aaf970143368cc749
new tiles
diff --git a/public/images/products/TLA-CD_release_show-3.15.jpg b/public/images/products/TLA-CD_release_show-3.15.jpg index aa7a0f3..bfb3f42 100644 Binary files a/public/images/products/TLA-CD_release_show-3.15.jpg and b/public/images/products/TLA-CD_release_show-3.15.jpg differ diff --git a/public/images/products/TLA...
smart/planet_anthem
8fa84c012c0b948bf542590b86e5bb5b976a0061
new product images
diff --git a/public/images/products/Planet_anthem-Future_CD2017.jpg b/public/images/products/Planet_anthem-Future_CD2017.jpg new file mode 100644 index 0000000..13e8c18 Binary files /dev/null and b/public/images/products/Planet_anthem-Future_CD2017.jpg differ diff --git a/public/images/products/signed_CD-air_duct.jpg b...
smart/planet_anthem
a8c29e6b2d3a23bb805d5c8b05a7a73c3b26f6f2
caching
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 977d3ea..985535e 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,37 +1,37 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
92da848e5bf0af1d2dace060b9cb43f5e903c080
sync route
diff --git a/config/routes.rb b/config/routes.rb index d78f4a3..e7fdd2a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,45 +1,46 @@ ActionController::Routing::Routes.draw do |map| # The priority is based upon order of creation: first created -> highest priority. # Sample of regular route: # map...
smart/planet_anthem
97e010c9381cc88f87f0ac3cf0995fca6ef5a503
product fix
diff --git a/app/models/product.rb b/app/models/product.rb index 9da75a9..b07547b 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,163 +1,163 @@ require 'net/http' require 'json' require 'money' class Product < ActiveRecord::Base validates_presence_of :number, :description, :cents, :qoh va...
smart/planet_anthem
2468088dcf90780cce8a537935fb7b57925e93c6
pre order title
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 083eb90..b1e3ce2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,28 +1,28 @@ !!! %html %head %link{ :rel => "shortcut icon", :href => "/favicon.ico", :t...
smart/planet_anthem
60c1e0c7cb7ce21ded3b89636628478ad39cacf5
disable for now
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index c813867..2c7f6da 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,107 +1,119 @@ body :background-color #000000 h1 :font-size 48px :padding 10px #background_img :height 100% :left 0 ...
smart/planet_anthem
ead91f31d7bc1b2fad9969ea942671c65c592e35
sass on heroku
diff --git a/vendor/plugins/sass_on_heroku/README.rdoc b/vendor/plugins/sass_on_heroku/README.rdoc new file mode 100644 index 0000000..43fe644 --- /dev/null +++ b/vendor/plugins/sass_on_heroku/README.rdoc @@ -0,0 +1,7 @@ += Sass on Heroku + +Rails plugin to compile Sass files to tmp/ and serve from there, avoiding trou...
smart/planet_anthem
26fdba939f9744af2bd967a95f1a5c5314ab91c9
pg added to gemfile
diff --git a/Gemfile b/Gemfile index a431924..05f2041 100644 --- a/Gemfile +++ b/Gemfile @@ -1,20 +1,23 @@ #bundle_path 'vendor/bundler_gems' source :gemcutter gem "rails", "2.3.5", :require => nil gem "haml", "2.2.17" gem "money" gem 'hoptoad_notifier' gem 'json' +gem "pg" group :development do gem "m...
smart/planet_anthem
fc1d831f8a349d39ece475dc549e95169b6756b8
gem bundler fixes
diff --git a/Gemfile b/Gemfile index 4987c88..a431924 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,20 @@ #bundle_path 'vendor/bundler_gems' source :gemcutter -source :rubyforge -gem "rails", "2.3.5" -gem "activeresource", "2.3.5", :require => "active_resource" +gem "rails", "2.3.5", :require => nil gem "haml",...
smart/planet_anthem
63f5f2281c1e8c48b76a8d525b26c6720d753029
gem bundler 0.9 migration
diff --git a/Gemfile b/Gemfile index d894a85..4987c88 100644 --- a/Gemfile +++ b/Gemfile @@ -1,19 +1,19 @@ -bundle_path 'vendor/bundler_gems' - +#bundle_path 'vendor/bundler_gems' +source :gemcutter +source :rubyforge gem "rails", "2.3.5" -gem "activeresource", "2.3.5", :require_as => "active_resource" +gem "activ...
smart/planet_anthem
16849331294d413c1315626d54a209f9633e59a1
hoptoad added
diff --git a/Gemfile b/Gemfile index 670d4d4..d894a85 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,19 @@ bundle_path 'vendor/bundler_gems' gem "rails", "2.3.5" gem "activeresource", "2.3.5", :require_as => "active_resource" gem "haml", "2.2.17" gem "money" +gem 'hoptoad_notifier' only :development do ...
smart/planet_anthem
e4ea41a998295ca1c32b7b40a60a8173794e11fc
moved to use store_id
diff --git a/app/models/product.rb b/app/models/product.rb index cf6550b..9da75a9 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,163 +1,163 @@ require 'net/http' require 'json' require 'money' class Product < ActiveRecord::Base validates_presence_of :number, :description, :cents, :qoh va...
smart/planet_anthem
ffcf1cb7637708869514d6938aa8d153b46f9192
major update
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 44b83f4..977d3ea 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,37 +1,37 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
79835f8cc7e9db5c61005307ba0dbaed56acc1e1
updating fade effect selector for new structure
diff --git a/app/views/products/_fade_effect.html.erb b/app/views/products/_fade_effect.html.erb index 3f7d94f..b852c98 100644 --- a/app/views/products/_fade_effect.html.erb +++ b/app/views/products/_fade_effect.html.erb @@ -1,30 +1,30 @@ <script type="text/javascript"> $(function() { - $("#grid > .sold_out > .p...
smart/planet_anthem
e75fba423f43004c48f6bb163c4c3bc9c2a570e4
each_slice argument was missing
diff --git a/app/views/products/index.html.haml b/app/views/products/index.html.haml index 6e7896f..a092c62 100644 --- a/app/views/products/index.html.haml +++ b/app/views/products/index.html.haml @@ -1,12 +1,12 @@ %center %h1 PLANET ANTHEM %img#background_img{:src => "images/background.png"} #grid - - @pr...
smart/planet_anthem
67e9d1eb8425b0ed7844bb6bcd76a71e0d5070f2
render in rows
diff --git a/app/presenters/product_presenter.rb b/app/presenters/product_presenter.rb index 842c08b..712bfd4 100644 --- a/app/presenters/product_presenter.rb +++ b/app/presenters/product_presenter.rb @@ -1,44 +1,41 @@ class ProductPresenter DEFAULT_WIDTH = 900 DEFAULT_HEIGHT = 900 attr_reader :width, :height...
smart/planet_anthem
eee466217227a00ee231053605cde4b7a02f217a
asset hosts
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9b8ca1e..41fd37a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,27 +1,27 @@ !!! %html %head %link{ :rel => "shortcut icon", :href => "/favicon.ico", :t...
smart/planet_anthem
d1eee9596d474e644e3448267cf2928fc7417a7a
fixed fade effect
diff --git a/app/views/products/_fade_effect.html.erb b/app/views/products/_fade_effect.html.erb index 3380013..3f7d94f 100644 --- a/app/views/products/_fade_effect.html.erb +++ b/app/views/products/_fade_effect.html.erb @@ -1,30 +1,30 @@ <script type="text/javascript"> $(function() { $("#grid > .sold_out > .p...
smart/planet_anthem
9dee05ba56aabd33c5a71815033246120bf51da4
fixed a bug in overlays partial, more tweaking of fade effect
diff --git a/app/stylesheets/main.sass b/app/stylesheets/main.sass index 88221b6..3f37b2b 100644 --- a/app/stylesheets/main.sass +++ b/app/stylesheets/main.sass @@ -1,50 +1,50 @@ body :background-color #000000 #grid :clear both :cursor pointer :background-image url(/images/main.jpg) #grid_ima...
smart/planet_anthem
fe791e17b0b20c9f219fb89600144bedeac6ee6e
js restored
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9970022..9b8ca1e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,27 +1,27 @@ !!! %html %head %link{ :rel => "shortcut icon", :href => "/favicon.ico", :t...
smart/planet_anthem
b534a2094f0a69811db7eaed929670df1dc50f5e
no more caching in dev
diff --git a/config/environments/development.rb b/config/environments/development.rb index 2834c66..85c9a60 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,17 +1,17 @@ # Settings specified here will take precedence over those in config/environment.rb # In the developme...
smart/planet_anthem
ecd1c4f494f3dda4089f71dc13482168f11bc5b2
fade effect shouldn't happen if there are no elements to fade out -- duh
diff --git a/app/views/products/_fade_effect.html.erb b/app/views/products/_fade_effect.html.erb index df86a60..1277bc1 100644 --- a/app/views/products/_fade_effect.html.erb +++ b/app/views/products/_fade_effect.html.erb @@ -1,23 +1,25 @@ <script type="text/javascript"> $(function() { var raw_elements = $.make...
smart/planet_anthem
bed13f917469f06532026b2aa4011cdd45363778
refactor for speed
diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 48c3655..44b83f4 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,21 +1,37 @@ require 'app/presenters/product_presenter' class ProductsController < ApplicationContro...
smart/planet_anthem
3e0e4b7bee384ea78bc0f2be8978259f7b7f6450
fixing qtips
diff --git a/app/views/products/_overlays.html.erb b/app/views/products/_overlays.html.erb index ddd2dcf..75e6d43 100644 --- a/app/views/products/_overlays.html.erb +++ b/app/views/products/_overlays.html.erb @@ -1,28 +1,28 @@ <script type="text/javascript"> $(function() { - $("#grid).qtip({ + $("#grid").qtip...
smart/planet_anthem
fd78a2f7255930b81ba97ee0b76d6d520647fa01
In a boredom state, i have made haiku errors. Log files should suck
diff --git a/public/404.html b/public/404.html index eff660b..77e5a9e 100644 --- a/public/404.html +++ b/public/404.html @@ -1,30 +1,30 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:...
smart/planet_anthem
9964dfa2cf25bb9f7d8e780c3708d6c3a8675159
moving to smaller div
diff --git a/app/views/products/_fade_effect.html.erb b/app/views/products/_fade_effect.html.erb index 2944969..df86a60 100644 --- a/app/views/products/_fade_effect.html.erb +++ b/app/views/products/_fade_effect.html.erb @@ -1,23 +1,23 @@ <script type="text/javascript"> $(function() { - var raw_elements = $.make...
smart/planet_anthem
1fb0bd80ed992fd56dc1944dff49f9a17f12c756
fixed a bug where the fade effect would have gotten out of sync after 20 iterations (wasn't removing all of a group)
diff --git a/app/views/products/_fade_effect.html.erb b/app/views/products/_fade_effect.html.erb index 2eef769..6aa4586 100644 --- a/app/views/products/_fade_effect.html.erb +++ b/app/views/products/_fade_effect.html.erb @@ -1,23 +1,23 @@ <script type="text/javascript"> $(function() { var raw_elements = $.make...
smart/planet_anthem
7edbdea8233fc0cfea8d495f3db85b29dc0e292d
qtip optimization
diff --git a/app/views/products/_overlays.html.erb b/app/views/products/_overlays.html.erb index e20b69a..ddd2dcf 100644 --- a/app/views/products/_overlays.html.erb +++ b/app/views/products/_overlays.html.erb @@ -1,29 +1,28 @@ <script type="text/javascript"> - <% tip_content = "<div class=\"calendar_hover\"><div clas...
smart/planet_anthem
d539553cd240a604de17b0e3fab1b825c3b10547
adding sold_out class to products
diff --git a/app/views/products/_product.html.haml b/app/views/products/_product.html.haml index 9037b68..bb06be1 100644 --- a/app/views/products/_product.html.haml +++ b/app/views/products/_product.html.haml @@ -1,8 +1,8 @@ -.product{:style => "", :id => product.id, :class => ""} +.product{:style => "", :id => product...
smart/planet_anthem
a964b64a278920fce7f899cf7726d01a676899b8
fixed jquery ui include
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8bd77f8..3f15486 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,16 +1,16 @@ !!! %html %head %link{ :rel => "shortcut icon", :href => "/favicon.ico", :t...
smart/planet_anthem
3b8946fa40a676fe975712dd6d4e7a149b06d47d
moved js includes to bottom of page (excepts jquery itself -- need the dom ready event early); consolidated qtip calls; added fade effect
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f9b8075..8bd77f8 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,16 +1,16 @@ !!! %html %head %link{ :rel => "shortcut icon", :href => "/favicon.ico", :t...
smart/planet_anthem
d75670543e4174317429f0b1efb9fba62c1c97d1
hiding root of site to public now requires /mosaic until we go live
diff --git a/config/routes.rb b/config/routes.rb index 8473b6c..c17252a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,44 +1,44 @@ ActionController::Routing::Routes.draw do |map| # The priority is based upon order of creation: first created -> highest priority. # Sample of regular route: # map...
smart/planet_anthem
5d8f8af1d0a8f9c71ae599a4523630324110b4c4
new product images
diff --git a/app/models/product.rb b/app/models/product.rb index 67342af..d0d08d6 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,73 +1,144 @@ require 'net/http' require 'json' require 'money' class Product < ActiveRecord::Base validates_presence_of :number, :description, :cents, :qoh val...
smart/planet_anthem
9b5c556e0f778c5676aab19cf343ff58f1cf5fc6
think this will fix it
diff --git a/app/views/products/_product.html.haml b/app/views/products/_product.html.haml index 09f0cf4..387ae1b 100644 --- a/app/views/products/_product.html.haml +++ b/app/views/products/_product.html.haml @@ -1,10 +1,10 @@ = render "product_overlay", :product => product .product{:style => "", :id => product.id,...
smart/planet_anthem
e20a5e0c486665da64abd5d884051c9bba324fef
gem gile
diff --git a/Gemfile b/Gemfile index 16e05ec..670d4d4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,18 @@ bundle_path 'vendor/bundler_gems' gem "rails", "2.3.5" gem "activeresource", "2.3.5", :require_as => "active_resource" -gem "haml" +gem "haml", "2.2.17" gem "money" only :development do gem "mongre...
smart/planet_anthem
3f3acddf65eefac773194a577ad8645c4559e6c2
git ignore
diff --git a/.gitignore b/.gitignore index 16bc5ca..814e73d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,14 @@ vendor/bundler_gems .DS_Store rerun.txt webrat*.* coverage *.war bin/ log/* tmp/* !tmp/.gitkeep vendor/gems/* .#* public/javascripts/all.js +db/*.sqlite3 \ No newline at end of file
smart/planet_anthem
a68c9b1b2e82537a167ea7f91310d2dafb4bf3ef
money gem
diff --git a/Gemfile b/Gemfile index 85fe3a7..16e05ec 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,18 @@ bundle_path 'vendor/bundler_gems' gem "rails", "2.3.5" gem "activeresource", "2.3.5", :require_as => "active_resource" gem "haml" +gem "money" only :development do gem "mongrel" end only :tes...
lachie/roro-faces
0e23c6f03191a10f2ad7539bb8a59e7d2f41e714
reverted change to albino
diff --git a/lib/albino.rb b/lib/albino.rb index 9f2bafd..7db692f 100644 --- a/lib/albino.rb +++ b/lib/albino.rb @@ -1,198 +1,182 @@ ## # Wrapper for the Pygments command line tool, pygmentize. # # Pygments: http://pygments.org/ # # Assumes pygmentize is in the path. If not, set its location # with Albino.bin =...
lachie/roro-faces
605ea9e4c20f44286e872b2065b3b1561a0c25eb
edit link shows where user is authed
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2e2ba48..af40959 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,121 +1,121 @@ # Filters added to this controller apply to all controllers in the applica...
lachie/roro-faces
b83e95b7cf40158b8debfba8c2e8b51a422e5903
made analogue blog proxy meetings id so that feed readers dont keep downloading
diff --git a/app/models/analogue_blog.rb b/app/models/analogue_blog.rb index 30d1b47..897c38d 100644 --- a/app/models/analogue_blog.rb +++ b/app/models/analogue_blog.rb @@ -1,39 +1,43 @@ class AnalogueBlog def self.new_from_meeting(meeting) unless meeting.analogue_blog.blank? new(meeting) end en...
lachie/roro-faces
83d6ca10b04919b848cef6d1ba7add7762213e85
tweaked feed thing
diff --git a/app/views/meetings/_feed_presos.haml b/app/views/meetings/_feed_presos.haml index cd65f75..902dcab 100644 --- a/app/views/meetings/_feed_presos.haml +++ b/app/views/meetings/_feed_presos.haml @@ -1,10 +1,10 @@ -if !meetup.presos.blank? %h4 presentations %ul -for preso in meetup.presos %l...
lachie/roro-faces
67d9110a7f0324dcaac81cdc05185feb686da756
generalising comments
diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 3985766..8c04abf 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -1,5 +1,7 @@ module UserHelper def user_link(user) - link_to user.name_with_fallback, user_url(user) + if user + link_to user.name_with_f...
lachie/roro-faces
9f2c1224c1e2cdd2dbc02e3981ab3b28a5280183
fixed feed urls
diff --git a/app/controllers/admin/presos_controller.rb b/app/controllers/admin/presos_controller.rb index c85983a..b5241de 100644 --- a/app/controllers/admin/presos_controller.rb +++ b/app/controllers/admin/presos_controller.rb @@ -1,26 +1,26 @@ class Admin::PresosController < Admin::ApplicationController before_f...
lachie/roro-faces
f747831989b431e3126d0f47098672e905fa9caa
added resources
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e75f7f5..e947cf9 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,81 +1,82 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict...
lachie/roro-faces
7b7b81397a9baf75b5608b5223fe78a069b89e65
changed ad tag to feedburner after all
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 14a1bef..e75f7f5 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,81 +1,81 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict...
lachie/roro-faces
5e3d99820cae137aa3039196af8fa349f6a4ec49
fixed ad tag
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 180986f..14a1bef 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,81 +1,81 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict...
lachie/roro-faces
d05421f97eb6dbe9794521223f880e14225c03f7
added auto discovery tag
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f43b47e..180986f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,79 +1,81 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict...
lachie/roro-faces
8c827038a2d9eff63a4482394fda8b29074a0799
tweaks to meeting feed
diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb new file mode 100644 index 0000000..3985766 --- /dev/null +++ b/app/helpers/user_helper.rb @@ -0,0 +1,5 @@ +module UserHelper + def user_link(user) + link_to user.name_with_fallback, user_url(user) + end +end diff --git a/app/models/analogue_blog...
lachie/roro-faces
272f128cc35c06133d7f8dbb30d86600319a273b
added meeting feed
diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb index 681335b..6955fca 100644 --- a/app/controllers/meetings_controller.rb +++ b/app/controllers/meetings_controller.rb @@ -1,12 +1,21 @@ class MeetingsController < ApplicationController before_filter :load_group + + def i...
lachie/roro-faces
b76aa4baf8857be20818474a1f6acfaf629f341b
transition from RA
diff --git a/app/models/user.rb b/app/models/user.rb index 9fb4daa..0e4d5c5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,382 +1,384 @@ require 'digest/sha1' module ThankyouExt def last_month # find(:all, :conditions => 'date(updated_at) > cur_date()-1') end end class User < ActiveRe...
lachie/roro-faces
b1e49db51379f5481de92b8386a41a3e0ea249f2
getting openid to work
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 9aa557b..6183518 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -1,25 +1,27 @@ class UserSessionsController < ApplicationController before_filte...
lachie/roro-faces
9abe656866413e1963caaf97266228034fbc9645
tweaking login flow
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b6c53c0..2e2ba48 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,121 +1,121 @@ # Filters added to this controller apply to all controllers in the applica...
lachie/roro-faces
ff90349d1e25fd847aaad02f04ed1474d6c9c7f1
finished switching to basic authlogic
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb deleted file mode 100644 index 3f52e1b..0000000 --- a/app/controllers/accounts_controller.rb +++ /dev/null @@ -1,113 +0,0 @@ -require 'base64' - -class AccountsController < ApplicationController - # Be sure to include Authenti...
lachie/roro-faces
6afd4c6e10b91c7bf5d7f7965c80b819921c6f1b
switching to authlogic
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a5da144..2c6daeb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,71 +1,117 @@ # Filters added to this controller apply to all controllers in the applicat...
lachie/roro-faces
8f9f7a6df6fc0d998a8b95e1f96524b71d97aac8
switching to authlogic
diff --git a/app/models/user_session.rb b/app/models/user_session.rb new file mode 100644 index 0000000..8c19d19 --- /dev/null +++ b/app/models/user_session.rb @@ -0,0 +1,2 @@ +class UserSession < Authlogic::Session::Base +end \ No newline at end of file diff --git a/db/migrate/20090601115736_alter_for_authlogic.rb b/d...
lachie/roro-faces
b8332419efb7b9eaee1d7bd21bc1e8b2e321f7cc
tweaks to frontpage
diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass index ba5bc4e..5b0c07a 100644 --- a/app/stylesheets/screen.sass +++ b/app/stylesheets/screen.sass @@ -1,376 +1,376 @@ @import blueprint.sass @import compass/reset.sass @import compass/utilities/lists.sass @import compass/layout.sass +blueprin...
lachie/roro-faces
497f2819565a611a241e40dd984c7325d22c2e6b
fixed up pygments
diff --git a/lib/albino.rb b/lib/albino.rb index 8b94c7e..9f2bafd 100644 --- a/lib/albino.rb +++ b/lib/albino.rb @@ -1,196 +1,198 @@ ## # Wrapper for the Pygments command line tool, pygmentize. # # Pygments: http://pygments.org/ # # Assumes pygmentize is in the path. If not, set its location # with Albino.bin =...
lachie/roro-faces
de9e72a3b61a799a02c131829d174e76a5782322
fixed up pygments
diff --git a/app/models/comment.rb b/app/models/comment.rb index 6956995..69fc4ce 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,15 +1,15 @@ class Comment < ActiveRecord::Base belongs_to :commentable, :polymorphic => true belongs_to :user before_save :apply_filter def rates? ...
lachie/roro-faces
f36996f79a180cc0d5dc12ffd6d8328c07d5d353
removed desc from frontpage
diff --git a/app/views/front/_presos.haml b/app/views/front/_presos.haml index 78cf870..c047f61 100644 --- a/app/views/front/_presos.haml +++ b/app/views/front/_presos.haml @@ -1,13 +1,10 @@ %h4 presos -presos.each do |preso| .preso %strong %a{:href=>polymorphic_path([preso.meeting.group,preso.meeting,...
lachie/roro-faces
f2c113e5dd5ae946f7f843b8e2fde5674771941e
re-allowed users to edit their own presos
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b27ba6f..a5da144 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,71 +1,71 @@ # Filters added to this controller apply to all controllers in the applicati...
lachie/roro-faces
5d70688da091bc276b2a4c8052aad6ec36f0f690
added spiel back to last meetups
diff --git a/app/views/front/_blog.haml b/app/views/front/_blog.haml index 66ebd9c..507588f 100644 --- a/app/views/front/_blog.haml +++ b/app/views/front/_blog.haml @@ -1,20 +1,24 @@ %h3 last meetup : =blog.group.short_name %span =blog.date.to_s(:brief).downcase +.spiel + :textile + #{blog.spiel} +...
lachie/roro-faces
5e719eb458b5b99c12e69cfb1154f3fdb17cc209
fix sorting error
diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb index 954ba68..bed7bb7 100644 --- a/app/controllers/front_controller.rb +++ b/app/controllers/front_controller.rb @@ -1,19 +1,19 @@ class FrontController < ApplicationController def index @tweets = FeedItem.twitter.all(:limi...
lachie/roro-faces
490dcc67223a94517a8e808e3b036dae549e4672
tweaked front page
diff --git a/app/models/meeting.rb b/app/models/meeting.rb index d558685..85356ba 100644 --- a/app/models/meeting.rb +++ b/app/models/meeting.rb @@ -1,60 +1,61 @@ class Meeting < ActiveRecord::Base belongs_to :group has_many :presos attr_writer :formatted_date, :formatted_time before_validation...
lachie/roro-faces
1b02f35157d73594b0670eab4701841978d5cdc6
tweaking look
diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass index b2b2d9c..ba5bc4e 100644 --- a/app/stylesheets/screen.sass +++ b/app/stylesheets/screen.sass @@ -1,362 +1,376 @@ @import blueprint.sass @import compass/reset.sass @import compass/utilities/lists.sass @import compass/layout.sass +blueprin...
lachie/roro-faces
8a68b194c32928503aaccb3f637677378f4e37b4
added tiny talk icon
diff --git a/public/images/beer-icon.png b/public/images/beer-icon.png new file mode 100644 index 0000000..8b7c6d8 Binary files /dev/null and b/public/images/beer-icon.png differ diff --git a/public/images/grid.png b/public/images/grid.png new file mode 100644 index 0000000..129d4a2 Binary files /dev/null and b/public/...
lachie/roro-faces
da5db3b5a3f3e328d768fea120180fddc98d83d7
weakened preso-user relationship for the time being
diff --git a/Capfile b/Capfile index fc3095b..bc5b5c7 100644 --- a/Capfile +++ b/Capfile @@ -1,76 +1,79 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator load 'config/secure_cap.rb' # set :domain, "smartbomb.com.au" set :domain, "208.78.102.127" role :web, domain role :app, domain role :d...
lachie/roro-faces
38f5b939bb0e5784369af67b6575393456640b8f
tweaks
diff --git a/app/views/meetings/show.html.haml b/app/views/meetings/show.html.haml index e4df71e..20c55ff 100644 --- a/app/views/meetings/show.html.haml +++ b/app/views/meetings/show.html.haml @@ -1,32 +1,32 @@ %h3 %a{:href => group_path(@group)}=@group.name , =@meeting .where =@meeting.where %hr.s...
lachie/roro-faces
bfee36b35f657b600f2b9a9f976cac6288e999de
style tweaks
diff --git a/app/stylesheets/screen.sass b/app/stylesheets/screen.sass index c5d23d4..2004b05 100644 --- a/app/stylesheets/screen.sass +++ b/app/stylesheets/screen.sass @@ -1,352 +1,353 @@ @import blueprint.sass @import compass/reset.sass @import compass/utilities/lists.sass @import compass/layout.sass +blueprin...
lachie/roro-faces
0decce9071b08c0f05d582b6f56e82cc2c2d8415
added migration
diff --git a/db/migrate/20090531161348_add_timestamps_to_meetings.rb b/db/migrate/20090531161348_add_timestamps_to_meetings.rb new file mode 100644 index 0000000..71b9a88 --- /dev/null +++ b/db/migrate/20090531161348_add_timestamps_to_meetings.rb @@ -0,0 +1,8 @@ +class AddTimestampsToMeetings < ActiveRecord::Migration ...
lachie/roro-faces
ec69baa33750ab2d8ba99954a0d49091a668d22c
looks good
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 41d69a8..b27ba6f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,63 +1,71 @@ # Filters added to this controller apply to all controllers in the applicati...
lachie/roro-faces
14910bbfca249a555cb2b13b547c0b22765df654
switched to compass
diff --git a/app/controllers/repos_controller.rb b/app/controllers/repos_controller.rb index 3556e8c..9f9e5ef 100644 --- a/app/controllers/repos_controller.rb +++ b/app/controllers/repos_controller.rb @@ -1,5 +1,5 @@ class ReposController < ApplicationController def index - @repos = Repo.top + @repos = Repo.t...
lachie/roro-faces
1fb39dda6bf3c49bfa1b2bc552def466cdd4459d
enabled submods
diff --git a/Capfile b/Capfile index 4860bbd..fc3095b 100644 --- a/Capfile +++ b/Capfile @@ -1,74 +1,76 @@ load 'deploy' if respond_to?(:namespace) # cap2 differentiator load 'config/secure_cap.rb' # set :domain, "smartbomb.com.au" set :domain, "208.78.102.127" role :web, domain role :app, domain role :d...
lachie/roro-faces
9aaaa9672f830d7874d51c04628283559d14f4e6
added github task
diff --git a/lib/tasks/extract_fixtures.rake b/lib/tasks/extract_fixtures.rake index 205e154..7648cac 100644 --- a/lib/tasks/extract_fixtures.rake +++ b/lib/tasks/extract_fixtures.rake @@ -1,71 +1,72 @@ namespace :db do namespace :fixtures do + + SKIP_TABLES = %w[ schema_info schema_migrations sessions entr...
lachie/roro-faces
c3f3d56ecf41c1f313c9789751e5f57c94b06847
added github repos
diff --git a/.gitmodules b/.gitmodules index c0c81f0..bd81ef5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vendor/rfeedparser"] path = vendor/rfeedparser url = git://github.com/jmhodges/rfeedparser.git +[submodule "vendor/plugins/open_id_authentication"] + path = vendor/plugins/open_id_au...
lachie/roro-faces
20c7776feef514cfcff9198d612d809af5843c59
working towards pg and rails 2.3
diff --git a/.gitignore b/.gitignore index 6337cc9..f99f8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ log/*.log tmp/**/* .DS_Store doc/api doc/app public/mugshots config/gmail.rb db/*.sqlite3 +.*.sw? diff --git a/Capfile b/Capfile index a4e73b7..4860bbd 100644 --- a/Capfile +++ b/Capfile @@ -1,13...
lachie/roro-faces
be9b840e39d4456d4e09c15c2c4eabeea7023a48
brute force fix to serialisation prob
diff --git a/app/models/facet.rb b/app/models/facet.rb index 3343590..cdaeb27 100644 --- a/app/models/facet.rb +++ b/app/models/facet.rb @@ -1,43 +1,63 @@ class Facet < ActiveRecord::Base belongs_to :user belongs_to :facet_kind # validates_presence_of :name - - serialize :info, Hash - SCHEME_R...
lachie/roro-faces
ad692291b50b4d6f3bab9c458d848835aea8e6a5
tweak to get facets running
diff --git a/app/controllers/facets_controller.rb b/app/controllers/facets_controller.rb index bce8f43..726aca8 100644 --- a/app/controllers/facets_controller.rb +++ b/app/controllers/facets_controller.rb @@ -1,36 +1,36 @@ class FacetsController < ApplicationController # append_before_filter :load_user, :only => [:...
lachie/roro-faces
89864c1a2bb5d134a7cb459eb3381c43c46d301c
tweak to get facets running
diff --git a/app/controllers/facets_controller.rb b/app/controllers/facets_controller.rb index f3cbff3..bce8f43 100644 --- a/app/controllers/facets_controller.rb +++ b/app/controllers/facets_controller.rb @@ -1,36 +1,36 @@ class FacetsController < ApplicationController # append_before_filter :load_user, :only => [:...
lachie/roro-faces
0a59959a803f37affe66068b42032285dfa08d97
fixed up facets form
diff --git a/public/javascripts/user.js b/public/javascripts/user.js index 136bcc7..c466ebe 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -1,74 +1,90 @@ -$(function() { +(function($) { + + +function delete_facet() { + var a = $(this), + div = a.parents('tr:first') + ...
lachie/roro-faces
b905ff86a9cbedf51d672602ec22d1c90c22b8be
vendored rfeedparser
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c0c81f0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vendor/rfeedparser"] + path = vendor/rfeedparser + url = git://github.com/jmhodges/rfeedparser.git diff --git a/app/controllers/accounts_controller.rb b/app/controllers/account...
lachie/roro-faces
ba3cd95e3038158c9189360bfd477b29af61c9f0
further openid fixes
diff --git a/app/models/user.rb b/app/models/user.rb index 157eb52..4e3027b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,417 +1,421 @@ require 'digest/sha1' module ThankyouExt def last_month # find(:all, :conditions => 'date(updated_at) > cur_date()-1') end end class User < ActiveRe...
lachie/roro-faces
f4f0c9f882745d44e8bc0f9f45589c7ec1fa6440
added superuser and admin editing interface, from sunny Glenelg, SA
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index f18f0e9..41d69a8 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -1,58 +1,63 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will ...
lachie/roro-faces
8021c45f3736a767ce798249c98843d327a384e0
tidied up admin by hiding forms
diff --git a/app/controllers/admin/presos_controller.rb b/app/controllers/admin/presos_controller.rb index cb9c03e..d9018e7 100644 --- a/app/controllers/admin/presos_controller.rb +++ b/app/controllers/admin/presos_controller.rb @@ -1,5 +1,25 @@ class Admin::PresosController < Admin::ApplicationController + before_fi...