GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
15,052 Commits 8 Branches 4 Tags 310 MiB
20bad68845
Commit Graph

4883 Commits

Author SHA1 Message Date
Evan Prodromou
46f43052f9 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:54 -04:00
Evan Prodromou
f66fedaac8 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:28 -04:00
Evan Prodromou
cba2b1ad9c Slightly better ActivityStreams JSON output 2013-06-04 17:01:05 -04:00
Evan Prodromou
879a6f9ce7 Slightly better ActivityStreams JSON output 2013-06-04 17:00:51 -04:00
Evan Prodromou
795a4a02ba Add the service type for activity objects 2013-06-04 16:31:03 -04:00
Evan Prodromou
64bf691c9c Add the service type for activity objects 2013-06-04 16:29:47 -04:00
Evan Prodromou
2ad5aece55 Better handling of multiple objects 2013-06-04 15:21:59 -04:00
Evan Prodromou
a23290883b Better handling of multiple objects 2013-06-04 15:20:21 -04:00
Evan Prodromou
8e3bd04d98 Only a single object in activitystrea.ms JSON output 2013-06-03 09:11:43 -04:00
Evan Prodromou
11a14a87ba Only a single object in activitystrea.ms JSON output 2013-06-03 09:10:56 -04:00
Evan Prodromou
7ad5ed1db9 Merge branch 'master' of gitorious.org:statusnet/mainline 2013-06-02 15:24:57 -04:00
Evan Prodromou
49d265faa0 Add a registration activity to the end of every backup 2013-06-02 14:41:41 -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
1662ccccce Close the collection object 2013-05-29 17:05:09 -04:00
Evan Prodromou
2a3abf8850 Close the collection object 2013-05-29 17:03:08 -04:00
Evan Prodromou
a9f4575d31 Correctly output commas for JSON backups 2013-05-29 16:46:39 -04:00
Evan Prodromou
2f5cdbb9c1 Correctly output commas for JSON backups 2013-05-29 16:45:52 -04:00
Evan Prodromou
1c1bcd7cc6 Add JSON output for backups 
Conflicts:
	lib/useractivitystream.php
 2013-05-24 13:51:57 -04:00
Evan Prodromou
4f818c5c81 Add JSON output for backups 2013-05-24 13:50:24 -04:00
Evan Prodromou
bf18684509 More aggressively avoid OOM errors in useractivitystream 2013-05-24 09:19:17 -04:00
Evan Prodromou
d7880c17ec Don't abort if an activity throws an exception when backing up 2013-05-23 15:02:43 -04:00
Evan Prodromou
fc7d74050f Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:30 -04:00
Evan Prodromou
9d42137024 Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:14 -04:00
Evan Prodromou
d06965603d Still bad 2012-11-11 21:36:42 -05:00
Evan Prodromou
e2680b1f13 Bad caching parameter 2012-11-11 21:34:40 -05:00
Mikael Nordfeldth
9361c07bb3 mrb reported 417 Expectation failed errors due to now commented line 2012-10-27 06:24:26 -07:00
Mikael Nordfeldth
9d73f6444a mrb reported 417 Expectation failed errors due to now commented line 2012-10-27 10:40:31 +02:00
Evan Prodromou
ba7e73ee97 Merge branch '1.1.x' 2012-09-07 10:29:55 -04: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
9b97adc7ad 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:34:31 -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
Evan Prodromou
b55356491c <a title="..." on profile block other accounts 2012-07-09 13:47:01 -04:00
Evan Prodromou
1c9dc7257d Finish out the ul for other accounts 2012-07-09 13:21:40 -04:00
Evan Prodromou
206c090688 Squashed commit of the following: 
commit 7ef19ab918cc9805abb8d01e8220ae4ed63155d7
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:53:29 2012 -0400

    Show link to facebook account on profile block

    If you've logged in with Facebook, show a link to that account on the profile block.

commit b56967479c009d702150791944dbd80746ee3ba1
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:28:34 2012 -0400

    Add profile link from profile block to Twitter account

    Add a profile link to Twitter for accounts that are linked via Twitter login.

commit 181e441fd03c6034e737f6a3dae115557aa3e1aa
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:57:56 2012 -0400

    OpenID shows other account links

commit ef7357883dad9e34af2746e1c6a41ea826d7c992
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:53:12 2012 -0400

    Add a profile link for OpenIDs

    OpenID plugin now adds a profile link for each OpenID on the account.

commit 093d26b95bc453686d24c42f5a8f4739cb338fd2
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:15:18 2012 -0400

    Better array access

