53f14ddde6
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-28 13:39:52 -04:00
9c7b66984c
Enhanced upload file type detection. If given an original filename, we'll 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-28 08:59:47 -07:00
c6b1e25d17
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-26 15:09:30 -04:00
ef7e85c0ab
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-26 15:09:08 -04:00
f0c5e7eca3
Fix for bug #2382 : releasing claim on failed queue item works again with 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-26 15:07:32 -04:00
696e4ba393
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
1eec7f779f
- Add profile_info tag to Atom author
...
- Normalize xmlns:statusnet links in the API
2010-06-22 16:28:06 -07:00
87125a1395
Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message .
...
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
a6ce4eef0d
Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty
2010-06-16 18:27:51 -07:00
d3d499879c
- More useful group info from api/statusnet/group/show
...
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07:00
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07:00
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
ec15546476
Fix a couple bad format entries in router setup (format param had 'xmljson' 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-11 11:52:06 -07:00
e121d472e7
Revert "added notice.location to group by"
...
This reverts commit 48dc899acb
2010-06-09 16:30:50 +12:00
054ac909bf
Merge branch 'integration' into testing
2010-06-07 18:19:12 -07:00
09208f8d65
Basic custom CSS and theme uploading features. 'local' subdir can now be 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-07 18:14:16 -07:00
5a96b9e805
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-07 10:34:00 -07:00
d88b208edc
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
5f4c6ec626
Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, 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-03 16:58:45 -07:00
791b98046d
Stomp blocking writes fix
2010-06-03 16:09:47 -07:00
135b398d4b
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-03 14:50:52 -04:00
9bb48c36ea
Installer tweak to aid with IIS setup: if config.php exists, but is both empty and writable, let the installer proceed and overwrite it.
2010-06-03 10:13:28 -07:00
a5de215267
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-01 13:51:41 -07:00
f4539b52ad
Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP 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-28 16:03:09 -07:00
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
696aeea113
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/language.php
plugins/OpenID/finishaddopenid.php
2010-05-27 14:57:32 -07:00
2b318a3420
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-27 14:22:24 -07:00
697a9948df
Ticket #2329 : fix for use of _m() translation functions from outside of plugin directories
2010-05-27 14:18:08 -07:00
c5b61078e1
Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag)
2010-05-27 13:49:23 -07:00
2062298755
Add $config['queue']['stomp_enqueue_to'] override for which queue server to send to.
...
Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored.
2010-05-21 14:07:59 -07:00
6d8e01ad13
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-21 16:47:57 -04:00
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
2c12d837c6
Disable SSL peer/hostname verification for HTTPClient unless we've 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-21 10:12:39 -07:00
68305d4b68
Added block link to subscription notification emails; block action can now 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-20 14:24:44 -07:00
708d22848e
Quick fix for creating OpenID accounts authenticating against a MediaWiki 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-19 16:19:06 -07:00
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
74a89b1fc3
Locale switch cleanup: use common_switch_locale() which is safer for 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-19 10:10:55 -07:00
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
3708341857
Allow OStatusPlugin to set the source attribution title
2010-05-18 15:16:13 -07:00
6187266205
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
0dfef88cac
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-18 15:15:52 -07:00
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
d9fddff539
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-18 15:15:14 -07:00
48dc899acb
added notice.location to group by
2010-05-17 14:17:49 +12:00
6f19830c9a
fix the column modify on stuff for postgres. change serial to bigserial
2010-05-17 13:50:37 +12:00
9bb18541df
added missing field to the group by. this makes postgres happy
2010-05-15 15:33:55 +12:00
7bd6b62461
comment out the extra bit, cos there's always mysql-only stuff in therre.
...
this isn't a very good idea
2010-05-15 15:32:22 +12:00
a467c0ebba
caitalise the sql keywords
2010-05-15 15:31:54 +12:00
191752138a
indexes now working in postgres schemas
2010-05-15 15:14:11 +12:00
7cf250ff18
removed sneaky debug echo that shouldn't be there
2010-05-15 15:08:22 +12:00
599942f58a
sorted enums and auto_increments on postgres.
...
Still needs inline indexes on table creation
2010-05-15 14:56:40 +12:00
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
3d00cfd47f
Windows server fix: Use platform EOL in debug log file
2010-05-11 12:22:14 -07:00
45392bef33
Installer tweak for Windows: normalize line endings to platform standard in 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-11 12:16:13 -07:00
fba140f4e0
Fix for repeats from the API having null source attribution
2010-05-08 00:07:42 +00:00
3c9686e80f
Fix for repeats from the API having null source attribution
2010-05-07 16:32:24 -07:00
869bc32d0d
Remove errant double HTML entity encoding in API source attribution
2010-05-06 21:48:12 +00:00
ee8c9d1422
Allow OStatusPlugin to set the source attribution title
2010-05-06 21:48:12 +00:00
ce177400f8
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-06 21:48:12 +00:00
209fd12cd0
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-06 21:48:12 +00:00
22fde00def
Refactor and centralize notice source link calculation
2010-05-06 21:48:11 +00:00
b547079b28
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-06 21:48:11 +00:00
e05415f621
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
2010-05-05 17:07:50 -07:00
c2bda7726c
XMPP debugging: log the message source when discarding empty or unrecognized messages.
2010-05-05 13:11:36 -07:00
bb94b78e89
Handle timeout more gracefully in background pings
...
Added a 2-second default timeout for XMLRPC/extended pings, configurable as [ping,timeout].
No longer repeating the entire ping section if we had an HTTP error during a submission.
For now, dropping the bad item and continuing on with others. (Todo: individual retry and cleaner discards of blacklisted broken-for-now sites.)
2010-05-04 18:43:32 -07:00
4fe00a3075
When handling incoming mail, skip everything after a blank line if we already have content
2010-05-03 23:02:25 -04:00
3f2c805652
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-30 15:00:55 -04:00
f888336718
Merge branch 'testing' into 0.9.x
2010-04-29 16:10:16 -07:00
ecfe6b8944
Update codename in common.php
2010-04-29 16:08:20 -07:00
a5761dd814
Update release notes and version number for 0.9.2
2010-04-29 16:06:04 -07:00
2260d6ec7c
Merge branch 'testing' into 0.9.x
...
Conflicts:
index.php
2010-04-29 15:14:51 -07:00
50d5f5e04c
Merge branch 'master' into testing
2010-04-29 15:12:02 -07:00
cb5d6d5c30
Fix charset setting for plugin localizations; default setting was blanking out non-ASCII chars. Needed for eg Bulgarian translation of Facebook plugin, was previously showing all as ???s. Now works yay!
2010-04-28 23:06:08 +00:00
50bfa21814
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-26 02:53:24 -04:00
8fd0059bf6
Test cases and fixes for Atom and RSS content decoding.
...
Fix extraction of Atom <content type="text"> and <content type="html">; we were failing to escape plaintext source data to HTML, and doing an extraneous double-deescape on HTML source resulting in breakage of notices containing text that looks like HTML. Only <content type="xhtml"> was working correctly previously.
Fixes for RSS2 content processing: we were failing to load <content:encoded> at all due to using wrong element name, and were applying an extraneous de-escape for <description> rather than the escaping that is required to turn plaintext into HTML. (Per spec, <description> must be plaintext.)
2010-04-23 15:40:48 -07:00
f852a1931b
Add docs for public_timeline
2010-04-22 15:48:58 -07:00
1b561065b0
Some initial Doxygen-based documentation for the API
2010-04-22 13:11:49 -07:00
beaecb18d5
Add statusnet: prefix for API to JSON and XML output
...
I added the statusnet: prefix to the xml output. This prefix should
be declared on the root element of all relevant XML output.
I also added two StatusNet-specific fields:
* statusnet:html - rendered HTML. Clients shouldn't have to guess
at the correct HTML rendering for notices, especially since some
of the links depend on context.
* statusnet:profile_url - profile URL for a user. You can't count
on a user being a local user in a distributed microblogging world.
So, this shows the explicit profile_url.
2010-04-22 08:49:33 -07:00
c78a10b476
add 'always' parameter to common_shorten_links
2010-04-21 17:14:25 -04:00
1d94b08efc
Revert "Update release notes and version number for 0.9.2"
...
This reverts commit 98f0d970da
2010-04-21 16:24:15 +02:00
98f0d970da
Update release notes and version number for 0.9.2
2010-04-20 15:01:23 -07:00
df41287226
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-04-20 13:52:58 +02:00
61098faf5d
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-04-20 13:52:18 +02:00
c48caa85e1
Fix email notifications for @-replies that come via OStatus.
...
* Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it.
* Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues.
* Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update
2010-04-20 13:49:29 +02:00
32918bb7c1
Test for and use mysqli in installer, since that's what we use later, rather than mysql.
2010-04-19 20:57:12 +02:00
fee6b78e28
Merge branch 'testing' into 0.9.x
2010-04-19 18:47:56 +02:00
369885f04f
Merge branch 'master' into testing
2010-04-19 18:47:11 +02:00
e547a2f54c
Fix ticket #2289 : registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used.
2010-04-19 18:45:50 +02:00
ffd688b8ef
json_encode strings put out as javascript
2010-04-17 14:36:11 -04:00
1081b06bbe
Allow cross-site ajax with CORS.
...
Only allows un-credentialed (as in, no cookies or basic auth), no custom headers, and get (no post, put, delete, etc) requests.
2010-04-15 12:52:59 -04:00
f789928942
Merge branch 'testing' into 0.9.x
2010-04-14 11:15:48 +02:00
9463287710
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:50:42 -07:00
a05e674843
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:49:59 -07:00
Brion Vibber
Zach Copley
Siebrand Mazeland
Evan Prodromou
Brenda Wallace
Craig Andrews
Zachary Copley