summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2010-08-03Merge remote branch 'gitorious/1.0.x' into 1.0.xEvan Prodromou
2010-06-28Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-28Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-06-28Enhanced upload file type detection. If given an original filename, we'll ↵Brion Vibber
attempt to detect type from the extension if we were unable to make a definitive match from content. Generic octet-stream, zip, and MS Office type are explicitly singled out for re-checks, which fixes OpenOffice and MS Office documents to come up with the proper types when misdetected. File extensions can also be added to the upload type whitelist; they'll be normalized to types for the actual comparison, so only known extensions will work.
2010-06-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-26Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
2010-06-26Merge branch 'master' of gitorious.org:statusnet/mainline into testingBrion Vibber
2010-06-26Fix for bug #2382: releasing claim on failed queue item works again with ↵Brion Vibber
DB-based queues. Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
2010-06-26Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-26Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
Conflicts: plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26Merge branch 'master' into testingBrion Vibber
2010-06-24Have API methods for search subclass ApiPrivateAuthActionZach Copley
2010-06-22Throw an error if queueing is disable when using an IM pluginCraig Andrews
2010-06-22- Add profile_info tag to Atom authorZach Copley
- Normalize xmlns:statusnet links in the API
2010-06-21Improve error message per discussion on ↵Siebrand Mazeland
http://translatewiki.net/wiki/Thread:Support/Unclear_message. Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-16Fix problem with AvatarLink in which it was sometimes leaving the width ↵Zach Copley
attribute empty
2010-06-16- More useful group info from api/statusnet/group/showZach Copley
- Add statusnet:group_info tag to group Atom feeds
2010-06-16Use presence of IM plugins to decide if "IM" options should be availableCraig Andrews
2010-06-16Merge branch 'master' into testingBrion Vibber
2010-06-15Use presence of IM plugins to decide if "IM" menu option should be shown in ↵Craig Andrews
Connect
2010-06-14fix URL regex for tags to use UTF-8Evan Prodromou
2010-06-14Merge branch 'master' into testingBrion Vibber
2010-06-11Fix for DB error reporting in installer (MySQL path)Brion Vibber
2010-06-11Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-06-11Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.xBrion Vibber
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.