GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
14,706 Commits 8 Branches 4 Tags 310 MiB
11a14a87ba
Commit Graph

14706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Prodromou
11a14a87ba Only a single object in activitystrea.ms JSON output 2013-06-03 09:10:56 -04:00
Evan Prodromou
9f94ed81ee Add an ID to registered service 2013-06-03 08:55:00 -04:00
Evan Prodromou
cbb5586ab7 Add a registration activity to the end of every backup 2013-06-02 14:38:00 -04:00
Evan Prodromou
1fc305eca5 Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 
Conflicts:
	lib/useractivitystream.php
 2013-06-02 14:29:40 -04:00
Evan Prodromou
2a3abf8850 Close the collection object 2013-05-29 17:03:08 -04:00
Evan Prodromou
2f5cdbb9c1 Correctly output commas for JSON backups 2013-05-29 16:45:52 -04:00
Evan Prodromou
4f818c5c81 Add JSON output for backups 2013-05-24 13:50:24 -04:00
Evan Prodromou
b359854150 Throw an exception converting fave to activity for non-existent notice or profile 2013-05-24 09:26:58 -04:00
Evan Prodromou
bf18684509 More aggressively avoid OOM errors in useractivitystream 2013-05-24 09:19:17 -04:00
Evan Prodromou
286de5ace3 Don't abort if an activity throws an exception when backing up 2013-05-23 15:02:30 -04:00
Evan Prodromou
9d42137024 Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:14 -04:00
Evan Prodromou
2361fde21a Merge remote-tracking branch 'origin/1.1.x' into 1.1.x 2013-03-02 11:28:20 -05:00
Jean Baptiste Favre
f726c6b23f Makes TwitterBridge plugin use Twitter API 1.1 instead of API 1 which is deprecated and will be switched off soon 2013-02-18 23:22:45 +01:00
Jean Baptiste Favre
a10a34a3cf Make TwitterBridge plugin use Queueing system 2013-02-18 23:22:08 +01:00
Jean Baptiste Favre
dd97468c72 Add Twitter mention import support 2013-02-18 23:16:06 +01:00
Mikael Nordfeldth
9361c07bb3 mrb reported 417 Expectation failed errors due to now commented line 2012-10-27 06:24:26 -07:00
Evan Prodromou
ea14cc7671 Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-10-17 10:10:12 -04:00
Evan Prodromou
86e3cbbcce Don't show big invite button if invites are disabled 2012-10-17 10:09:40 -04:00
Jean Baptiste Favre
ae3eaee6cd Merge commit 'refs/merge-requests/182' of gitorious.org:statusnet/mainline into 1.1.x 2012-09-19 09:58:14 +02:00
Jean Baptiste Favre
c11bc8a9ba Merge commit 'refs/merge-requests/181' of git://gitorious.org/statusnet/mainline into statusnet_1.1.x 2012-09-19 09:39:47 +02:00
Jean Baptiste Favre
0b53b6768e Merge remote-tracking branch 'statusnet/180' into statusnet_1.1.x 2012-09-19 00:07:29 +02:00
Evan Prodromou
f21881d5fa Don't send @-reply notification if the mentioned person has blocked the sender 2012-09-07 10:27:14 -04:00
Evan Prodromou
4b125eed96 Squashed commit of the following: 
commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

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

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()
 2012-08-13 14:33:58 -04:00
Mikael Nordfeldth
19c3cd541d Issue 3401, ostatus group subscription lands on blank page 2012-07-28 13:58:26 -04:00
Evan Prodromou
f04452c70a Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-07-28 13:55:10 -04:00
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