Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
Commits on Jan 16, 2012
Russell Branca chewbranca Merge branch 'master' into stable_release 3883f48
Commits on Jan 25, 2012
Russell Branca chewbranca Item score fixes 897ae6e
Commits on Feb 07, 2012
Russell Branca chewbranca Quick edit view objects dump 97b7e62
Commits on Feb 11, 2012
Russell Branca chewbranca Misc view object updates a23e591
Commits on Feb 20, 2012
Russell Branca chewbranca View object updates 9af5074
Commits on Feb 21, 2012
Russell Branca chewbranca Merge branch 'master' into view_objects_edit
Conflicts:
	app/models/metadata/view_object_setting.rb
a87f466
Commits on Feb 22, 2012
Russell Branca chewbranca More edit updates d8fc54e
Jeff Reifman simple story posting locale and left alignment fix 51aeba1
Jeff Reifman Merge branch 'master' of github.com:newscloud/n2 8e58c2d
Russell Branca chewbranca Updating tweeter to allow moderator tweets always when set 66012da
Russell Branca 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
Russell Branca chewbranca Updating html form buttons 94845b3
Russell Branca chewbranca Reverting tweeter updates dcad381
Russell Branca chewbranca Merge branch 'master' of github.com:newscloud/n2 191af34
Russell Branca 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
Russell Branca chewbranca Fix facebook expired auth issues 33fc756
Russell Branca chewbranca Ignore newswires in sitemap dead0f8
Russell Branca 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
Russell Branca chewbranca Updating will_paginate css styling b98be6e
adahmash adahmash Merge branch 'master' into galleries-refactor ff7787d
Russell Branca chewbranca Adding view objects for all twitter widgets 331df5d
Russell Branca 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
Russell Branca 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
Russell Branca chewbranca Update facebook_user? f744fdb
Russell Branca chewbranca Fix bio editing ad38e13
Russell Branca 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
Russell Branca chewbranca Updating item scores for cascading block ec16ff7
Russell Branca chewbranca Merge branch 'master' of github.com:newscloud/n2 3e3c439
Commits on Mar 01, 2012
Russell Branca chewbranca View object updates aac7551
Russell Branca chewbranca Fixing fb_user_id if omniauth user 2a25e79
Russell Branca chewbranca Make sure to use fb uids as integers 0fd4641
Russell Branca chewbranca Fix html output in user activities f5f359e
Russell Branca chewbranca Ugly hack to display proper html for articles in user activity widgets a139edf
Commits on Mar 02, 2012
Russell Branca chewbranca Misc view object updates 6e5cc80
Rodrigo Dominguez rorra Fixing facebook registration e2a94ef
Commits on Mar 07, 2012
Russell Branca chewbranca Misc view object edit updates 04add89
Russell Branca chewbranca Stop using a global variable for redis connection c5c7f54
Commits on Mar 08, 2012
Russell Branca chewbranca Update resque scheduler initialization 0f8222d
Commits on Mar 15, 2012
Russell Branca chewbranca Working view object admin editing and creation 30cfcee
Russell Branca chewbranca Merge branch 'view_objects_edit'
Conflicts:
	lib/tweeter.rb
947cbc7
Russell Branca chewbranca Updating development_structure.sql 96e1bc6
Russell Branca chewbranca Update db schema b3dde89
Russell Branca chewbranca Quick locale title display patch 588fabb
Russell Branca chewbranca Update deploy adding mysql hack for locales 8f66273
Russell Branca chewbranca Update view object template limits and fixed nil limit bug b245477
Russell Branca chewbranca Fixing view object editing form action 29ebbf0
Commits on Mar 16, 2012
Russell Branca chewbranca Make sure view objects don't break on lack of items 126dd51
Russell Branca chewbranca Merge branch 'master' into stable_release
Conflicts:
	lib/acts_as_moderatable.rb
3113189
Russell Branca chewbranca Add widgets to admin menu 43479c4
Russell Branca 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
Amit Ambardekar 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
46c69d5
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
Joe Van Dyk 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
Amit Ambardekar amitamb Fixed the bug causing multiple tags getting added when selecting sugg…
…ested tag by mouse
9d38133
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