Brion Vibber
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
Brion Vibber
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07:00
Brion Vibber
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
Brion Vibber
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
Brion Vibber
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
Brenda Wallace
e121d472e7
Revert "added notice.location to group by"
...
This reverts commit 48dc899acb
.
2010-06-09 16:30:50 +12:00
Brion Vibber
054ac909bf
Merge branch 'integration' into testing
2010-06-07 18:19:12 -07:00
Brion Vibber
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
Brion Vibber
5a96b9e805
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-07 10:34:00 -07:00
Brion Vibber
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
Brion Vibber
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
Brion Vibber
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
Brion Vibber
791b98046d
Stomp blocking writes fix
2010-06-03 16:09:47 -07:00
Evan Prodromou
135b398d4b
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-03 14:50:52 -04:00
Brion Vibber
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
Evan Prodromou
a5de215267
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-01 13:51:41 -07:00
Brion Vibber
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
Craig Andrews
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
Brion Vibber
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
Brion Vibber
2b318a3420
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-27 14:22:24 -07:00
Brion Vibber
697a9948df
Ticket #2329 : fix for use of _m() translation functions from outside of plugin directories
2010-05-27 14:18:08 -07:00
Zach Copley
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
Brion Vibber
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
Evan Prodromou
6d8e01ad13
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-21 16:47:57 -04:00
Brion Vibber
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
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
Brion Vibber
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Brion Vibber
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
Zach Copley
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
Zach Copley
3708341857
Allow OStatusPlugin to set the source attribution title
2010-05-18 15:16:13 -07:00
Zach Copley
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
Zach Copley
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
Zach Copley
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
Zach Copley
d9fddff539
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-18 15:15:14 -07:00
Brenda Wallace
48dc899acb
added notice.location to group by
2010-05-17 14:17:49 +12:00
Brenda Wallace
6f19830c9a
fix the column modify on stuff for postgres. change serial to bigserial
2010-05-17 13:50:37 +12:00
Brenda Wallace
9bb18541df
added missing field to the group by. this makes postgres happy
2010-05-15 15:33:55 +12:00
Brenda Wallace
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
Brenda Wallace
a467c0ebba
caitalise the sql keywords
2010-05-15 15:31:54 +12:00
Brenda Wallace
191752138a
indexes now working in postgres schemas
2010-05-15 15:14:11 +12:00
Brenda Wallace
7cf250ff18
removed sneaky debug echo that shouldn't be there
2010-05-15 15:08:22 +12:00
Brenda Wallace
599942f58a
sorted enums and auto_increments on postgres.
...
Still needs inline indexes on table creation
2010-05-15 14:56:40 +12:00
Brion Vibber
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
Brion Vibber
3d00cfd47f
Windows server fix: Use platform EOL in debug log file
2010-05-11 12:22:14 -07:00
Brion Vibber
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
Zach Copley
fba140f4e0
Fix for repeats from the API having null source attribution
2010-05-08 00:07:42 +00:00
Zach Copley
3c9686e80f
Fix for repeats from the API having null source attribution
2010-05-07 16:32:24 -07:00
Zach Copley
869bc32d0d
Remove errant double HTML entity encoding in API source attribution
2010-05-06 21:48:12 +00:00
Zach Copley
ee8c9d1422
Allow OStatusPlugin to set the source attribution title
2010-05-06 21:48:12 +00:00
Zach Copley
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
Zach Copley
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
Zach Copley
22fde00def
Refactor and centralize notice source link calculation
2010-05-06 21:48:11 +00:00
Zach Copley
b547079b28
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-06 21:48:11 +00:00
Brion Vibber
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
Brion Vibber
c2bda7726c
XMPP debugging: log the message source when discarding empty or unrecognized messages.
2010-05-05 13:11:36 -07:00
Brion Vibber
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
Craig Andrews
4fe00a3075
When handling incoming mail, skip everything after a blank line if we already have content
2010-05-03 23:02:25 -04:00
Evan Prodromou
3f2c805652
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-30 15:00:55 -04:00
Brion Vibber
f888336718
Merge branch 'testing' into 0.9.x
2010-04-29 16:10:16 -07:00
Brion Vibber
ecfe6b8944
Update codename in common.php
2010-04-29 16:08:20 -07:00
Zachary Copley
a5761dd814
Update release notes and version number for 0.9.2
2010-04-29 16:06:04 -07:00
Brion Vibber
2260d6ec7c
Merge branch 'testing' into 0.9.x
...
Conflicts:
index.php
2010-04-29 15:14:51 -07:00
Brion Vibber
50d5f5e04c
Merge branch 'master' into testing
2010-04-29 15:12:02 -07:00
Brion Vibber
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
Evan Prodromou
50bfa21814
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-26 02:53:24 -04:00
Evan Prodromou
93e76f3b83
use statusnet_ as namespace prefix for JSON
2010-04-24 12:14:12 -04:00
Brion Vibber
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
Zach Copley
f852a1931b
Add docs for public_timeline
2010-04-22 15:48:58 -07:00
Zach Copley
1b561065b0
Some initial Doxygen-based documentation for the API
2010-04-22 13:11:49 -07:00
Evan Prodromou
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
Craig Andrews
c78a10b476
add 'always' parameter to common_shorten_links
2010-04-21 17:14:25 -04:00
Brion Vibber
1d94b08efc
Revert "Update release notes and version number for 0.9.2"
...
This reverts commit 98f0d970da
.
Per xopher we're not yet ready to push 0.9.2 theme directories live; we also haven't merged down various things from testing that need to be in the release such as installer fixes.
2010-04-21 16:24:15 +02:00
Zachary Copley
98f0d970da
Update release notes and version number for 0.9.2
2010-04-20 15:01:23 -07:00
Brion Vibber
df41287226
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-04-20 13:52:58 +02:00
Brion Vibber
61098faf5d
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-04-20 13:52:18 +02:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
fee6b78e28
Merge branch 'testing' into 0.9.x
2010-04-19 18:47:56 +02:00
Brion Vibber
369885f04f
Merge branch 'master' into testing
2010-04-19 18:47:11 +02:00
Brion Vibber
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
Craig Andrews
ffd688b8ef
json_encode strings put out as javascript
2010-04-17 14:36:11 -04:00
Craig Andrews
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
Brion Vibber
f789928942
Merge branch 'testing' into 0.9.x
2010-04-14 11:15:48 +02:00
Brion Vibber
9463287710
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:50:42 -07:00
Brion Vibber
a05e674843
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:49:59 -07:00
Siebrand Mazeland
c59e90b20b
Number parameters
2010-04-11 23:57:18 +02:00
Siebrand Mazeland
8795b3546d
Add translator documentation and number parameters if multiple are used in a message.
2010-04-11 23:39:24 +02:00
Siebrand Mazeland
ec0fee0f2a
Add translator documentation and FIXMEs that plural support should be added for some messages.
2010-04-11 22:15:41 +02:00
Brion Vibber
7fada4ddcc
Fix syntax errors that snuck in while documenting translations
2010-04-10 19:38:58 -07:00
Brion Vibber
1eeb23e1e3
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/confirmaddress.php
2010-04-10 17:56:11 -07:00
Brion Vibber
edd883d3b0
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-04-10 17:54:37 -07:00
Siebrand Mazeland
9b788471d4
Add translator documentation.
2010-04-10 22:50:15 +02:00
Siebrand Mazeland
204cf0b96b
Add translator documentation
...
* approved message had not been i18n-ed
* also had to i18n 'read-only' and 'read-write'
2010-04-10 22:49:33 +02:00
Siebrand Mazeland
1661be6851
i18n for low level logging is not needed.
2010-04-10 21:59:17 +02:00
Siebrand Mazeland
ddc116cffe
Add translator documentation for a few files
...
* added a few XXX (that's StatusNet for FIXME, right?)
** proposing de-duplication of a message appearing ~50 times
** marking bad pagination implementation
* moved the TRANS: comments in action.php down to exactly before the line in which the message appears. Otherwise gettext does not put them in the pot file
* fixed a XXX in action.php removing double spaces
2010-04-10 21:12:14 +02:00
Evan Prodromou
5d96cf2eec
catch UserNoProfileException and continue
2010-04-10 11:36:23 -04:00
Siebrand Mazeland
86a3016a6f
Document messages for which clarification was requested.
...
Because N/S/E/W were on the same lines, and the "// TRANS:" comment must be directly above the line in which the message is located to work, I added the messages to a variable first.
2010-04-10 01:49:25 +02:00
Siebrand Mazeland
518832da28
Document messages for which clarification was requested.
2010-04-10 01:48:16 +02:00
Brion Vibber
6fb60fb57f
Fix for conversation check in @-reply notification email; i18n cleanup on mail messages: fixed some bad gettext usage, added trans doc comments.
2010-04-09 12:02:11 -07:00
Brion Vibber
d00942cce1
Fix for conversation check in @-reply notification email; i18n cleanup on mail messages: fixed some bad gettext usage, added trans doc comments.
2010-04-09 11:56:27 -07:00
Brion Vibber
41062d387f
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:58:14 -07:00
Brion Vibber
4a028d5e35
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:58:00 -07:00
Brion Vibber
a5cfc3954f
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:56:43 -07:00
Brion Vibber
1f8451f4aa
Merge branch 'testing' into 0.9.x
2010-04-09 08:40:15 -07:00
Brion Vibber
5dbaaed4e6
Maintain 'page' parameter for block from subscribers list, block & make-admin from group members list.
...
Refactored some of the returnto handling code. It looks like we have several different ways of handling this in the software, icky!
Marked the session-based functions with fixmes (they'll stomp on other forms when multiple tabs/windows are used) and combined some commonish bits of code between ProfileFormAction and the group block & makeadmin actions where they're using hidden form parameters. Extended that to allow passing dynamic parameters (eg 'page') as well as static ones (action, target user/group).
2010-04-08 19:06:55 -07:00
Brion Vibber
6274c3977d
In single-user mode, link #hashtags to the user's tagged stream rather than the global tag action, which isn't registered.
...
Previously they would end up pointing to the home URL.
2010-04-08 17:06:25 -07:00
Brion Vibber
0e0927985c
Revert "scripts/strip_geo.php to remove geodata from notices by a given user/profile."
...
This reverts commit ab20e75ff8
.
Accidentally removed another commit; clearing up...
2010-04-08 17:04:10 -07:00
Brion Vibber
ab20e75ff8
scripts/strip_geo.php to remove geodata from notices by a given user/profile.
...
May be slow or run out of memory if run on particularly prolific posters -- not yet optimized for that case.
Note that geodata that has already been sent out to other services (via ostatus, omb, twitter, etc) will not be removed from them.
2010-04-08 16:58:54 -07:00
Siebrand Mazeland
cb38163e8d
Update supported languages:
...
* fix name for Irish/ga
* add Galician/gl
2010-04-09 01:16:41 +02:00
Brion Vibber
88678eadfa
In single-user mode, link #hashtags to the user's tagged stream rather than the global tag action, which isn't registered.
...
Previously they would end up pointing to the home URL.
2010-04-08 13:12:14 -07:00
Brion Vibber
f255b368ed
Refactor installer into base class plus web and CLI installers.
...
scripts/install_cli.php is a bit experimental at present but works.
2010-04-07 17:47:08 -07:00
Siebrand Mazeland
ae139c4ddf
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
* add Afrikaans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-07 01:14:31 +02:00
Brion Vibber
5dc169260d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-04-06 15:22:23 -07:00
Brion Vibber
b71f276ed5
Merge branch 'master' into testing
2010-04-05 10:42:41 -07:00
Evan Prodromou
98905de69d
make profilelist homepage link attributes overrideable
2010-04-05 11:17:06 -04:00
Evan Prodromou
0b30230b5a
Merge branch 'nofollow'
2010-04-05 11:04:47 -04:00
Evan Prodromou
2e51d33145
override linkAttributes() method for subscribersminilist
2010-04-05 10:46:55 -04:00
Evan Prodromou
dd053aa349
override linkAttributes() method for profileminilist
2010-04-05 10:46:38 -04:00
Evan Prodromou
19401f6530
add linkAttributes() method for profilelist
2010-04-05 10:46:26 -04:00
Evan Prodromou
a313aeab9c
lib/default.php has nofollow group
2010-04-05 10:24:22 -04:00
Evan Prodromou
7fb8d0c471
breakout subscribers minilist
2010-04-05 10:22:54 -04:00
Evan Prodromou
8d335f0c86
balance brackets on profileminilist
2010-04-05 10:14:45 -04:00
Evan Prodromou
5414096c44
add an event for subscribers minilist
2010-04-05 10:12:40 -04:00
Brion Vibber
e4d934827b
Merge branch 'testing' into 0.9.x
2010-04-02 15:48:39 -07:00
Brion Vibber
6cd0637e55
Ticket 2271: extra whitespace in underlined link for username in notice lists
...
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
2010-04-02 09:34:42 -07:00
Brion Vibber
b10ff031d9
Ticket 2271: extra whitespace in underlined link for username in notice lists
...
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
2010-04-02 09:32:03 -07:00
Evan Prodromou
ac9fda4bc0
ProfileMiniListItem does same events as ProfileListItem
2010-04-01 15:53:17 -04:00
Brion Vibber
df9eb4164a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 12:48:24 -07:00
Sarven Capadisli
89bb053116
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 11:00:22 +02:00
Sarven Capadisli
534c12e540
Revert "Multiple file upload handling."
...
This reverts commit 260f00d60b
.
As mentioned in
260f00d60b (comment_8367)
Reverting this merge until the bugs are fixed and there is a general
agreement on the need for this enhancement.
2010-03-31 10:57:20 +02:00
Brion Vibber
0841fa712e
Ticket #1281 : JID validation now more or less follows spec instead of calling e-mail validator
...
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).
* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
2010-03-30 17:35:27 -07:00
Brion Vibber
0284e1315c
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:45:35 -07:00
Brion Vibber
ca897ef346
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:10:29 -07:00
Brion Vibber
faa14b64ab
Tweak to Eugene Crosser's patch to make transactions and acks configurable; disabling them gets basic message delivery working under MorbidQ, and may help with RabbitMQ etc.
...
I swapped the settings from negative to positive ($config['queue']['stomp_transactions'] = false rather than $config['queue']['stomp_no_transactions'] = true), gave them defaults (both on for best ActiveMQ experience), and added notes to the README about configuring them.
2010-03-29 15:46:41 -07:00
Eugene Crosser
bd1363c17a
Make stomp queue manager work with basic servers
...
Signed-off-by: Eugene Crosser <crosser@average.org>
2010-03-29 15:31:43 -07:00
Brion Vibber
cfeb1bfa41
Merge branch 'testing' into 0.9.x
2010-03-29 15:15:11 -07:00
Brion Vibber
873b832827
Merge branch 'master' into testing
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2010-03-29 15:14:25 -07:00
Brion Vibber
a8d92dad5e
Renamed HTTPResponse class to StatusNet_HTTPResponse to avoid conflict with PECL HTTP extension.
...
The class isn't referenced by name by any other code I can see so this should have no side effects.
2010-03-29 15:07:15 -07:00
Brion Vibber
d44e5ac935
Add $config['db']['annotate_queries'] option to include caller ID comments into queries. Comment can then be seen in process list, slow query logs on the server, aiding in tracking down unexpected slow queries.
...
SELECT /* queuedaemon.php Ostatus_profile->processPost */ * FROM notice WHERE ( notice.uri = 'http://stormcloud.local/mublog2/notice/479 ' )
INSERT /* POST Notice::saveNew */ INTO notice (profile_id , content ....
2010-03-29 13:14:11 -07:00
Evan Prodromou
f0d905112e
Merge branch 'master' into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-28 15:25:02 -04:00
Evan Prodromou
ddc71b6637
update README and version number
2010-03-28 11:39:56 -04:00
Evan Prodromou
29566c5d4b
move check for bad IDs from activityobject to activity and make simpler
2010-03-27 22:44:10 -04:00
Nick Holliday
260f00d60b
Multiple file upload handling.
2010-03-26 18:28:54 -04:00
Craig Andrews
1bf27de9b9
if there is oembed data for a file/link, consider that link to have an attachment
2010-03-26 18:13:45 -04:00
Zach Copley
60009227f7
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 19:58:59 +00:00
Zach Copley
b82e55356d
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 19:58:15 +00:00
Zach Copley
379df1ce3e
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 18:51:01 +00:00
Brion Vibber
511a164c99
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-03-25 14:32:28 -07:00
Brion Vibber
e174a7211d
Restore lost addition of inline HTML attachment display.
2010-03-25 14:31:22 -07:00
Evan Prodromou
46655eb3ca
version number and codename
2010-03-25 17:25:26 -04:00
Sarven Capadisli
5e79ef58e4
Using hCard label instead of location. Matches userprofile.
2010-03-25 22:20:14 +01:00
Sarven Capadisli
2b3a2e6b6d
Updated tag list output in subscriptions list. Matches userprofile.
2010-03-25 22:20:06 +01:00
Sarven Capadisli
41c8048efd
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-25 22:19:50 +01:00
Brion Vibber
c11064a539
Updated 'more' anchor for attachments to do an XHR GET
...
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
2010-03-25 14:15:54 -07:00
Sarven Capadisli
3c5586d4bd
Using rel=external instead of class=external for jOverlay title link
2010-03-25 21:33:38 +01:00
Sarven Capadisli
53bed00f90
Added rel=external to geo location link
2010-03-25 21:33:26 +01:00
Sarven Capadisli
321093886f
Assigned an identifier for the representative user and group profile
2010-03-25 21:32:28 +01:00
Brion Vibber
29a25848de
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-25 13:04:09 -07:00
Evan Prodromou
920acf8d96
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-25 13:50:49 -04:00
Brion Vibber
ecb009bcf5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-24 13:57:20 -07:00
Brion Vibber
a954fd65ba
Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml
2010-03-24 13:36:57 -07:00
Sarven Capadisli
09ff213d1c
Using hCard label instead of location. Matches userprofile.
2010-03-24 20:58:13 +01:00
Sarven Capadisli
e7ae36b52a
Updated tag list output in subscriptions list. Matches userprofile.
2010-03-24 20:50:07 +01:00
Sarven Capadisli
647b3a1f6b
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-24 14:50:12 +01:00
Craig Andrews
abe4be5438
Use $param instead of hardcoded 'attach' name.
2010-03-23 22:42:30 -04:00
Brion Vibber
7277b59734
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-23 12:13:32 -07:00
Brion Vibber
16fa03212b
Ticket 2188: add a daily average post count to profile statistics sidebar.
...
When we have more detailed history stats, this'd be a good place to link to details/graphs.
2010-03-23 11:25:36 -07:00
Brion Vibber
44caa3a93f
Consistently send Profiles into Fave::addNew()
2010-03-23 11:08:30 -07:00
Brion Vibber
533a3bf6a3
Consistently send Profiles into Fave::addNew()
2010-03-23 11:06:37 -07:00
Brion Vibber
80b16c8499
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:56:05 -07:00
Brion Vibber
2d79455a1f
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:54:24 -07:00
Evan Prodromou
dd115fcb08
change router to allow hooking path connections
2010-03-23 12:33:41 -04:00
Brion Vibber
a5c78a6f1a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 08:21:32 -07:00
Zach Copley
b8e97ac709
Some initial media parsing
...
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
Brion Vibber
26f49de0dd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
Brion Vibber
4168b9cec1
Log backtraces for non-ClientException exceptions caught at the top-level handler.
2010-03-22 11:33:56 -07:00
Brion Vibber
5697e4edb0
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:51:01 -07:00
Brion Vibber
7aee7670c7
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:35:54 -07:00
Brion Vibber
be7efe7504
Merge branch 'testing' into 0.9.x
2010-03-21 16:28:56 -07:00
Brion Vibber
fcb614d0eb
Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri
2010-03-21 16:25:12 -07:00
Evan Prodromou
97bd7e22da
correct creation of avatar links for RSS and Posterous elements
2010-03-20 17:18:24 -05:00
Evan Prodromou
11a86d046e
move atom category to its own file, too
2010-03-20 16:55:36 -05:00
Evan Prodromou
323ff31fbd
special-case Posterous author element for activity actor
2010-03-20 16:53:30 -05:00
Evan Prodromou
e458e9fe63
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/activity.php
2010-03-20 16:11:42 -05:00
Evan Prodromou
99454be38c
Move activity classes to their own files
...
Moved the various classes used by the Activity class to their own
files. There were >10 classes in the same file, with around 1500 lines
in the file. Just too big.
This change makes autoloading work for these classes, so also removed
the hard require in lib/common.php.
2010-03-20 16:06:22 -05:00
Craig Andrews
aa6e198c12
Remove deprecated call-time pass-by-reference
2010-03-20 12:04:46 -04:00
Evan Prodromou
2fc0f0433e
allow html content in summary and clean it out of title
2010-03-20 09:30:28 -05:00
Evan Prodromou
65c8dc313c
rename $rss to $channel to prevent misunderstanding
...
RSS feeds have the format
<rss><channel><item/><item/><item/></channel></rss>. The element named
$rss was actually the <channel> element, so I renamed the variable so
I wouldn't hurt my head.
2010-03-20 07:19:54 -05:00
Brion Vibber
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
Evan Prodromou
022c13418d
make deriving a subject from an RSS channel work
2010-03-19 15:49:38 -05:00
Evan Prodromou
1292230e38
move ActivityObject constructors from Activity to ActivityObject
2010-03-19 15:41:48 -05:00
Evan Prodromou
13b1acdd08
only search elements for links
2010-03-19 15:28:25 -05:00
Evan Prodromou
05e3768e6a
Parse RSS items as activities
...
First steps to parsing RSS items as activities. RSS feeds don't seem
to have enough data to make good remote profiles, but this may work
with some "hints".
2010-03-19 09:48:39 -05:00
Brion Vibber
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
Brion Vibber
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Craig Andrews
26ba430ae8
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 15:39:06 -07:00
Craig Andrews
9c5af9a38f
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 18:13:54 -04:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00