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
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