Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Whilependingmerge #75

Open
wants to merge 2,497 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2497 commits
Select commit Hold shift + click to select a range
429efe9
when changing feed ownership add the new user to the feed.owners
maxtilford Oct 17, 2011
96de813
remove rack timeout from rails middleware, we include it explicitly
maxtilford Oct 13, 2011
24df5a6
remove console.log calls in js
maxtilford Oct 17, 2011
f9b2c80
use Sunspot SilentFailSessionProxy in development and test
maxtilford Oct 17, 2011
a8ce7c6
Makes changes to the organizer application for Peter
Jberlinsky Oct 17, 2011
389c4a8
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 17, 2011
c3a5cb0
Fixes FB application
Jberlinsky Oct 18, 2011
e10d922
added html truncation plugin to vendor
jpojecp Oct 17, 2011
ac6ec6d
simplify post truncation, works w/ markdown
jpojecp Oct 17, 2011
83feec4
truncation on replies
jpojecp Oct 17, 2011
475aa92
info-list scrolling now paginates
jpojecp Oct 18, 2011
aaf5745
move exceptional init into a partial
maxtilford Oct 18, 2011
d37820d
require truncator on inbox page
maxtilford Oct 18, 2011
158b71f
add rubymine files to gitignore
pehrlich Oct 13, 2011
b2b6a44
Remove duplicate entries in gemfile
pehrlich Oct 18, 2011
758e84c
limit 3 replies shown, control button
pehrlich Oct 18, 2011
e9b9bc6
Organizer App v3
Jberlinsky Oct 19, 2011
f6809cd
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 19, 2011
47fa690
replace on_finished_typing with _.debounce
maxtilford Oct 18, 2011
aa490c4
adds sunspot to Procfile
maxtilford Oct 18, 2011
2a6028f
put Exceptional.rescue around kickoff.deliver_daily_bulletin
maxtilford Oct 19, 2011
417a367
more setup details in readme
johnc Oct 18, 2011
2a0cd21
fixed info-box bug when switching tabs w/ existing search query
jpojecp Oct 18, 2011
0476ce3
pluralized js model schemas
jpojecp Oct 18, 2011
fdbf5eb
bundler updated
jpojecp Oct 18, 2011
6de684d
remove a console.log
maxtilford Oct 19, 2011
f91079f
fixes profile box h2 text
maxtilford Oct 19, 2011
4d2baaa
tell sprockets to precompile specific files
maxtilford Oct 19, 2011
158e6fe
remove cancan from feeds controller
maxtilford Oct 19, 2011
beac815
removes bugmuncher
maxtilford Oct 19, 2011
3c0cd3e
reenable user avatars in development, if you're using data from produ…
maxtilford Oct 19, 2011
ff68c71
update paperclip gem
maxtilford Oct 19, 2011
82978e3
adds feed avatar upload/crop to feed editing
maxtilford Oct 19, 2011
7007243
feed about text is markdownified on feed page
maxtilford Oct 19, 2011
9c1592f
adds pottery to possible interests
maxtilford Oct 20, 2011
1906842
Send status
Jberlinsky Oct 20, 2011
a5028d3
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 20, 2011
9a6a66c
implement search form, clickable feed items, add attr_accessible, hig…
pehrlich Oct 20, 2011
07c335a
add search components to main wire, simplify perpage
pehrlich Oct 20, 2011
777db23
Merge pull request #67 from pehrlich/master
pehrlich Oct 20, 2011
8f74144
refactors RSSImporting
maxtilford Oct 20, 2011
23a4cab
RSSImporter runs hourly
maxtilford Oct 20, 2011
1005d40
info-box scrollbar doesn't stick between different lists
jpojecp Oct 19, 2011
51e0725
failed searches in info-box show message
jpojecp Oct 19, 2011
07620a9
search pagination starts at 0
jpojecp Oct 19, 2011
1da0b59
added info-box no-search-result views
jpojecp Oct 19, 2011
1daad8d
info-box has detailed message when search returns nothing
jpojecp Oct 19, 2011
c9954ea
can't use dashes in js var names
jpojecp Oct 19, 2011
c2a1a09
users, feeds order with avatars and descriptions go first
jpojecp Oct 19, 2011
380a82c
fixed switching filters in info-box w/ an empty search
jpojecp Oct 20, 2011
c9ccf23
added organizer name, email to community serializer
jpojecp Oct 20, 2011
1d8336c
fixed checking for the right community
jpojecp Oct 20, 2011
2c44f2f
info-box scrolling accomodates small screens
jpojecp Oct 20, 2011
70c5b81
correct links on feed-none and users-none templates
maxtilford Oct 21, 2011
88a44db
Added dummy background job for daily digest
Jberlinsky Oct 22, 2011
21ffa7d
Remove list type and replace with single result
Jberlinsky Oct 22, 2011
1221527
split enqueueing of daily bulletins
maxtilford Oct 22, 2011
d36a3a8
Fixes a typo that was causing Resque issues.
Jberlinsky Oct 22, 2011
c5e4b70
Fixes typo that may have been causing *some* Resque issues
Jberlinsky Oct 22, 2011
022d473
Merge branch 'resque'
Jberlinsky Oct 22, 2011
b932513
Git was not cooperating
Jberlinsky Oct 22, 2011
dda6afa
Conflict
Jberlinsky Oct 22, 2011
1d35b33
hide the search in the wire with a feature switch
maxtilford Oct 23, 2011
882bd85
Fixes Rack::Timeout in development, probably
maxtilford Oct 23, 2011
a2c6ffb
adds feature switching ui
maxtilford Oct 23, 2011
8f56f0f
fixes alert when clicking More on a preview wire
maxtilford Oct 23, 2011
040fe0c
make feature switching persistent with the session
maxtilford Oct 23, 2011
edb6277
stub sessionStorage for old browsers
maxtilford Oct 23, 2011
bf9cb26
fixedLeftColumn rough (behind a feature switch)
maxtilford Oct 24, 2011
ad66f88
add a refresh page button to the feature switching panel
maxtilford Oct 24, 2011
86df0bf
move json2 up in main page dependencies (for ie7)
maxtilford Oct 24, 2011
12a16b8
removes twitter input from feed forms..
maxtilford Oct 25, 2011
f5d9d96
user wire item shouldn't try to link to anything
maxtilford Oct 25, 2011
6ae229b
change colors of directory title links
maxtilford Oct 25, 2011
fb2576d
fixedLayout, right column nav and header are fixed
maxtilford Oct 25, 2011
a2ade3c
set :raise_errors, true for api
maxtilford Oct 25, 2011
b0d7ad8
Statistics view
Jberlinsky Oct 26, 2011
ced912a
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 26, 2011
1873bef
Adds a user count by community slug to the API
Jberlinsky Oct 26, 2011
cbef907
Allow users to be looked up by email
Jberlinsky Oct 26, 2011
a67be7e
Allow full dumps from the API for admins
Jberlinsky Oct 26, 2011
a6b5424
Lazy-load active_support
Jberlinsky Oct 26, 2011
ef939ca
Just dump the JSON
Jberlinsky Oct 26, 2011
16afaf7
Email address lookup namespacing fix
Jberlinsky Oct 26, 2011
6a16b06
fixes typo s/O/o
maxtilford Oct 26, 2011
ead9147
Moving away from McBean
Jberlinsky Oct 26, 2011
ef20c35
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 26, 2011
cb1d3c3
Rescue on individual RSS parsings
Jberlinsky Oct 26, 2011
6af80bb
Speeds up statistical aggregations after a few days
Jberlinsky Oct 28, 2011
49edf3d
Embeds organizer form into organizer app
Jberlinsky Oct 28, 2011
0219972
auth checking for posting feed events, announcements
jpojecp Oct 25, 2011
0a6531e
tall modals don't overflow above screen
jpojecp Oct 25, 2011
e4941a4
added feed-profile editing api
jpojecp Oct 25, 2011
ca89799
Feed serializer now returns rarely-used fields
jpojecp Oct 25, 2011
8b6a902
added feed editing modal
jpojecp Oct 25, 2011
8a95b4b
feed page uses modal for editing feed, rather than a link to another …
jpojecp Oct 25, 2011
17894d6
former feed edit page changed to feed avatar file upload
jpojecp Oct 25, 2011
69c369b
forms have error messages, not just incompletes
jpojecp Oct 25, 2011
2056a6f
js validation returns the same format as http responses
jpojecp Oct 25, 2011
060b0de
all forms show the response text on errors
jpojecp Oct 25, 2011
c35d471
post box error message doesn't collide w/ the form
jpojecp Oct 25, 2011
b0311b8
remove logging
jpojecp Oct 25, 2011
00f8325
info-box uses the feed editing modal
jpojecp Oct 26, 2011
6e1a76b
added reply deletion api
jpojecp Oct 27, 2011
77d3e43
a Message's community is its User's community
jpojecp Oct 27, 2011
2f1df21
added link to remove replies
jpojecp Oct 27, 2011
c3d5a60
tweaks reply delete link styles
maxtilford Oct 27, 2011
d0a762c
fixes tab switching on the feed page in IE7
maxtilford Oct 27, 2011
2dc76e9
fixes forms in IE7
maxtilford Oct 28, 2011
7e64357
Adds community penetration statistic
Jberlinsky Oct 29, 2011
4577e78
Another iteration of the administrative statistics interface...
Jberlinsky Oct 29, 2011
05947c4
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 29, 2011
894d84d
Fixes averages
Jberlinsky Oct 29, 2011
319ac7e
Convert the number of households in a community to a float
Jberlinsky Oct 29, 2011
efb1588
Adds progress message to organizer app
Jberlinsky Oct 30, 2011
c419b10
Moves goal counter inside a tab
Jberlinsky Oct 31, 2011
9104041
s/Deborah/Debra/ on learn_more page
maxtilford Oct 31, 2011
f958c08
Text change
Jberlinsky Oct 31, 2011
d3e7324
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Oct 31, 2011
75b563f
adds acts_as_api, jasmine, and test_track
maxtilford Oct 31, 2011
1974e57
add acts_as_api config
maxtilford Oct 31, 2011
46efbe8
add acts_as_api declarations for community, feed, group, and user
maxtilford Oct 31, 2011
4e0ec3a
use {community, feed, group, user}.as_api_response in serializer
maxtilford Oct 31, 2011
23813db
disable pagination for api/communities/:id/{users, feeds, groups}
maxtilford Oct 31, 2011
998fd08
infoboxes/base.js passes jslint
maxtilford Oct 31, 2011
4aed357
adds groups to community api template
maxtilford Nov 1, 2011
e41092f
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Nov 1, 2011
efc5ed8
Fixes feed issue when a feed has a slug with a space
Jberlinsky Nov 1, 2011
3162065
s/Deborah Roth/Debra Z. Roth
Jberlinsky Nov 1, 2011
61c53a5
events created at though POST /community/:community_id/events are alw…
maxtilford Nov 1, 2011
8bfff45
set up jasmine route
maxtilford Nov 1, 2011
987a6da
adds rake task db:sanitize
maxtilford Nov 1, 2011
f08db5e
cache the profile model so we don't rerender so often
jpojecp Oct 27, 2011
4a091c3
post box has a spinny gif while submitting
jpojecp Oct 27, 2011
fe89ca8
fixed info-list scroll level not persisting
jpojecp Oct 27, 2011
6327b8d
added close-search image to button
jpojecp Nov 1, 2011
f58aa53
removes pagination from infobox
maxtilford Nov 1, 2011
23a0f15
add mobile registration view
maxtilford Oct 18, 2011
f2d05d9
fixes jslint complaints
maxtilford Nov 1, 2011
fe4a1bf
removes :active styles on buttons..
maxtilford Nov 1, 2011
29564ea
adds Group#community (delegates to User#community)
maxtilford Nov 2, 2011
0d2f135
fixes spinner (uses background-image instead of <img> to make asset u…
maxtilford Nov 2, 2011
0ab01ff
Revert "removes pagination from infobox"
jpojecp Nov 2, 2011
896a37e
Revert "disable pagination for api/communities/:id/{users, feeds, gro…
jpojecp Nov 2, 2011
3f12a86
enable info-list pagination, fixed scrolling
jpojecp Nov 2, 2011
c9875bb
mainpage wire shows 5 of each item, no 'more' buttons
jpojecp Nov 2, 2011
bbafe45
made created_at searchable on postlikes
jpojecp Nov 2, 2011
508751c
postlike api returns latest postlikes when there's no query
jpojecp Nov 2, 2011
511af15
sunspot pagination starts at 1
jpojecp Nov 2, 2011
0ae8fb0
wire searches leave focus in the inputbox
jpojecp Nov 2, 2011
c98ecd2
Replaces apostrophe characters in e-mails with their ASCII equivalents
Jberlinsky Nov 3, 2011
f52f05e
s|[email protected]:|git://github.com/| in Gemfile
maxtilford Nov 4, 2011
2f2c4cd
fixes more buttons on wires
maxtilford Nov 4, 2011
a8fc850
fixes wire more buttons
maxtilford Nov 4, 2011
6d9dfc1
Don't use test track routes in staging
maxtilford Nov 4, 2011
60088d8
Enables full URLs for assets
Jberlinsky Nov 5, 2011
3371463
Fuck HTTPS
Jberlinsky Nov 5, 2011
5ce16de
Undoes asset stuff
Jberlinsky Nov 5, 2011
2c03c57
design tweaks: first pass on left side
maxtilford Nov 4, 2011
8b24fd4
design tweaks: first pass on wire
maxtilford Nov 4, 2011
e2d37ca
always show all replies
maxtilford Nov 4, 2011
6c8e865
wireitem author matches reply author style
jpojecp Nov 5, 2011
670357c
info-box style tweaks
jpojecp Nov 5, 2011
fb32293
fixes padding on bottom of post box
maxtilford Nov 7, 2011
6bc09d4
fixes #main top margin on main_page
maxtilford Nov 7, 2011
15bf6ec
fixes line-height on text in profiles
maxtilford Nov 7, 2011
9f2fd25
darken wire item titles and profile box names
maxtilford Nov 7, 2011
19b15f0
fixes header left and right alignment
maxtilford Nov 7, 2011
abfe6dc
remove outline on profile box search focus
maxtilford Nov 7, 2011
b5e2f56
don't halt on an empty query
jpojecp Nov 3, 2011
d75c4fb
revert changes to base wire
jpojecp Nov 3, 2011
c5ff2fc
fixed sending query when fetching more of a wire
jpojecp Nov 3, 2011
950e0cd
changed landing headers text (eg Recent Announcements, Recent Posts)
jpojecp Nov 4, 2011
3cd94b9
added hint for replies
jpojecp Nov 7, 2011
f9153e4
border on the webkit scrollbar doesn't work in other browsers; remove…
maxtilford Nov 7, 2011
c2375eb
fixes wire search
maxtilford Nov 7, 2011
f3b9f3c
fixes fixedLayout bugs
maxtilford Nov 7, 2011
2a9874f
fixes jslint complaint
maxtilford Nov 7, 2011
86e8e71
added account editing api
jpojecp Oct 27, 2011
f5500e2
removed unused webcam js
jpojecp Oct 28, 2011
c5a7255
removed unused learnmore stylesheet
jpojecp Oct 28, 2011
d23b0ba
created new omnibus account editing page
jpojecp Oct 28, 2011
6e102c4
added bulletin, neighborhood posts settings to Account api
jpojecp Nov 1, 2011
a1d8aa6
added bulletin, neighborhood posts settings to Account serializer
jpojecp Nov 1, 2011
400510e
profile editing page is fully functional
jpojecp Nov 1, 2011
d1137e2
Account edit page tweaks:
maxtilford Nov 1, 2011
d61bc79
remove old account routes/actions/views, add avatar crop routes/actio…
maxtilford Nov 2, 2011
cdb816a
adds api support for creating and deleting the avatar
maxtilford Nov 2, 2011
7d232e9
enable logging and dump_errors for api
maxtilford Nov 2, 2011
d2985c1
add avatar uploading/cropping/deleting to account edit page
maxtilford Nov 2, 2011
307dd61
fixes more button on wires
maxtilford Nov 8, 2011
1e1d769
removes console.logs
maxtilford Nov 8, 2011
74eb08b
order directories alphabetically
maxtilford Nov 8, 2011
5fb2851
search replies on all resource, don't include old events
pehrlich Oct 21, 2011
924071c
no past events in search results
pehrlich Nov 5, 2011
b8ef6c0
fixes reply textarea width on inbox page
maxtilford Nov 8, 2011
c878aab
Move user CSV generation into Statistics lib
Jberlinsky Nov 9, 2011
0935e50
template urls use . instead of /
jpojecp Nov 8, 2011
38210ef
feed avatar api (change and delete)
jpojecp Nov 8, 2011
72af909
feed avatar is editable and croppable via modal
jpojecp Nov 8, 2011
29f75c2
adds address hint to registration form
maxtilford Nov 9, 2011
bf91ae2
update all template names on main page to . syntax and use .syntax in…
maxtilford Nov 9, 2011
42136ee
Change text from Invite to Invite Neighbors to CommonPlace
Jberlinsky Nov 9, 2011
7e6e5c0
add serialized column discount_businesses to communities
maxtilford Nov 10, 2011
4c1b36b
upgrade to sunspot 1.3.0.rc6
maxtilford Nov 10, 2011
ea998f3
cleans up unused text in text/{en,college}.js.i18n and adds missing t…
maxtilford Nov 10, 2011
0fc3dd7
invalid requests return 404 rather than 200OK
jpojecp Nov 9, 2011
c482f0e
fixed reply textarea width on feed/group pages
jpojecp Nov 10, 2011
1ac40c4
author field in all postlikes is clickable
jpojecp Nov 10, 2011
83f6689
remove 'read less' link from truncator
jpojecp Nov 10, 2011
39ef762
remove config/assets.yml -- jammit relic
pehrlich Nov 6, 2011
d111393
Adds a top notification for owosso/corunna's civic art vote
maxtilford Nov 10, 2011
904d68f
Revert "upgrade to sunspot 1.3.0.rc6"
maxtilford Nov 10, 2011
93938d9
put community.add_default_groups in seeds.rb
maxtilford Nov 10, 2011
e6f8340
s/discount_busineses/discount_businesses/
maxtilford Nov 10, 2011
d479199
fixes up good neighbor discount page and adds a link in footer
maxtilford Nov 10, 2011
b701037
only show good_neighbor_discount link if you are logged_in
maxtilford Nov 10, 2011
5531fe7
info box style tweeks, infinite scroll triggers sooner
pehrlich Nov 10, 2011
d863abe
Merge branch 'master' of github.com:commonplaceusa/commonplace into w…
pehrlich Nov 10, 2011
1843d32
info box style tweeks, infinite scroll triggers sooner
pehrlich Nov 10, 2011
563f026
gets rid of extra line on wires without more button
maxtilford Nov 10, 2011
88a497f
refactor common_head, add tracking to some new pages, standardize tra…
pehrlich Nov 5, 2011
46c5b83
removes unused facebook initialization
maxtilford Nov 10, 2011
a9090b8
remove jquery magic in commonhead
maxtilford Nov 10, 2011
976e14f
fixes jslint complaints with invite_page.js
maxtilford Nov 10, 2011
2aae5f1
test page for geolocation
pehrlich Nov 10, 2011
2e55b85
create /whoami as prototype for new index action
pehrlich Nov 10, 2011
8af6329
rename account to current_account client side, fix bug where dummy lo…
pehrlich Nov 6, 2011
0e5b32e
fix but where logged out pages would have js error
pehrlich Nov 9, 2011
9be0515
fixes jslint complaints on registration_page.js
maxtilford Nov 11, 2011
1907b66
Adds e-mail notification once a feed reaches 10 subscribers
Jberlinsky Nov 11, 2011
b046af9
Merge branch 'master' of github.com:commonplaceusa/commonplace
Jberlinsky Nov 11, 2011
8fd612b
Forgot the mail files
Jberlinsky Nov 11, 2011
2f3632a
E-mail text fix
Jberlinsky Nov 11, 2011
38fba2e
Changes subject line for N subscribers email
Jberlinsky Nov 11, 2011
4c37943
Fixes header width
Jberlinsky Nov 11, 2011
4694d1b
fixes feed editing form save
maxtilford Nov 11, 2011
addf174
remove tracking that breaks starter site
maxtilford Nov 11, 2011
e18507f
Update community penetration properly
Jberlinsky Nov 13, 2011
e58ad7c
remove hover styles on account avatar controls
maxtilford Nov 14, 2011
2ed006d
markdown headers in posts should not be bolded
maxtilford Nov 14, 2011
43e6dc6
ajax registration page, rc1
pehrlich Nov 15, 2011
d1a1f3c
merging
pehrlich Nov 15, 2011
66ee98b
add tracking to registration page, fix harmless bug in common_head
pehrlich Nov 15, 2011
6bf7f9e
change after sign out path to the community landing (registration) page
pehrlich Nov 15, 2011
8774084
fix groups bug
pehrlich Nov 15, 2011
39d8cdb
make registration layout use regular header (removes duplicate code)
pehrlich Nov 15, 2011
a93b61e
add mpq tracking to js events, fix (newly created) error on sign_in page
pehrlich Nov 15, 2011
8f51124
cleaner location-detection failure, add debugging output
pehrlich Nov 15, 2011
dbdb8cf
share cookie w/ rails, other minor cleanups
pehrlich Dec 15, 2011
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 20 additions & 4 deletions .autotest
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
require 'autotest/bundler'
require 'autotest/notify'

Autotest.add_hook(:initialize) {|at|

at.options[:quiet] = true

%w{.git .swp .DS_Store ._* tmp rakefile .txt}.each do |exception|
at.add_exception(exception)
end
# at.clear_mappings # take out the default (test/test*rb)

at.add_mapping(%r{^lib/.*\.rb$}) {|f, _|
Dir['spec/**/*.rb']
}
at.add_mapping(%r{^config/authorization\_rules\.rb$}) {|f, _|
Dir['spec/**/*.rb']

at.add_mapping(%r%^spec/acceptance/.*_spec.rb$%, true) { |filename, _|
filename
}

at.add_mapping(%r%^app/(models|controllers|helpers|lib)/.*rb$%, true) {
at.files_matching %r%^spec/acceptance/.*_spec.rb$%
}

at.add_mapping(%r%^app/views/(.*)$%, true) {
at.files_matching %r%^spec/acceptance/.*_spec.rb$%
}

nil
}
}
3 changes: 0 additions & 3 deletions .bundle/config

This file was deleted.

11 changes: 0 additions & 11 deletions .gems

This file was deleted.

20 changes: 16 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
log/cucumber.log
log/development.log
log/test.log
log/production.log
.vimrc
log/*.log
log/*.lck
tmp/**/*
tmp/*
doc/api
doc/app
config/database.yml
config/crypto.yml
**/**/#*
**/**/.#*
*~x
Expand All @@ -20,5 +20,17 @@ coverage.data
rerun.txt
config/config.yml
public/stylesheets
public/assets
development
development/*
log/exceptional.log
log/sendmail.log
config/exceptional.yml
.sass-cache
*.swp
.idea*
.bundle/*
log/*.log
.rvmrc
log/sunspot-solr-development.log.1
sunspot-solr.pid
Binary file removed .gitignore.swp
Binary file not shown.
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--colour --drb --format Fuubar
3 changes: 3 additions & 0 deletions .slugignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
selenium
autotest
spec
3 changes: 0 additions & 3 deletions Capfile

This file was deleted.

175 changes: 114 additions & 61 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,73 +1,126 @@
source :gemcutter

gem "rails", "2.3.9"
gem "pg"
gem 'subdomain-fu'
gem 'nested_layouts'
gem 'aasm'
gem 'authlogic'
gem 'compass'
gem 'haml'
gem 'formtastic'
gem 'paperclip'
gem "acts-as-taggable-on"
gem "BlueCloth", :require => "bluecloth"
gem "acts-as-list", :require =>"acts_as_list"
gem "glebm-geokit", :require => "geokit"
gem "cancan"
gem "friendly_id"
gem "tlsmail"
gem "resque"
gem 'resque_mailer'
gem "SystemTimer", :require => "system_timer"
gem 'exceptional'
gem 'aasm'
gem 'tmail'

gem 'httparty'
gem 'json'
gem 'simple_uuid'
gem 'outside-in'
gem 'mcbean'
gem 'eventfulapi'

gem 'redis'
gem 'redis-namespace'
gem 'yajl-ruby'
gem 'json'
gem 'resque'
gem 'resque-scheduler'

gem 'twitter'

gem 'god'

group 'cli' do
gem 'text-reform'
gem 'thor'
end
gem 'rails', "~> 3.1.0"
gem 'rack'

# API
gem 'sinatra' # Powers the api
gem 'rack-contrib'
gem 'sham_rack' # For using the api in-process
gem 'faraday' # For using the api in-process
gem 'rack-cache' # For caching
gem 'dalli' # memcache client, for caching
gem 'acts_as_api'

# ActiveRecord
gem 'sunspot_rails', :git => 'git://github.com/alindeman/sunspot.git' # database search
gem 'sunspot_solr'
gem 'pg' # for postgres
gem 'permanent_records' # adds soft-delete if a model has a deleted_at column
gem 'paperclip', "~> 2.4.4" # we use this to store avatars
gem 'rmagick' # we use this to crop avatars
gem 'geocoder' # we use geocoder to find user latlngs from addresses
gem 'glebm-geokit', :require => 'geokit' # use this to find latlngs from address again. try to remove in favor of geocoder

# Deployment
gem 'thin' # lighter than mongrel, faster than webrick

# Authentication
gem 'devise' # used for authentication
gem 'omniauth', "0.3.0" # used for authentication with facebook
gem 'uuid' # used in app/controllers/admin_controller.rb, could be refactored/removed?

# Authorization
gem 'cancan' # Authorization, see app/models/ability.rb, should be refactored/redone

# Assets
gem 'aws-s3', :require => 'aws/s3' # storing avatars and stuff

# Worker Jobs
gem 'redis' # for queueing with resque
gem 'redis-namespace', :require => false # resque wants it, we don't need to require it
gem 'mcbean' # We use this to pull data from rss feeds for import
gem 'redcarpet' # We use this to format user messages in emails


# Jobs
gem 'resque', "~> 1.19.0" # use this to queue worker processes
gem 'resque-exceptional' # we use this to send notify of exceptions with worker processes
gem 'resque-scheduler' # we use this to queue jobs at specific times
gem 'hirefireapp' # auto-scale web and worker processes
gem 'delayed_job' # we use this to run jobs to index our data

group :production do
gem 'unicorn'
# Mail
gem 'mail' # Used for mail
gem 'mustache' # used for mail
gem 'premailer', :git => "git://github.com/Jberlinsky/premailer.git" # we use this to inline css in our emails

# ActionView
gem 'sanitize' # used in app/controllers/posts_controller.rb (which is dead code) ! remove
gem 'haml', '~> 3.1' # used for view templates
gem 'formtastic' # used for view templates
gem 'sass', '~> 3.1' # used for stylesheets

# Admin
gem 'activeadmin' # use as an easy admin tool
gem 'googlecharts' # used for admin/overview
gem 'garb' # used to access the Google Analytics API

# Monitoring
gem 'exceptional' # we use this to notify on exceptions
gem 'rpm_contrib' # we use this to monitor the app
gem 'newrelic_rpm' # we use this to monitor the app

# Features
gem 'rollout' # we use this to control features

# Misc
gem 'json', "~> 1.6.0" # isn't json built-in?
gem 'system_timer', :platforms => [:ruby_18] # this is annoying
gem 'heroku' # access heroku api
gem 'rack-timeout' # Timeout requests that take too long

group :assets do
gem 'sass-rails', " ~> 3.1.0"
gem 'coffee-rails', "~> 3.1.0"
gem 'uglifier'
gem 'compass', '0.12.alpha.0'
end

group :development, :test do
gem "factory_girl"
gem "ZenTest"
gem "forgery"
gem "rspec-rails", "~> 1.3"
gem "rspec", "~> 1.3"
gem "autotest-rails"
gem 'guard-jslint-on-rails'
gem 'rails-dev-tweaks', '~> 0.5.0' # Don't reload the code when serving assets
gem 'factory_girl' # we use factory_girl to generate models for tests
gem 'forgery' # we use forgery to generate data for tests
gem 'foreman' # we use foreman to start all the processes we need for development
gem 'pry' # for when IRB is not enough
gem 'guard' # because doing things manually is for suckers
gem 'guard-rspec'
gem 'guard-spork'
gem 'guard-bundler'
gem 'therubyracer' # because something was yelling at us for not having a javascript runtime
gem 'test_track' # jasmine doesn't support the assset pipeline yet, this helps
gem 'jasmine'
end

group :development do
gem "capistrano"
gem "capistrano-ext"#, :lib => false
gem 'mongrel'
group :linux do
gem 'libnotify'
gem 'rb-inotify'
end

group :test do
gem "rr"
gem "database_cleaner"
group :osx do

end

group :test do
gem 'rspec-rails' # we use rspec-rails for tests
gem 'fuubar' # we use fuubar for pretty rspec output
gem 'spork' # we use spork to speed up tests
gem 'rr' # we use rr for mocking
gem 'rspec-rr' # we use rspec-rr for integration between rspec and rr
gem 'webmock' # we use webmock to mock google maps and other apis
gem 'capybara', :git => 'git://github.com/jnicklas/capybara.git' # we use capybara for integration testing
gem 'launchy' # we use launchy to launch a browser during integration testing
gem 'database_cleaner' # we use database_cleaner to clean the database between tests
gem 'jasmine' # we use jasmine for javascript tests
end
Loading