Commit Graph

4822 Commits

Author SHA1 Message Date
Evan Prodromou
6bf2c182b3 Upgrade version number
Conflicts:
	lib/framework.php
2013-07-16 11:25:25 -07:00
Evan Prodromou
4092ee1bd1 Squashed commit of the following:
commit bd23a7da105d635414643dfcedd9c8f710d565b8
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 07:49:03 2013 -0400

    Make the after flag work correctly

commit 5c5845a2f866f0bbffedd8e2e5d1f512f87d5329
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 06:14:43 2013 -0400

    Add an 'after' flag for backup script
2013-06-29 07:49:43 -04:00
Evan Prodromou
660b8f0c9c Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x 2013-06-25 22:27:23 -04:00
Evan Prodromou
37bbb96e1b Better output for shares 2013-06-25 22:27:02 -04:00
Jean Baptiste Favre
368906258a You need an API key when using embed.ly. Unfortunatly oembedhelper.php does not support it. This commit aims to fix it. 2013-06-15 18:35:41 +02:00
Evan Prodromou
f8393d10b7 Bad variable in ActivityObject::fromMessage() 2013-06-08 21:05:09 -04:00
Evan Prodromou
0a0aeed413 Use the link property for the URL, not the ID 2013-06-08 19:19:16 -04:00
Evan Prodromou
393130d80f Add direct messages to backup 2013-06-08 17:53:47 -04:00
Evan Prodromou
9fd2c3e1c9 Store direct messages as an activity 2013-06-08 17:45:49 -04:00
Evan Prodromou
ec04acb9b4 Some more well-known sources from plugins 2013-06-07 11:49:34 -04:00
Evan Prodromou
fe2c0a9687 Add generator to JSON output 2013-06-07 11:34:54 -04:00
Evan Prodromou
25823f6e5b Some better context for notices as arrays 2013-06-07 03:11:33 -04:00
Evan Prodromou
9a3c3c5cf8 Coerce width, height of media link to integer 2013-06-07 00:30:04 -04:00
Evan Prodromou
77f23354ad Fix the switch on type 2013-06-05 16:58:31 -04:00
Evan Prodromou
a6bb41a742 Better type check, better URL 2013-06-05 16:51:35 -04:00
Evan Prodromou
dbceb7ba1a Better URL creation for attachments 2013-06-05 16:14:07 -04:00
Evan Prodromou
7366ee73f5 Better handling of null values in ActivityObject::mimeTypeToObjectType 2013-06-05 16:14:02 -04:00
Evan Prodromou
772383e84b Use real attachments for JSON output 2013-06-05 09:39:13 -04:00
Evan Prodromou
460d80d09e Don't set the title of a notice to its plain-text content. 2013-06-04 22:28:45 -04:00
Evan Prodromou
736bc9cc96 Don't add content as title for notes 2013-06-04 19:52:38 -04:00
Evan Prodromou
fa6138195b Change geopoint to location 2013-06-04 17:23:09 -04:00
Evan Prodromou
b2849c4bb3 Remove duplicate of extensions 2013-06-04 17:15:43 -04:00
Evan Prodromou
46f43052f9 Use status_net, portablecontacts_net namespaces 2013-06-04 17:12:54 -04:00
Evan Prodromou
cba2b1ad9c Slightly better ActivityStreams JSON output 2013-06-04 17:01:05 -04:00
Evan Prodromou
64bf691c9c Add the service type for activity objects 2013-06-04 16:29:47 -04:00
Evan Prodromou
a23290883b Better handling of multiple objects 2013-06-04 15:20:21 -04:00
Evan Prodromou
11a14a87ba Only a single object in activitystrea.ms JSON output 2013-06-03 09:10:56 -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
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
bf18684509 More aggressively avoid OOM errors in useractivitystream 2013-05-24 09:19:17 -04:00
Evan Prodromou
9d42137024 Make optional arguments for getNoticeIds explicit 2013-04-30 09:56:14 -04: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
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
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