summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-01-28Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xZach Copley
2010-01-28'Sign in with Twitter' button imgZach Copley
2010-01-28Update to aside styles in biz themeSarven Capadisli
2010-01-28Update to notice item in biz themeSarven Capadisli
2010-01-28Update to biz theme button close and minimize stylesSarven Capadisli
2010-01-28Update to biz theme's input stylesSarven Capadisli
2010-01-28Updated biz theme entity_actions stylesSarven Capadisli
2010-01-28Updated biz theme to use dialogbox stylesSarven Capadisli
2010-01-28Updated biz theme notice optionsSarven Capadisli
2010-01-28Updated biz theme to hide form_repeat legendSarven Capadisli
2010-01-28Updated biz theme to use the single icons fileSarven Capadisli
2010-01-28Updated geo sharing styles for bizSarven Capadisli
2010-01-28Fixed layout when ad plugin is on for bizSarven Capadisli
2010-01-28Fixed layout for powered by statusnet in bizSarven Capadisli
2010-01-28Removed avatar from repeat of username (matches noticelist)Sarven Capadisli
2010-01-28Removed unused variable assignment for avatar URL and added missing fnSarven Capadisli
2010-01-28Move faceboookapp.js to the Facebook pluginZach Copley
2010-01-28Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.xZach 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-28L10n updates:Siebrand Mazeland
* app -> application * number parameters when using more than one in a message
2010-01-28Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
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