Evan Prodromou
9034148e0d
Squashed commit of the following:
...
commit f4503f30226fee59160600b5c9b81afc6b610a9d
Merge: 75f3b4e f10e48c
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:45:10 2012 -0400
Merge commit 'refs/merge-requests/194' of git://gitorious.org/statusnet/mainline into merge-requests/194
commit f10e48c361d91ab02efc5577254e1dad3b1dcebe
Author: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu Jul 5 14:28:30 2012 +0200
multiGet returns a correct Notice object for the fetchAll in NoticeList
2012-07-09 09:46:27 -04:00
Evan Prodromou
4b7a91bb81
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
2012-07-09 09:43:40 -04:00
Evan Prodromou
78a8eb5b6e
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
2012-07-09 09:43:05 -04:00
Evan Prodromou
dad72cce28
Merge remote-tracking branch 'origin'
2012-07-09 09:33:42 -04:00
Evan Prodromou
c7ad7bce9f
newer sitestream host
2012-07-06 11:11:53 -04:00
Evan Prodromou
90fa1deb80
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-07-06 10:47:28 -04:00
Evan Prodromou
0c6ca3ec41
Merge branch '1.1.x'
2012-07-06 10:47:00 -04:00
Evan Prodromou
8cd1bdc686
Remove Jabber stuff from Twitter daemon
2012-07-06 10:46:48 -04:00
Evan Prodromou
d5564fb8d8
Add a trace, too
2012-07-04 15:14:35 -04:00
Evan Prodromou
7e60bb04e5
Add an exception on remote group join
2012-07-04 15:12:08 -04:00
Evan Prodromou
46f6b2c119
Don't call free on the results of a member query
2012-07-04 14:45:50 -04:00
Evan Prodromou
1c3c269ab4
cache key for member_ids
2012-07-04 14:39:26 -04:00
Evan Prodromou
69fb79caae
Cache IDs rather than profile objects
2012-07-04 14:38:06 -04:00
Evan Prodromou
642b1044cc
Better user group member queries
2012-07-04 14:12:11 -04:00
Evan Prodromou
24ecb42f0e
Merge remote-tracking branch 'origin/master'
2012-07-04 13:22:58 -04:00
Evan Prodromou
3ffe2e3f03
Correct sprintf() information
2012-07-03 17:33:27 -04:00
Evan Prodromou
a65809c5bd
Fix language code for users
2012-07-03 17:12:59 -04:00
Evan Prodromou
d4ea76a6ae
tickle lifecycle
2012-07-03 16:17:30 -04:00
Evan Prodromou
b1ccf10d09
Merge branch '1.1.x'
2012-07-03 15:42:51 -04:00
Evan Prodromou
98d1085987
Release date
2012-07-03 15:42:35 -04:00
Evan Prodromou
88ce08ca82
Merge branch '1.1.x'
2012-07-03 15:38:11 -04:00
Evan Prodromou
fee9ddf841
Merge branch '1.1.x'
2012-07-03 12:27:34 -04:00
Evan Prodromou
06b6b5fbc2
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-07-03 12:27:10 -04:00
Evan Prodromou
ae84e8f524
Use the current logged-in use for home timeline
2012-07-03 12:22:59 -04:00
Siebrand Mazeland
51b28eda19
Localisation updates from http://translatewiki.net .
2012-06-30 11:10:38 +00:00
Siebrand Mazeland
f2d66082b4
Localisation updates from http://translatewiki.net .
2012-06-24 18:26:18 +00:00
Siebrand Mazeland
acced719fd
Remove i18n for space.
...
Remove trailing whitespace.
2012-06-18 01:56:06 +02:00
Siebrand Mazeland
707076fca9
Localisation updates from http://translatewiki.net .
2012-06-17 23:26:20 +00:00
Evan Prodromou
dc4a42e600
Log channel info
2012-06-17 10:15:42 -04:00
Evan Prodromou
ec264fcd90
Add some delivery logging
2012-06-17 10:10:52 -04:00
Evan Prodromou
8b98c93e90
Fix end-of-line error
2012-06-17 10:05:57 -04:00
Evan Prodromou
97099e08c5
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-06-17 09:53:45 -04:00
Evan Prodromou
f5af67ce68
Skip on already-exists error
2012-06-17 09:52:35 -04:00
Siebrand Mazeland
c658ede37c
Localisation updates from http://translatewiki.net .
2012-06-10 23:42:52 +00:00
Siebrand Mazeland
bc733a200f
Localisation updates from http://translatewiki.net .
2012-06-04 15:02:34 +00:00
Siebrand Mazeland
f059977c57
Localisation updates from http://translatewiki.net .
2012-05-26 21:15:30 +00:00
Siebrand Mazeland
cd77348852
Localisation updates from http://translatewiki.net .
2012-05-20 11:10:38 +00:00
Evan Prodromou
2c70680b24
Chance to train unknown
2012-05-16 12:26:29 -04:00
Mikael Nordfeldth
e2b4c203a6
Added lost define reported in issue 3605 (GROUPS_PER_PAGE)
2012-05-14 10:06:37 +02:00
Siebrand Mazeland
2e4e2f693d
Localisation updates from http://translatewiki.net .
2012-05-12 18:47:41 +00:00
Siebrand Mazeland
6f557d3654
Localisation updates from http://translatewiki.net .
2012-05-06 17:08:47 +00:00
Evan Prodromou
acf52a3041
Hide stuff if there's an exception getting the profile
2012-05-04 23:37:12 -04:00
Evan Prodromou
2879f0a499
Just let a UserNoProfileException pass.
2012-05-04 22:57:20 -04:00
Evan Prodromou
0fec1872cd
Whoops! Append didn't work
2012-05-04 22:20:47 -04:00
Evan Prodromou
a504d2aee2
Let DB_DataObject find Spam_score
2012-05-04 22:16:46 -04:00
Evan Prodromou
961607bc5d
Ignore non-atom updates links in Webfinger
2012-05-04 12:01:13 -04:00
Evan Prodromou
7f0df2f257
Don't fail if missing <Host> in host-meta; it's deprecated
2012-05-04 11:41:04 -04:00
Evan Prodromou
c5ae53166c
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-05-04 11:39:55 -04:00
Siebrand Mazeland
eafe507068
Localisation updates from http://translatewiki.net .
2012-05-03 22:13:22 +00:00
Siebrand Mazeland
c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
