Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jan 16, 2012
@chewbranca chewbranca Merge branch 'master' into stable_release 3883f48
Commits on Jan 25, 2012
@chewbranca chewbranca Item score fixes 897ae6e
Commits on Feb 06, 2012
@adahmash adahmash Updated README with latest installation fixes 96ca7db
@adahmash adahmash Merge branch 'master' of https://github.com/newscloud/n2 f46e32a
Commits on Feb 07, 2012
@chewbranca chewbranca Quick edit view objects dump 97b7e62
Commits on Feb 09, 2012
@adahmash adahmash Fixed problem with site caption 1f30005
@adahmash adahmash Merge branch 'site_caption' ef5765e
Commits on Feb 10, 2012
Seth minor style bugs I found b7541a5
@newscloud add setting for framed item pages 5c00c3e
@newscloud Merge branch 'master' of github.com:newscloud/n2 cd49b26
@newscloud seth updated sass files and benito skin 7d0ba1b
@newscloud comment out noficiations from admin a2d6385
Commits on Feb 11, 2012
@chewbranca chewbranca Misc view object updates a23e591
@chewbranca chewbranca Switch to passenger d779f66
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 1eeb92b
Commits on Feb 12, 2012
@adahmash adahmash Fix for importing FB events d5334cf
Commits on Feb 13, 2012
@chewbranca chewbranca Fix committed merge conflict c53c2e9
@chewbranca chewbranca Updating view object caching a9014e0
@adahmash adahmash Merge branch 'master' of github.com:newscloud/n2 baca004
@chewbranca chewbranca Omniauth hack for passenger standalone 8557850
@adahmash adahmash Merge branch 'master' of github.com:newscloud/n2 3e8b14c
@adahmash adahmash Merge branch 'master' into facebook_events
Conflicts:
	Gemfile.lock
a4278b8
@adahmash adahmash Readded duplicate events checks 52f1f37
@adahmash adahmash Added helper for mogli_user 55542a4
@chewbranca chewbranca Update config for full passenger restart 2a69843
@chewbranca chewbranca Don't cache ads 21c82e4
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 ca5cfd3
@adahmash adahmash Corrected facebook_graph_user helper
Added code to not import past events
3f8ef5c
@adahmash adahmash Merge branch 'master' into facebook_events e215fc5
@adahmash adahmash Fixed syntax errors and updated helper 35380a5
@chewbranca chewbranca Update post a story links in view objects dda8fff
Commits on Feb 14, 2012
@chewbranca chewbranca Merge pull request #10 from newscloud/facebook_events
Facebook events
c21efb3
@chewbranca chewbranca Update gemfile includes c47bb4c
@chewbranca chewbranca Compass issues dd8e362
@chewbranca chewbranca Update development structure sql 7228bc8
@chewbranca chewbranca Updating schema.rb 3829fea
@chewbranca chewbranca Remove active admin 5faa04a
@chewbranca chewbranca Update base setup tasks to precompile assets f63476d
@adahmash adahmash Fixed to use Mysql2 instead of Mysql 1e92993
@chewbranca chewbranca Add route for stories.atom e2ea38d
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 98386f7
Commits on Feb 15, 2012
@chewbranca chewbranca Adding profile pics to newest items 4e8ae86
@chewbranca chewbranca Fix favicons 2b5c7d8
@chewbranca chewbranca Fix events tags 0c55568
@chewbranca chewbranca Update welcome panel b7aa81a
@adahmash adahmash Removed timestamp from partial as per #1024 06488bf
@adahmash adahmash Merge branch 'master' into newest_users_timestamp cbb07fc
@chewbranca chewbranca Fix caching on stories page 9ee298e
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 7168b8d
Commits on Feb 16, 2012
@adahmash adahmash Fixed AJAX comment posting c69b5a4
@adahmash adahmash Restored /stories/new route to fix bookmarklet
Old story posting bookmarklet was broken by routes
changes.  Restoring old route for /stories to address
this.
39c07dd
Commits on Feb 20, 2012
@adahmash adahmash Fixed admin page title
Fixed admin page title.  Removed N2 from title.
5e1745a
@adahmash adahmash added hiding for price field in classifieds
now we hide the price field for items in
the classifieds unless they are listed as
"for sale"
bd971b3
@chewbranca chewbranca View object updates 9af5074
@chewbranca chewbranca Fix media form current_user bug 9b762a4
@chewbranca chewbranca Updating active admin migrations cee9d35
Commits on Feb 21, 2012
@chewbranca chewbranca Fix comments new lines 952b4f1
@chewbranca chewbranca Merge branch 'master' into view_objects_edit
Conflicts:
	app/models/metadata/view_object_setting.rb
