Skip to content

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.
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 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 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 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 baca004
@chewbranca chewbranca Omniauth hack for passenger standalone 8557850
@adahmash adahmash Merge branch 'master' of 3e8b14c
@adahmash adahmash Merge branch 'master' into facebook_events
@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 ca5cfd3
@adahmash adahmash Corrected facebook_graph_user helper
Added code to not import past events
@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
@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 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 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
Commits on Feb 20, 2012
@adahmash adahmash Fixed admin page title
Fixed admin page title.  Removed N2 from title.
@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"
@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
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 8e58c2d
@chewbranca chewbranca Updating tweeter to allow moderator tweets always when set 66012da
@chewbranca chewbranca Merge branch 'master' of 8ab6a99
Commits on Feb 23, 2012
@adahmash adahmash Added Resque/Hoptoad-Airbrake integration
Upgraded Hoptoad-notifier gem to Airbrake gem
@chewbranca chewbranca Updating html form buttons 94845b3
@chewbranca chewbranca Reverting tweeter updates dcad381
@chewbranca chewbranca Merge branch 'master' of 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 @
@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
@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 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
@adahmash adahmash Fixed a problem with build_from_ominauth
checking whether or not the provider was twitter was
throwing an error
@chewbranca chewbranca Updating item scores for cascading block ec16ff7
@chewbranca chewbranca Merge branch 'master' of 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'
@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
@chewbranca chewbranca Add widgets to admin menu 43479c4
@chewbranca chewbranca Fix edit curated for view objects 7cbf40c
Commits on Mar 19, 2012
@adahmash adahmash Switched default app server to passenger 9f6cd95
@adahmash adahmash Fixing config to work with passenger mark 2 a28a1ba
@adahmash adahmash Fixing passenger/unicorn issue 6fde3f4
Commits on Mar 21, 2012
@adahmash adahmash Increased proxy server timeout 6115c05
Commits on Mar 24, 2012
@adahmash adahmash Fix for rails 3 image compilation problem fdc516b
@adahmash adahmash Fixing issue with broken images on gallery items 745caab
@adahmash adahmash Fixing an issue with image size for galleries c603356
@adahmash adahmash Added full-size attribute to gallery items f5614a7
Commits on Mar 26, 2012
@adahmash adahmash Tyring to fix gallery caching issue ee91f59
@adahmash adahmash Fixed typo in gallery views 2e8ed7e
@adahmash adahmash Fixing gallery size issue 84978a0
Commits on Mar 27, 2012
@adahmash adahmash Fixed footer for FB icons, fixed gallery item size 149b751
@adahmash adahmash addressing some issues with view objects and nils f73ab65
Commits on Mar 30, 2012
@amitamb amitamb Autosuggest support for tags (all in one commit) 1411cd6
@adahmash adahmash Merge pull request #17 from amitamb/autosuggest
Merging in Amit's auto-tagging changes
Commits on Apr 02, 2012
@adahmash adahmash Fix for tweeting moderator items fbd98d9
@adahmash adahmash Disabling moderator tweeting worker thread d14d3ff
@adahmash adahmash Usability changes for view objects 34edb23
@adahmash adahmash More UX changes for view objects admin pages 59ef24e
@adahmash adahmash Fixes to VO usability 70e1ee0
Commits on Apr 05, 2012
@adahmash adahmash Adding a workaround for genomics issue 3bc3489
Commits on Apr 06, 2012
@joevandyk joevandyk Added favicon/logo uploading e685926
@adahmash adahmash Fixed caption length issue with view objects b66bf48
@adahmash adahmash Extended caption length for VOs 82dafd6
@adahmash adahmash Merge remote-tracking branch 'joev/logo' into favicon-test 91ff2cd
Commits on Apr 07, 2012
@amitamb amitamb Fixed the bug causing multiple tags getting added when selecting sugg…
…ested tag by mouse
Commits on Apr 09, 2012
@adahmash adahmash Clean up View Object template list cf203bd
@adahmash adahmash Merge remote-tracking branch 'amitamb/autosuggest' into test-tags-fix 6ad8575
@adahmash adahmash Cleaning up old View Objects 25ed674
@adahmash adahmash Cleaned up View Object names in seeds cfd004b
@adahmash adahmash Added blocking to View Objects b4a61fa
Commits on Apr 10, 2012
@adahmash adahmash Merge branch 'master' into favicon-test 1f2a7d8
Commits on Apr 11, 2012
@adahmash adahmash Added template preview functionality 8987bac
@adahmash adahmash More template previews d913036
@adahmash adahmash Added hints to View Obj creation page 639c888
Commits on Apr 13, 2012
@adahmash adahmash Merge branch 'master' into test-tags-fix 52483d7
@adahmash adahmash Reduced timeout for Autosuggest call 8f0c0e4
Commits on Apr 17, 2012
@adahmash adahmash Merge branch 'master' into vo_usability ff87b1f
@adahmash adahmash Finalized template layouts for new installs 826461a
Commits on Apr 19, 2012
@adahmash adahmash Restored Newswire View Object Template 60b5da3
Commits on Apr 25, 2012
@adahmash adahmash Updated stable to refer to release 3.6 4c1dbfe