Commit Graph

14731 Commits

Author SHA1 Message Date
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 adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:40 -04:00
Evan Prodromou 8cd1bdc686 Remove Jabber stuff from Twitter daemon 2012-07-06 10:46:48 -04:00
Evan Prodromou 98d1085987 Release date 2012-07-03 15:42:35 -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 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
Evan Prodromou ab053fe2ca Don't always make spam_score writeable 2012-04-26 11:59:54 -04:00
Evan Prodromou fb31ff1af7 better better call 2012-04-24 13:19:09 -04:00
Evan Prodromou 9c286feb5f fix bad function name 2012-04-24 13:17:54 -04:00
Evan Prodromou 64b03439b5 Check for HTTP_HOST before fetching it 2012-04-24 12:55:09 -04:00
Evan Prodromou 5f2b62927c let author see own spam 2012-04-23 21:25:53 -04:00
Evan Prodromou ffc2c72bc1 fix a problem with the facebookbridge translation in eu 2012-04-23 21:05:03 -04:00
Evan Prodromou 482b80cb0c Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-04-23 21:02:22 -04:00
Evan Prodromou 2eed1e2ae2 fixup check on profile notice stream 2012-04-23 21:01:34 -04:00
Evan Prodromou 4746016dd5 Don't convert deleted notices into repeats in Notice::asActivity() 2012-04-23 19:15:12 -04:00
Siebrand Mazeland 3898500ff9 Localisation updates from http://translatewiki.net. 2012-04-21 10:21:38 +00:00
Siebrand Mazeland 07138391f9 Enable Belarusian (Taraškievica orthography) (be-tarask) and Malayalam (ml).
Remove some trailing whitespace.
2012-04-19 16:25:36 +02:00
Evan Prodromou 49304056f7 enable Basque language 2012-04-19 09:35:21 -04:00
Evan Prodromou ae885c0e00 allow user to review their own profile stream even if silenced 2012-04-17 12:00:51 -04:00
Evan Prodromou 558e33436c change script path for new position in plugins/ActivitySpam 2012-04-17 11:57:45 -04:00
Evan Prodromou 77164e9ab9 Merge branch '1.1.x' 2012-04-17 09:40:44 -04:00
Evan Prodromou 884c0562e4 One page per version, eh 2012-04-17 09:29:45 -04:00
Evan Prodromou 10ea912785 Merge branch 'testing' 2012-04-17 09:19:15 -04:00
Evan Prodromou e5a37ac24e update documentation 2012-04-17 09:17:25 -04:00
Evan Prodromou 55dd0dbcc0 update how version is shown per semver.org 2012-04-17 09:15:29 -04:00
Evan Prodromou 7a9777df05 Merge ActivitySpam plugin 2012-04-17 09:02:48 -04:00
Evan Prodromou 74e919e815 Pre-alpha version changes 2012-04-16 16:38:41 -04:00