a87f466
Commits on Feb 22, 2012
@chewbranca chewbranca More edit updates d8fc54e
@chewbranca chewbranca Updating item actions 445ecff
@newscloud simple story posting locale and left alignment fix 51aeba1
@newscloud Merge branch 'master' of github.com:newscloud/n2 8e58c2d
@chewbranca chewbranca Updating tweeter to allow moderator tweets always when set 66012da
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 8ab6a99
Commits on Feb 23, 2012
@adahmash adahmash Added Resque/Hoptoad-Airbrake integration
Upgraded Hoptoad-notifier gem to Airbrake gem
4e0abdb
@chewbranca chewbranca Updating html form buttons 94845b3
@chewbranca chewbranca Reverting tweeter updates dcad381
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 191af34
@chewbranca chewbranca No I really didn't want a robots.txt file ce5222f
Commits on Feb 24, 2012
@adahmash adahmash First cut of gallery item page. not working yet. c3af61f
Commits on Feb 25, 2012
@chewbranca chewbranca Fix facebook expired auth issues 33fc756
@chewbranca chewbranca Ignore newswires in sitemap dead0f8
@chewbranca chewbranca Updating item actions newest_items finder 4efbd1b
Commits on Feb 27, 2012
@adahmash adahmash Added separate controller for gallery items e4dfc8c
@adahmash adahmash Merge branch 'master' into galleries-refactor 644d69b
@adahmash adahmash Fixed prepending usernames with '@'
Fixed a problem with prepending user name with @
5b6811f
@adahmash adahmash Removed flowplayer popup, added direct item links 0738792
@chewbranca chewbranca Updating will_paginate css styling b98be6e
@adahmash adahmash Merge branch 'master' into galleries-refactor ff7787d
@chewbranca chewbranca Adding view objects for all twitter widgets 331df5d
@chewbranca chewbranca Fixing news_topics paths in admin 21d60cc
@adahmash adahmash Fixed simple story posting layout issue
Added custom overlay effect
75fb7bf
@adahmash adahmash Merge branch 'master' into galleries-refactor 9616145
@chewbranca chewbranca Expire view objects on image destroy d5101f2
Commits on Feb 28, 2012
@adahmash adahmash Merge branch 'master' of github.com:newscloud/n2 d14a111
Commits on Feb 29, 2012
@chewbranca chewbranca Update facebook_user? f744fdb
@chewbranca chewbranca Fix bio editing ad38e13
@chewbranca chewbranca Fixing cascading blocks for item_actions
Also removed duplicate item action creation
71c685c
@adahmash adahmash Fixed a problem with build_from_ominauth
checking whether or not the provider was twitter was
throwing an error
e80f1f3
@chewbranca chewbranca Updating item scores for cascading block ec16ff7
@chewbranca chewbranca Merge branch 'master' of github.com:newscloud/n2 3e3c439
Commits on Mar 01, 2012
@chewbranca chewbranca View object updates aac7551
@chewbranca chewbranca Fixing fb_user_id if omniauth user 2a25e79
@chewbranca chewbranca Make sure to use fb uids as integers 0fd4641
@chewbranca chewbranca Fix html output in user activities f5f359e
@chewbranca chewbranca Ugly hack to display proper html for articles in user activity widgets a139edf
Commits on Mar 02, 2012
@chewbranca chewbranca Misc view object updates 6e5cc80
@rorra rorra Fixing facebook registration e2a94ef
Commits on Mar 07, 2012
@chewbranca chewbranca Misc view object edit updates 04add89
@chewbranca chewbranca Stop using a global variable for redis connection c5c7f54
Commits on Mar 08, 2012
@chewbranca chewbranca Update resque scheduler initialization 0f8222d
Commits on Mar 15, 2012
@chewbranca chewbranca Working view object admin editing and creation 30cfcee
@chewbranca chewbranca Merge branch 'view_objects_edit'
Conflicts:
	lib/tweeter.rb
947cbc7
@chewbranca chewbranca Updating development_structure.sql 96e1bc6
@chewbranca chewbranca Update db schema b3dde89
@chewbranca chewbranca Quick locale title display patch 588fabb
@chewbranca chewbranca Update deploy adding mysql hack for locales 8f66273
@chewbranca chewbranca Update view object template limits and fixed nil limit bug b245477
@chewbranca chewbranca Fixing view object editing form action 29ebbf0
Commits on Mar 16, 2012
@chewbranca chewbranca Make sure view objects don't break on lack of items 126dd51
@chewbranca chewbranca Merge branch 'master' into stable_release
Conflicts:
	lib/acts_as_moderatable.rb
3113189