commit 49d47257efdcae2101b589a1f825872bdd70667c
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 10:57:16 2012 -0400

    Show list of other accounts in profile block

    We add a group of "rel-me" links to other user accounts on the Web.

    This is mostly useful for when you've used OpenID, Twitter, or
    Facebook login to associate a remote account.

    There's an extension to the profileblock recipe to show the links as
    little icons; there's a new hook in accountprofileblock to get such
    links from plugins.

    There's a modification to the base theme to show the icons correctly
    (I think).
 2012-07-09 12:56:09 -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
Siebrand Mazeland
acced719fd Remove i18n for space. 
Remove trailing whitespace.
 2012-06-18 01:56:06 +02:00
Mikael Nordfeldth
e2b4c203a6 Added lost define reported in issue 3605 (GROUPS_PER_PAGE) 2012-05-14 10:06:37 +02:00
Evan Prodromou
2879f0a499 Just let a UserNoProfileException pass. 2012-05-04 22:57:20 -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
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
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
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
55dd0dbcc0 update how version is shown per semver.org 2012-04-17 09:15:29 -04:00
Evan Prodromou
74e919e815 Pre-alpha version changes 2012-04-16 16:38:41 -04:00
Evan Prodromou
e603bcd56b Merge branch 'master' into 1.1.x 2012-04-16 15:44:12 -04:00
Evan Prodromou
7d07149f60 Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2012-04-16 15:44:03 -04:00
Evan Prodromou
347ba8c4a3 Merge branch 'master' of gitorious.org:statusnet/mainline 2012-04-16 15:43:28 -04:00
Evan Prodromou
8f7f06e35a fix bug with sender_id and recipient_id in direct_messages 2012-04-13 11:28:43 -04:00
Evan Prodromou
35521d4a5b fix bug with sender_id and recipient_id in direct_messages 2012-04-13 11:28:18 -04:00
Evan Prodromou
ea0a1b6a03 Squashed commit of the following: 
commit 6216ef2c9c1ab4bb038177f90b97127e4c2b6d00
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:14:07 2012 -0400

    filter the notices

commit 57fe6c012d380a8f2f8ec505f35e2094e58b4ac4
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:08:36 2012 -0400

    return value, end condition

commit cc985407f89f2d222f3164f8bc14b0764163e83f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:49 2012 -0400

    fix call to count()

commit 9efdfde70ea307b7409a4140647f343224cb595f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:05 2012 -0400

    fix class name in pivotGet

commit 311599ac117dda8b6cd5f522687322b89dcc909d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:03:28 2012 -0400

    inboxfix
 2012-04-03 17:16:18 -04:00
Evan Prodromou
1fdb539b48 Squashed commit of the following: 
commit 6216ef2c9c1ab4bb038177f90b97127e4c2b6d00
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:14:07 2012 -0400

    filter the notices

commit 57fe6c012d380a8f2f8ec505f35e2094e58b4ac4
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:08:36 2012 -0400

    return value, end condition

commit cc985407f89f2d222f3164f8bc14b0764163e83f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:49 2012 -0400

    fix call to count()

commit 9efdfde70ea307b7409a4140647f343224cb595f
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:06:05 2012 -0400

    fix class name in pivotGet

commit 311599ac117dda8b6cd5f522687322b89dcc909d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Apr 3 17:03:28 2012 -0400

    inboxfix
 2012-04-03 17:15:58 -04:00
Evan Prodromou
086b474069 %s for a string 2012-04-02 21:42:04 -04:00
Evan Prodromou
0774ef456d Remove filtering notice stream debug comments 2012-04-02 21:31:24 -04:00
Evan Prodromou
4e3fb63855 Remove filtering notice stream debug comments 2012-04-02 21:29:57 -04:00
Evan Prodromou
391676863a Take out unnecessary HideNoticeStream 2012-03-25 14:21:22 -04:00
Evan Prodromou
97cc277040 Take out unnecessary HideNoticeStream 2012-03-25 14:21:11 -04:00
Evan Prodromou
04ad0838be Add spam-training, spam-reviewing rights 
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
 2012-03-25 13:18:16 -04:00
Evan Prodromou
0d487a1ea0 Add spam-training, spam-reviewing rights 
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
 2012-03-25 13:16:23 -04:00
