Commit Graph

9100 Commits

Author SHA1 Message Date
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
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
Rasmus Lerdorf
086d517b87 Fix a few typos 2010-03-04 23:30:04 -05:00
Dave Hall
dbe6b979d7 implement mail headers 2010-03-04 23:10:27 -05:00
Zach Copley
b8001ea107 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-05 03:56:04 +00:00
Zach Copley
e3c4b0c85d A better way to safely delete Foreign_links 2010-03-05 03:55:56 +00:00
Zach Copley
6aac7cc6cd Fix for errant deletion of all Twitter foreign_links 2010-03-05 03:55:39 +00:00
Zach Copley
6a377a4ba4 A better way to safely delete Foreign_links 2010-03-05 03:14:40 +00:00
Zach Copley
029b8c9014 Fix for errant deletion of all Twitter foreign_links 2010-03-05 02:27:01 +00:00
Brion Vibber
064c45890f fix ver ref in upgrade instructions 2010-03-04 14:45:55 -08:00
Brion Vibber
2f41e93339 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-04 14:44:38 -08:00
Zach Copley
980d1a66ec Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Updated note on geo location and added a note on user roles
  Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)
2010-03-04 11:19:02 -08:00
Zach Copley
fc3b53853f Make indenting consistent in README 2010-03-04 11:18:30 -08:00
Siebrand Mazeland
3060bdafc5 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Added Breton.

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-04 20:16:30 +01:00
Sarven Capadisli
be4b482f13 Updated note on geo location and added a note on user roles 2010-03-04 14:11:18 -05:00
Siebrand Mazeland
5dbcc184c9 Add Breton to language.php 2010-03-04 20:04:44 +01:00
Brion Vibber
16e2399885 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 11:01:09 -08:00
Siebrand Mazeland
0bb06261d9 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-04 20:00:40 +01:00
Brion Vibber
89833ce1ff Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.) 2010-03-04 11:00:02 -08:00
Zach Copley
e6f379f8a3 Normalize whitespace in the README -- all tabs to (4) spaces 2010-03-04 10:57:35 -08:00
Evan Prodromou
96c06dd75d note betas are obsolete now 2010-03-04 13:56:02 -05:00
Evan Prodromou
292ff3a6ee Merge commit 'gitorious/testing' into testing 2010-03-04 13:53:13 -05:00
Zach Copley
7d1ba4ff3b Remove reference to $config['profile']['banned'] -- superceded by blacklist 2010-03-04 10:48:37 -08:00
Evan Prodromou
1e55266afa Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:46:05 -05:00
Evan Prodromou
1b49e9d278 banned no longer supported 2010-03-04 13:45:31 -05:00
Sarven Capadisli
0736493f46 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 13:43:49 -05:00
Sarven Capadisli
a4ec64ff45 Slight right alignment for remote button in minilists 2010-03-04 13:43:28 -05:00
Brion Vibber
4d3f90ed19 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-04 10:41:25 -08:00