Commit Graph

9997 Commits

Author SHA1 Message Date
Siebrand Mazeland
54d2ed8b05 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-02-04 23:09:37 +01:00
Eric Helgeson
2eadeca745 Missed change when refactoring groups. Thanks macno 2010-02-04 14:00:46 -08:00
Eric Helgeson
37f3a3d558 Missed change when refactoring groups. Thanks macno 2010-02-04 14:00:06 -08:00
Brion Vibber
0d0749e224 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 13:12:18 -08:00
Brion Vibber
ed8553eea8 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-04 13:11:41 -08:00
Brion Vibber
239b88025e Should fix spurious 'nickname taken' and 'email taken' errors on registration. Form's checks for existing nicks & emails would incorrectly return true on the second lookup due to bad interaction with negative caching.
(was checking $obj !== false but we return null now on negative cache hits, with false for cache misses)
2010-02-04 13:08:34 -08:00
Brion Vibber
c59eee72a8 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 12:23:56 -08:00
Brion Vibber
a020e23086 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-04 11:56:07 -08:00
Sarven Capadisli
5bdc6fa5d4 Moved hardcoded identica theme out of MobileProfile. In this case, it
will use whichever theme is loaded as its base and then add its own
mobile styles. Of course, if a theme comes with its own mobile styles,
it will use that instead as an addition to its own base.
2010-02-04 19:42:33 +00:00
Sarven Capadisli
e891075494 Moved hardcoded identica theme out of MobileProfile. In this case, it
will use whichever theme is loaded as its base and then add its own
mobile styles. Of course, if a theme comes with its own mobile styles,
it will use that instead as an addition to its own base.
2010-02-04 19:39:46 +00:00
Brion Vibber
5a1cbdc6f1 Add time-based cutoffs for public tag cloud, favorited lists to speed up those queries.
Defaulting to only looking at last 90 days of activity, can be adjusted up or down.

$config['tag']['cutoff'] = 86400 * 90;
$config['popular']['cutoff'] = 86400 * 90;

Per-user and per-group tag clouds do not use the cutoff (and it doesn't help with indexing on them).
2010-02-04 11:06:01 -08:00
Sarven Capadisli
7ebd13fa69 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-04 16:56:34 +00:00
Sarven Capadisli
9e940445f1 Added accept and reject icons to remote subscription authorization 2010-02-04 17:55:36 +01:00
Sarven Capadisli
48782ee1d9 Fixes minor remote subscription profile layout 2010-02-04 17:55:24 +01:00
Sarven Capadisli
c56250fb33 Added accept and reject icons to remote subscription authorization 2010-02-04 16:51:51 +00:00
Sarven Capadisli
d2dc3e41c5 Fixes minor remote subscription profile layout 2010-02-04 16:27:34 +00:00
Siebrand Mazeland
28d02308d3 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-02-04 11:35:58 +01:00
Zach Copley
feaf938ffd Make Twitter bridge truncate and add a link back to the original notice when notice content is > 140c 2010-02-04 03:17:48 +00:00
Zach Copley
9ca4fd69b3 - Fix cache handling in TwitterStatusFetcher
- Other stability fixes
2010-02-04 01:59:28 +00:00
Zach Copley
72f72d17db - Fix cache handling in TwitterStatusFetcher
- Other stability fixes
2010-02-04 01:53:08 +00:00
Evan Prodromou
7a7e2162dd Script to update profile URLs 2010-02-03 14:58:29 -05:00
Evan Prodromou
900cb8dd91 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-03 12:32:48 -05:00
Evan Prodromou
aa4848d62d Merge branch 'master' into testing 2010-02-03 12:32:31 -05:00
Evan Prodromou
dbeb388ade clear cache for Profile::hasRepeated() at Notice::insert() time 2010-02-03 12:31:25 -05:00
Sarven Capadisli
0a3b552d9f Added right margin for notice text. Helps Conversation notices look
better.
2010-02-03 18:14:57 +01:00
Sarven Capadisli
efa930ab00 Added right margin for notice text. Helps Conversation notices look
better.
2010-02-03 18:13:21 +01:00
Evan Prodromou
0e0beea5aa clearcache.php column flag was conflicting with default flag 2010-02-03 12:13:20 -05:00
Evan Prodromou
aee73d87ee showcache.php column flag was conflicting with default flag 2010-02-03 12:13:07 -05:00
Evan Prodromou
644a916383 change 'sitetype' to 'siteplan' to use consistent language 2010-02-03 11:55:54 -05:00
Evan Prodromou
20953ea3de Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-02-03 11:53:54 -05:00
Evan Prodromou
6215b9788c add nickname as unique key for user_group table 2010-02-03 11:53:31 -05:00
Zach Copley
ac8a4a7e56 Confirm dialog for reset OAuth consumer key and secret button 2010-02-03 05:43:08 +00:00
Zach Copley
03e8ba144e Confirm dialog for reset OAuth consumer key and secret button 2010-02-03 01:43:59 +00:00
Zach Copley
dd1b8076d8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-02 23:17:58 +00:00
Zach Copley
2085b506d4 Always check for an OAuth request. This allows OAuth clients to set an
auth user, similar to how they can set one via http basic auth,
even if one is not required.  I think I finally got this right.
2010-02-02 23:17:28 +00:00
Zach Copley
387374fd7b Always check for an OAuth request. This allows OAuth clients to set an
auth user, similar to how they can set one via http basic auth,
even if one is not required.  I think I finally got this right.
2010-02-02 23:16:44 +00:00
Craig Andrews
057ec1fcea Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Siebrand Mazeland
f60f2c523f Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-02-02 20:26:21 +01:00
Brion Vibber
f4c81fa1e1 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-02-02 09:57:50 -08:00
Brion Vibber
51c3606715 Fix regression breaking file attachments. This is what I get for rushing fixes and not properly testing them. :P 2010-02-02 09:32:28 -08:00
Brion Vibber
027c7e61fd Fix regression breaking file attachments. This is what I get for rushing fixes and not properly testing them. :P 2010-02-02 09:30:15 -08:00
Sarven Capadisli
245610d2e1 Removed entity flag stylesheet and icons from plugin to core. 2010-02-02 16:27:58 +01:00
Sarven Capadisli
a1f55c3f80 Added flag icon to core 2010-02-02 16:14:37 +01:00
Sarven Capadisli
7cecd7f722 Added single icon for Clear 2010-02-02 16:09:39 +01:00
Sarven Capadisli
f2bbff24e5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-02 16:07:35 +01:00
Sarven Capadisli
65c5d7813b Added icon to Clear label for UserFlag plugin 2010-02-02 16:06:22 +01:00
Brion Vibber
5f14301c55 setconfig.php: list all current settings if no parameters given 2010-02-02 06:15:01 -08:00
Brion Vibber
4f6052d8d8 Apply xopher's fix to add 'sitetype' parameter to setup_status_network.sh, exposed to the email 2010-02-02 05:53:05 -08:00
Sarven Capadisli
7b690dab8f Minor alignment notice form alignment for default theme 2010-02-02 13:16:30 +01:00
Sarven Capadisli
cc256aaa67 Updated StatusNet logos 2010-02-02 13:12:03 +01:00