summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2010-06-11Merge branch 'testing' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-06-11Fix a couple bad format entries in router setup (format param had 'xmljson' ↵Brion Vibber
instead of 'xml|json'). Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-10Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/default.php lib/util.php plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-09Revert "added notice.location to group by"Brenda Wallace
This reverts commit 48dc899acb9a0ac87140353092dab1f5e67753d8.
2010-06-07Merge branch 'integration' into testingBrion Vibber
2010-06-07Basic custom CSS and theme uploading features. 'local' subdir can now be ↵Brion Vibber
customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base. Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory. Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced. Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default. Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled']. Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over) Can set $config['local']['dir'] etc; not currently exposed in the admin panels. Per-site directories on a separate themes server could be set up such as: $config['local']['dir'] = '/path/to/themes/local/' . $_nickname; $config['local']['server'] = 'themes.example.com'; $config['local']['path'] = '/local/' . $_nickname; $config['local']['ssl'] = 'never';
2010-06-07Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-06-07Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: plugins/OpenID/openid.php
2010-06-03Option to divert PuSH items directly to the target site's queue when localBrion Vibber
2010-06-03Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, ↵Brion Vibber
Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers. Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03Stomp blocking writes fixBrion Vibber
2010-06-03Merge branch 'master' of gitorious.org:statusnet/mainlineEvan Prodromou
2010-06-03Installer tweak to aid with IIS setup: if config.php exists, but is both ↵Brion Vibber
empty and writable, let the installer proceed and overwrite it.
2010-06-01Merge branch 'master' of gitorious.org:statusnet/mainlineEvan Prodromou
2010-05-31Widgetize the design formEvan Prodromou
Squashed commit of the following: commit a4610db66974866fdeb98184ce7e2be1470fb4d7 Author: Evan Prodromou <evan@status.net> Date: Mon May 31 08:48:35 2010 -0700 use selfUrl for designform action commit fd9f46ab33caa2c2d0df90d1d596c7b8c6453ce3 Author: Evan Prodromou <evan@status.net> Date: Mon May 31 08:29:43 2010 -0700 fix design settings syntax commit d1797ef9f90bf038665463424ad962bfe039c9f0 Author: Evan Prodromou <evan@status.net> Date: Mon Nov 9 23:23:53 2009 -0500 widgetizing design form
2010-05-28Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP ↵Brion Vibber
gettext module not quite exposing a compatible interface as the backend gettext library. (Most funcs squash null domain parameter into '' empty string, which isn't interpreted as 'use the current default'.)
2010-05-27Assigning my copyrights to the Free Software FoundationCraig Andrews
2010-05-27Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: lib/language.php plugins/OpenID/finishaddopenid.php
2010-05-27Merge branch 'master' of gitorious.org:statusnet/mainlineBrion Vibber
2010-05-27Ticket #2329: fix for use of _m() translation functions from outside of ↵Brion Vibber
plugin directories
2010-05-27Pass auth user into Atom feed generators (needed for outputting favorited ↵Zach Copley
status in statusnet:notice_info tag)
2010-05-21Add $config['queue']['stomp_enqueue_to'] override for which queue server to ↵Brion Vibber
send to. Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored.
2010-05-21Merge branch 'master' of gitorious.org:statusnet/mainlineEvan Prodromou
2010-05-21Merge branch 'testing' into 0.9.xBrion Vibber
2010-05-21Disable SSL peer/hostname verification for HTTPClient unless we've ↵Brion Vibber
configured a trusted CA bundle like this: $config['http']['ssl_cafile'] = '/usr/lib/ssl/certs/ca-certificates.crt'; The previous state was failing on all HTTPS hits due to HTTP_Request2 library turning on the validation check but not specifying a CA file.
2010-05-20Added block link to subscription notification emails; block action can now ↵Brion Vibber
take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger. Fixed typo in RedirectingAction when no return-to data provided in form submission. RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated. More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-19Quick fix for creating OpenID accounts authenticating against a MediaWiki ↵Brion Vibber
site; trim the 'User:' etc from the final path segment before generating a nickname from it. Avoids ending up with nicks like 'userbrion' on your first OpenID login!
2010-05-19Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-05-19Merge branch 'testing' into 0.9.xBrion Vibber
Conflicts: plugins/OpenID/openidlogin.php
2010-05-19Locale switch cleanup: use common_switch_locale() which is safer for ↵Brion Vibber
updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back. Should help with problems where xmppdaemon would get stuck in wrong locale.
2010-05-18Remove errant double HTML entity encoding in API source attributionZach Copley
2010-05-18Allow OStatusPlugin to set the source attribution titleZach Copley
2010-05-18- OStatusPlugin should return true if it doesn't need to handle sourceZach Copley
attribution - Remove stray break statement from NoticeList
2010-05-18HTML entity encode source link URLs in plain XML output and add ↵Zach Copley
rel="nofollow" to them
2010-05-18Refactor and centralize notice source link calculationZach Copley
2010-05-18Add xmlns:statusnet and statusnet:notice_info element to Atom entries for ↵Zach Copley
notices
2010-05-17added notice.location to group byBrenda Wallace
2010-05-17fix the column modify on stuff for postgres. change serial to bigserialBrenda Wallace
2010-05-15added missing field to the group by. this makes postgres happyBrenda Wallace
2010-05-15comment out the extra bit, cos there's always mysql-only stuff in therre.Brenda Wallace
this isn't a very good idea
2010-05-15caitalise the sql keywordsBrenda Wallace
2010-05-15indexes now working in postgres schemasBrenda Wallace
2010-05-15removed sneaky debug echo that shouldn't be thereBrenda Wallace
2010-05-15sorted enums and auto_increments on postgres.Brenda Wallace
Still needs inline indexes on table creation
2010-05-14Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-05-14Merge branch 'testing' into 0.9.xBrion Vibber
2010-05-11Windows server fix: Use platform EOL in debug log fileBrion Vibber
2010-05-11Installer tweak for Windows: normalize line endings to platform standard in ↵Brion Vibber
generated config.php Added a comment that the writable directory checks are insufficient to catch ACL problems on Windows; need a better check for that.
2010-05-07Fix for repeats from the API having null source attributionZach Copley
2010-05-08Fix for repeats from the API having null source attributionZach Copley