Commit Graph

14756 Commits

Author SHA1 Message Date
Evan Prodromou 221c724b4c Fix the switch on type 2013-06-05 16:58:54 -04:00
Evan Prodromou 0e83c5c824 Better type check, better URL 2013-06-05 16:51:46 -04:00
Evan Prodromou a9b2a86004 Better URL creation for attachments 2013-06-05 16:12:54 -04:00
Evan Prodromou 5ba2cb07ea Better handling of null values in ActivityObject::mimeTypeToObjectType 2013-06-05 16:11:51 -04:00
Evan Prodromou 7229533b0f Use real attachments for JSON output 2013-06-05 09:39:43 -04:00
Evan Prodromou 74ec87c27c Don't set the title of a notice to its plain-text content. 2013-06-04 22:27:29 -04:00
Evan Prodromou 15d466ebe6 Don't add content as title for notes 2013-06-04 19:53:07 -04:00
Evan Prodromou 759754555d Change geopoint to location 2013-06-04 17:22:51 -04:00
Evan Prodromou a2dd5dfef3 Remove duplicate of extensions 2013-06-04 17:16:34 -04:00
Evan Prodromou f66fedaac8 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:28 -04:00
Evan Prodromou 879a6f9ce7 Slightly better ActivityStreams JSON output 2013-06-04 17:00:51 -04:00
Evan Prodromou b493f3839c Use better type, title for service 2013-06-04 16:31:17 -04:00
Evan Prodromou 795a4a02ba Add the service type for activity objects 2013-06-04 16:31:03 -04:00
Evan Prodromou 2ad5aece55 Better handling of multiple objects 2013-06-04 15:21:59 -04:00
Evan Prodromou 04f6e4ce7b Better registrationActivity 2013-06-04 15:21:33 -04:00
Evan Prodromou 8e3bd04d98 Only a single object in activitystrea.ms JSON output 2013-06-03 09:11:43 -04:00
Evan Prodromou fa1a1851db Add an ID to registered service 2013-06-03 09:11:29 -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 1662ccccce Close the collection object 2013-05-29 17:05:09 -04:00
Evan Prodromou a9f4575d31 Correctly output commas for JSON backups 2013-05-29 16:46:39 -04:00
Evan Prodromou 1c1bcd7cc6 Add JSON output for backups
Conflicts:
	lib/useractivitystream.php
2013-05-24 13:51:57 -04:00
Evan Prodromou ea8151688e Throw an exception converting fave to activity for non-existent notice or profile 2013-05-24 09:27:21 -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 c5ef1e661e By default Notice::asActivity has a null argument 2013-04-14 12:02:52 -04:00
Evan Prodromou 0c694e16a5 Check that it's spam! 2013-02-13 10:55:32 -05:00
Evan Prodromou cc98a0b76f show percentage in output 2013-02-13 10:04:43 -05:00
Evan Prodromou cc85947480 Merge branch 'master' of gitorious.org:statusnet/mainline 2013-02-13 10:01:23 -05:00
Evan Prodromou bcba3e68a3 Updates to silencespammer from production 2013-02-13 10:01:09 -05:00
Evan Prodromou 0362ba7e32 Script to silence spammers 2013-02-13 09:50:53 -05:00
Evan Prodromou 6f424eb80f If there's an exception in notice distribution, continue 2012-11-25 10:39:49 -05:00
Evan Prodromou 6aaee4e5fe $this->q => $q 2012-11-11 22:55:22 -05: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
Evan Prodromou edf2879021 Divert tag and url searches 2012-11-11 21:27:11 -05:00
Evan Prodromou 64288a62f8 Adding a search notice stream object 2012-11-11 21:05:13 -05:00
Evan Prodromou 35499a9952 Add a flag to not deliver poll responses to home timeline
Some people really hate getting poll responses in their home timeline,
so there's now a flag to disable that.
2012-11-06 10:25:39 -05: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 c809dd24c5 Don't show big invite button if invites are disabled 2012-10-17 10:10:42 -04: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 330041e8bf Merge branch 'master' of gitorious.org:statusnet/mainline 2012-07-28 13:59:40 -04:00
Evan Prodromou d155936d98 Merge branch '1.1.x' 2012-07-28 13:59:03 -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 3ad77e8bb2 Squashed commit of the following:
commit c2e8966fe76a30ce976973d6d4856cb6bff1cfc9
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:20:29 2012 -0400

    Do it in ascending date order

commit aff18666662e7ba9f23b2d4c30d49347a761cd0a
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:17:30 2012 -0400

    smaller year

commit 73c92c081c68cee5019adf1b9e813c7830dd8f87
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:16:39 2012 -0400

    Smaller role footprint

commit a602733dd6f82415706077218f5735b655e47f70
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:14:23 2012 -0400

    Add the right to view the log

commit a5e6cc9791e6ed1ca268b19b6c557ec78bc38e2d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:10:15 2012 -0400

    Change column name from 'grant' to 'is_grant' since 'grant' is a SQL keyword

commit 38fbba009cd7ae379583acdc48480829c40c829d
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:05:44 2012 -0400

    ModLog::getSchema() -> ModLog::schemaDef()

commit 970e05d52a4a82630df6962929079c778c118a8b
Author: Evan Prodromou <evan@status.net>
Date:   Tue Jul 10 12:04:08 2012 -0400

    First pass at ModLog plugin
2012-07-10 12:25:40 -04:00
Evan Prodromou ec3f9b199f Squashed commit of the following:
commit 90620124a20d8c9da19b26920b02b521766c42e4
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:50:05 2012 -0400

    Add a checkbox to hide OpenID links

commit 47a4a5824208868bd5f4f163456f8e08380e5f36
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:35:15 2012 -0400

    Don't show the profile links if the hide_profile_link flag is set

commit eafd4b8ba1f7c06c92e5279b1a703c5534aa7255
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:30:23 2012 -0400

    class for user_openid_prefs table

commit 60e3e3825b20745c08b4d30dbbcac2d7ce604a2f
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 16:29:15 2012 -0400

    add User_openid_prefs table and class
2012-07-09 16:54:47 -04:00