Commit Graph

9943 Commits

Author SHA1 Message Date
Zach Copley
311da86762 Use canonical URL for notification in RSSCloud plugin 2010-03-09 11:08:07 +00:00
Zach Copley
d644f4148b Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-09 11:07:42 +00:00
Zach Copley
7afad469c2 Use canonical URL for notification in RSSCloud plugin 2010-03-09 11:07:24 +00:00
Zach Copley
72e4c73373 Use canonical URL for notification in RSSCloud plugin 2010-03-09 11:06:08 +00:00
James Walker
7214db14fe wrong param order to strpos() 2010-03-09 01:24:21 -05:00
Craig Andrews
9466546705 On the OpenID settings page, allow users to remove trustroots. 2010-03-08 21:43:34 -05:00
Craig Andrews
689e2e112b make common_copy_args() work when the post/get request includes arrays (form elements with names ending in [] having multiple values) 2010-03-08 21:43:34 -05:00
Zach Copley
691c88bce8 Only allow RSSCloud subs to canonical RSS2 profile feeds 2010-03-08 23:12:15 +00:00
Zach Copley
f8c5996758 Only allow RSSCloud subs to canonical RSS2 profile feeds 2010-03-08 23:11:52 +00:00
Evan Prodromou
0d66dc543d an otp is a real login 2010-03-08 18:06:21 -05:00
Zach Copley
49722f6550 Only allow RSSCloud subs to canonical RSS2 profile feeds 2010-03-08 22:53:43 +00:00
Craig Andrews
714d920fae Merge branch '0.9.x' into 1.0.x
Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Craig Andrews
51a245f18c Added Memcached plugin (using pecl/memcached versus pecl/memcache) 2010-03-08 17:17:37 -05:00
Siebrand Mazeland
6524efd2a0 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-08 22:48:27 +01:00
Brion Vibber
83ff0260c9 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-08 13:39:46 -08:00
Brion Vibber
927a368d0e CentOS 5.4 still has bad PCRE in stock (though all bets off for PHP packages, since you'd need a version update anyway...) 2010-03-08 13:38:59 -08:00
Brion Vibber
3b0bdc0ae2 Revert "CentOS 5.4 still bogus on a stock install." - bad debug lines crept in
This reverts commit 7e7d88831c.
2010-03-08 13:38:26 -08:00
Brion Vibber
42463e160d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-08 13:37:45 -08:00
Brion Vibber
7e7d88831c CentOS 5.4 still bogus on a stock install. 2010-03-08 13:32:18 -08:00
Brion Vibber
217ad420ac Fix ticket #2208: regression in XMPP sending when server != host
The upstream class sets $this->basejid with host unconditionally, which wasn't previously an issue as the fulljid would always be filled in by the server at connect time before sending messages. With the new queued messaging, we need to make sure we've filled out $this->fulljid correctly without making a connection.
Now using $server if provided to build $this->basejid and $this->fulljid in the queued XMPP proxy class, so queued messages are sent correctly.
2010-03-08 12:19:06 -08:00
Brion Vibber
a77efb2447 XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable 2010-03-08 10:32:40 -08:00
Jeffery To
ef3991dbbe Fixed warning messages when auto-registering a new LDAP user.
On my test system (without memcache), while testing the LDAP
authentication plugin, when I sign in for the first time, triggering
auto-registration, I get these messages in the output page:

Warning: ksort() expects parameter 1 to be array, null given in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php  on line 219

Warning: Invalid argument supplied for foreach() in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php on line 224

Warning: assert() [function.assert]: Assertion failed in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php on line 241

(plus two "Cannot modify header information..." messages as a result of
the above warnings)

This change appears to fix this (although I can't really explain exactly
why).
2010-03-08 13:15:49 -05:00
Jeffery To
3f696ff0ed ldap_get_connection() to return null when passed a config with bad user/pw.
This mainly affects login; before if the user enters a valid username
but invalid password, ldap_get_connection() throws an
LDAP_INVALID_CREDENTIALS error. Now the user sees the regular
"Incorrect username of password" error message.
2010-03-08 13:14:41 -05:00
Evan Prodromou
5f7aa6f2e3 make API realm configurable 2010-03-08 12:36:03 -05:00
Sarven Capadisli
b8cb3d2833 Alignment fix for IE6 2010-03-08 16:08:03 +00:00
Evan Prodromou
e5541d09d0 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-07 23:42:46 -05:00
Evan Prodromou
7faf6ec755 add a script to import Twitter atom feed as notices 2010-03-07 23:42:22 -05:00
Evan Prodromou
3fba9a16f5 add a script to import Twitter atom feed as notices 2010-03-07 23:41:55 -05:00
Siebrand Mazeland
a5cbd1918b Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-07 00:54:04 +01:00
Brenda Wallace
c89ed16d24 Merge commit 'origin/0.9.x' into 0.9.x
Conflicts:
	lib/schema.php
2010-03-07 09:30:07 +13:00
Zach Copley
e97515c877 Remove unused variables, update Twitter ones 2010-03-05 17:05:55 -08:00
Zach Copley
5adb494c26 Remove unused variables, update Twitter ones 2010-03-05 17:05:00 -08:00
Zach Copley
773626aac4 No need to pass in $this->limit and $this-tag 2010-03-05 16:54:06 -08:00
Zach Copley
421041c51a No need to pass in $this->limit and $this-tag 2010-03-05 16:53:48 -08:00
Zach Copley
d59284d42d No need to pass in $this->limit and $this-tag 2010-03-05 16:52:15 -08:00
Zach Copley
3d8ddb7cf1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
  Fixed problem causing 500 error on notices containing a non-existent group
2010-03-05 16:43:21 -08:00
Zach Copley
4ada86560c Fix undefined variable error and some other cleanup 2010-03-05 16:42:27 -08:00
Christopher Vollick
1a03820628 UserRSS Didn't Use the Tag Propery.
This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.
2010-03-05 16:42:17 -08:00
Zach Copley
f653c3b914 Fix undefined variable error and some other cleanup 2010-03-05 16:40:35 -08:00
Ciaran Gultnieks
8029faadae Fixed problem causing 500 error on notices containing a non-existent group 2010-03-06 00:30:15 +00:00
Christopher Vollick
43cc24a0cc UserRSS Didn't Use the Tag Propery.
This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.
2010-03-05 16:29:14 -08:00
Zach Copley
ab8aa67008 Fix for blank RSS1 tag feeds 2010-03-05 16:23:28 -08:00
Zach Copley
c1212fb9e3 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline:
  Localisation updates for !StatusNet from !translatewiki.net !sntrans
2010-03-05 16:21:55 -08:00
Zach Copley
f39d3e34bb Fix for blank RSS1 tag feeds 2010-03-05 16:20:33 -08:00
Brion Vibber
5355c3b7b5 OpenID fix:
- avoid notice on insert (missing sequenceKeys())
- avoid cache corruption on delete (user_id was missing from keys list, cache not cleared for user_id lookups)
2010-03-05 15:00:27 -08:00
Siebrand Mazeland
0c0420f606 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-05 23:41:51 +01:00
Brion Vibber
54de8ad9f2 Initial install-time test for PCRE compiled without Unicode properties, which causes corruption in feeds and other linking problems.
Error message links to help info at http://status.net/wiki/Red_Hat_Enterprise_Linux#PCRE_library
2010-03-05 13:59:39 -08:00
Brion Vibber
248aed7cf4 ticket #697: merge two dupe config bits in config.php.sample 2010-03-05 12:21:30 -08:00
Brion Vibber
89e313e45b OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input. 2010-03-05 10:55:07 -08:00
root
982edc653f Another typo 2010-03-04 23:30:36 -05:00