Evan Prodromou
d4bb8fa77a make sure we have an integer value for askFor 2012-03-21 22:53:14 -04:00
Evan Prodromou
7e76d116d8 make sure we have an integer value for askFor 2012-03-21 22:53:02 -04:00
Evan Prodromou
6e04133427 private group fix 2012-03-21 16:33:23 -04:00
Evan Prodromou
8981a420c1 private group fix 2012-03-21 16:33:10 -04:00
Evan Prodromou
09b80a6e90 empty array wrappers 2012-03-21 16:28:53 -04:00
Evan Prodromou
2d3c19c254 empty array wrappers 2012-03-21 16:28:40 -04:00
Evan Prodromou
0f0ddbe0c3 bad boolean logic for impossible stream 2012-03-21 16:26:43 -04:00
Evan Prodromou
e76b191c4b bad boolean logic for impossible stream 2012-03-21 16:26:33 -04:00
Evan Prodromou
473f6ffac9 store our own userprofile for checking impossibility 2012-03-21 16:24:04 -04:00
Evan Prodromou
51229ca662 store our own userprofile for checking impossibility 2012-03-21 16:23:52 -04:00
Evan Prodromou
6215ff8e07 Don't try to find groupnoticestream if impossible 2012-03-21 16:18:56 -04:00
Evan Prodromou
f807bd1b30 Don't try to find profilenoticestream if impossible 2012-03-21 16:18:48 -04:00
Evan Prodromou
38343f3877 Don't try to find groupnoticestream if impossible 2012-03-21 16:18:38 -04:00
Evan Prodromou
710eb8e86e Don't try to find profilenoticestream if impossible 2012-03-21 16:18:27 -04:00
Evan Prodromou
07f70b43b5 Sanity check on profile streams 2012-03-21 14:22:56 -04:00
Evan Prodromou
e21b0948ed Sanity check on profile streams 2012-03-21 14:22:45 -04:00
Evan Prodromou
cbd13407d8 Prefill profile roles when checking scope 2012-03-21 13:51:28 -04:00
Evan Prodromou
4ea9a0a7e8 Prefill profile roles when checking scope 2012-03-21 13:51:17 -04:00
Evan Prodromou
3cc69c678a Increment rounds 2012-03-21 12:24:12 -04:00
Evan Prodromou
d03ca746f2 Increment rounds 2012-03-21 12:23:59 -04:00
Evan Prodromou
0d8dd9078c Don't fetch more than needed if exhausted 2012-03-21 12:21:48 -04:00
Evan Prodromou
9b0279c2d5 Don't fetch more than needed if exhausted 2012-03-21 12:21:36 -04:00
Evan Prodromou
99dce46498 Prefill done by notice stream 2012-03-21 12:11:06 -04:00
Evan Prodromou
0238aa9d19 Prefill done by notice stream 2012-03-21 12:10:54 -04:00
Evan Prodromou
f6ae47c4fb adaptive filtering requests 2012-03-21 12:01:40 -04:00
Evan Prodromou
dcbcd4731c adaptive filtering requests 2012-03-21 12:01:27 -04:00
Evan Prodromou
d942072a6c Optionally hide spam from timelines 
For sites with a lot of spam, this will hide that spam from timelines for everyone but moderators.
 2012-03-21 10:26:00 -04:00
Evan Prodromou
a431fca442 New events for pre-filling a NoticeList 
The NoticeList has some code to pre-fill some auxiliary data for
notices. These new events let plugins hook that event and do their own
pre-filling.
 2012-03-21 10:25:51 -04:00
Evan Prodromou
3fb3ddb3a6 Optionally hide spam from timelines 
For sites with a lot of spam, this will hide that spam from timelines for everyone but moderators.
 2012-03-21 10:17:11 -04:00
Evan Prodromou
4c4cd9ec77 New events for pre-filling a NoticeList 
The NoticeList has some code to pre-fill some auxiliary data for
notices. These new events let plugins hook that event and do their own
pre-filling.
 2012-03-21 09:26:35 -04:00
Evan Prodromou
dbae9ea11b new event for notice option items 2012-03-08 06:59:25 -06:00
Evan Prodromou
e7d187eb05 new event for notice option items 2012-03-08 06:58:45 -06:00
Evan Prodromou
eb6b4628b9 Merge from 1.0.x 2012-03-08 06:57:54 -06:00
Evan Prodromou
fc713b660b hide silenced users' profile pages 2012-03-08 06:45:56 -06:00
Evan Prodromou
12921d6b71 accessor for NoticeListItem's Notice 2012-03-07 16:06:50 -06:00
Evan Prodromou
6e01db2c92 accessor for Widget's HTMLOutputter 2012-03-07 16:06:33 -06:00