summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-27Merge branch 'testing' into -1.9.xZach Copley
* testing: (130 commits) HTTP auth provided is evaluated even if it's not required 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 Centred leaderboard ad camelcase the uap param names move leaderboard to after the header Moved rectangle ad into aside and leaderboard to the right in header. Aligning wide skyscraper to the right instead of left CSS ids and classes fixed in UAPPlugin wrong height for rectangle in BlankAd Add the moved BlankAdPlugin make BlankAd dir and change to use a 1x1 image move BlankAdPlugin to its own dir Add BlankAdPlugin to test ad layout in different themes make uapplugin an abstract class move UAP plugin to core Lowercased switch cases in UAP Plugin Plugin for Universal Ad Package. Outputs four most widely used ad types. Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to discard them even though persistence is enabled on the broker. :) (Thanks Aric!) quick fix: use common_path() on realtime update JS so it works with the new JS path code (will pull from main server for now) ... Conflicts: actions/apioauthaccesstoken.php actions/apioauthauthorize.php actions/apioauthrequesttoken.php actions/editapplication.php actions/newapplication.php lib/apiauth.php lib/queuemanager.php lib/router.php
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
2010-01-27Better alignment for notice in shownotice pageSarven Capadisli
2010-01-27Test script to update your status via OAuthZach Copley
2010-01-27s/LOG_WARN/LOG_WARNING/Zach Copley
2010-01-27- Check for read-only vs. read-write access to protected API resources (OAuth)Zach Copley
- Some cleanup
2010-01-27Make more complete sentence.Siebrand Mazeland
2010-01-27Fix casing for HMAC-SHA1.Siebrand Mazeland
2010-01-27Fix inconsistent title case in page titleSiebrand Mazeland
2010-01-26New access admin panel for site registration settingsZach Copley
2010-01-26- Remove redudant/unused 'server' setting from site admin panelZach Copley
- Move 'fancy urls' checkbox from site admin panel to paths admin panel
2010-01-26Control channel for queue daemons to request graceful shutdown, restart, or ↵Brion Vibber
update to listen to a newly added or reconfigured site. queuectl.php --update -s<site> queuectl.php --stop queuectl.php --restart Default control channel is /topic/statusnet-control. For external utilities to send a site update ping direct to the queue server, connect via Stomp and send a message formatted thus: update:<nickname> (Nickname here, *not* server hostname! The rest of the queues will be updated to use nicknames later.) Note that all currently-connected queue daemons will get these notifications, including both queuedaemon.php and xmppdaemon.php. (XMPP will ignore site update requests for sites that it's not handling.) Limitations: * only implemented for stomp queue manager so far * --update may not yet handle a changed server name properly * --restart won't reload PHP code files that were already loaded at startup. Still need to stop and restart the daemons from 'outside' when updating code base.
2010-01-26Site metadata tags in status_network: single 'tags' field, pipe-separated.Brion Vibber
$sn->tags() returns tag list as array; $sn->hasTag('blah') to check for a particular tag only Could be used to control things in config file: $sn = Status_network::setupSite($_server, $_path, $_wildcard); if (!$sn) { die("No such site"); } if ($sn->hasTag('individual')) { /* blah */ } Note memcached keys are unchanged; if tags are changed from an external tool clear: statusnet:<dbname>:status_network:<key>:<val> for <key>s 'nickname', 'hostname', and 'pathname'
2010-01-26Updated geolocation sharing in notice form for Realtime popSarven Capadisli
2010-01-26Updated geolocation sharing in notice form for Realtime popSarven Capadisli
2010-01-26Add Julien C to author commentsZach Copley
2010-01-26- Remove redundant functionZach Copley
- clean up log msgs
2010-01-26Use "Sign in with Twitter" auth pattern and official Twitter button for ↵Zach Copley
Twitter-based login. See: http://apiwiki.twitter.com/Sign-in-with-Twitter
2010-01-26Ask the user to set a password before disconnecting from TwitterZach Copley
2010-01-26- Twitter username wasn't getting stored in Foreign_user when linking ↵Zach Copley
Twitter account (fixed) - Updates to comments
2010-01-26Allow logging in using TwitterJulien C
Signed-off-by: Julien C <chaumond@gmail.com>
2010-01-26Add Julien C to author commentsZach Copley
2010-01-26- Remove redundant functionZach Copley
- clean up log msgs
2010-01-26Use "Sign in with Twitter" auth pattern and official Twitter button for ↵Zach Copley
Twitter-based login. See: http://apiwiki.twitter.com/Sign-in-with-Twitter
2010-01-26Ask the user to set a password before disconnecting from TwitterZach Copley
2010-01-26- Twitter username wasn't getting stored in Foreign_user when linking ↵Zach Copley
Twitter account (fixed) - Updates to comments
2010-01-26Allow logging in using TwitterJulien C
Signed-off-by: Julien C <chaumond@gmail.com>