summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-27debug log line for control channel subBrion Vibber
2010-01-27Merge branch 'master' of gitorious.org:statusnet/mainlineBrion Vibber
2010-01-27fix notice -- drop unused return value of variable that isn't initialized :) ↵Brion Vibber
thx @ g0 for the catch
2010-01-27fix for fix for bad realtime JS loadBrion Vibber
2010-01-27Merge branch 'master' of git@gitorious.org:statusnet/mainline0.9.0beta4Evan Prodromou
2010-01-27Merge branch 'testing'Evan Prodromou
Conflicts: theme/base/css/display.css
2010-01-27increment software beta versionEvan Prodromou
2010-01-27Update queue, translation notes in readmeBrion Vibber
2010-01-27Adds an emergency switch so we can run inbox distribution at save time ↵Brion Vibber
(bypassing 'distrib' queue) Set $config['queue']['inboxes'] = false to do so
2010-01-28Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingZach Copley
2010-01-28Numbered format specifiersZach Copley
2010-01-27Merge branch 'testing' of gitorious.org:statusnet/mainlineBrion Vibber
2010-01-27fix update script -- read the diff wrong and put a couple fields on wrong ↵Brion Vibber
table (whoops)
2010-01-28Remove debugging statementZach Copley
2010-01-28Some adjustments to the way API auth works after merging testing and 0.9.xZach Copley
2010-01-28These API methods should return true for ->isReadOnly($args)!Zach Copley
2010-01-27Shuffle params on setup_status_network; adding fullname and pushing tags upBrion Vibber
2010-01-27Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-01-27move script into OpenXPlugin::showAd() so it worksEvan Prodromou
2010-01-27using an action for output in OpenX pluginEvan Prodromou
2010-01-27add additional post-install shell script option for setup_status_network.sh ↵Brion Vibber
to do any other site-specific setup
2010-01-27Plugin to enable OpenX adsEvan Prodromou
2010-01-27Add scripts/sendemail.php to send email to a user's address. Updated ↵Brion Vibber
setup_status_network.sh to create a user with the site's nick, accept site tags, and send a mail to the user (if a template is set) Email and tag params added to the end: setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user' (If multiple tags are needed, separate them with a pipe "|". Be sure to quote properly!) New parameters for setup.cfg need to be set: export PHPBASE=/var/www/statusnet export WILDCARD=example.net export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt export MAILSUBJECT="Your new StatusNet site" $PHPBASE is the base dir for a callable StatusNet install, used to run command-line scripts for user setup. $WILDCARD is the wildcard domain, needed to build a full server name to pass into command-line scripts. $MAILTEMPLATE points to a file containing an e-mail message template. '$nickname', '$sitename', and '$userpass' can be used in the template for substitution. $MAILSUBJECT is the subject line for said email. To skip sending an email on creation, leave $MAILTEMPLATE blank or point to a non-existing file.
2010-01-27Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-01-27width and height should be integers in AdsensePluginEvan Prodromou
2010-01-27Plugin to support Google AdsenseEvan Prodromou
A plugin to easily add Google Adsense blocks to a StatusNet site.
2010-01-27Merge branch 'testing' of gitorious.org:statusnet/mainline into testingZach Copley
* 'testing' of gitorious.org:statusnet/mainline: Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this! Add new oauth tables and modifications to 'consumer' table for rc4
2010-01-27HTTP auth provided is evaluated even if it's not requiredMichele
2010-01-27Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a ↵Brion Vibber
last-minute change after this!
2010-01-27Add new oauth tables and modifications to 'consumer' table for rc4Brion Vibber
2010-01-27Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testingEvan Prodromou
2010-01-27Centred leaderboard adSarven Capadisli
2010-01-27camelcase the uap param namesEvan Prodromou
2010-01-27move leaderboard to after the headerEvan Prodromou
2010-01-27Moved rectangle ad into aside and leaderboard to the right in header.Sarven Capadisli
Intention for this layout was to reduce whitespace in header area
2010-01-27Aligning wide skyscraper to the right instead of leftSarven Capadisli
2010-01-27CSS ids and classes fixed in UAPPluginEvan Prodromou
2010-01-27wrong height for rectangle in BlankAdEvan Prodromou
2010-01-27Add the moved BlankAdPluginEvan Prodromou
2010-01-27make BlankAd dir and change to use a 1x1 imageEvan Prodromou
2010-01-27move BlankAdPlugin to its own dirEvan Prodromou
2010-01-27Add BlankAdPlugin to test ad layout in different themesEvan Prodromou
2010-01-27make uapplugin an abstract classEvan Prodromou
2010-01-27move UAP plugin to coreEvan Prodromou
2010-01-27Lowercased switch cases in UAP PluginSarven Capadisli
2010-01-27Plugin for Universal Ad Package. Outputs four most widely used ad types.Sarven Capadisli
2010-01-27Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to ↵Brion Vibber
discard them even though persistence is enabled on the broker. :) (Thanks Aric!)
2010-01-27quick fix: use common_path() on realtime update JS so it works with the new ↵Brion Vibber
JS path code (will pull from main server for now)
2010-01-27Optionally set a separate Javascript server and pathEvan Prodromou
We have about 10-12 JavaScript pages per Web page. They usually are based on the same server as the Web pages, but since they're static files, it makes sense to offload them to a lite server that handles static files well. This commit lets you set a separate Javascript server and path for the default Javascript code in StatusNet. Squashed commit of the following: commit 139d1622fdafe5ad00c820224416d9021efc3234 Author: Evan Prodromou <evan@status.net> Date: Wed Jan 27 11:30:24 2010 -0500 modules that call htmloutputter::script() don't prescribe js/ path commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87 Author: Evan Prodromou <evan@status.net> Date: Wed Jan 27 11:28:07 2010 -0500 configurable server and path for javascript files
2010-01-27Better alignment for notice in shownotice pageSarven Capadisli