Commit Graph

10209 Commits

Author SHA1 Message Date
Matt Lee
f07cf26b00 updated 2010-08-09 18:35:29 -04:00
Brion Vibber
855f1f6623 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-08-09 13:11:41 -07:00
Ian Denhardt
50b12e5820 Merge branch 'master' of gitorious.org:+socialites/statusnet/gnu-social 2010-08-09 15:53:21 -04:00
Ian Denhardt
e0da393800 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2010-08-09 15:06:26 -04:00
Ian Denhardt
d933ee7bad Merge branch 'master' of git://gitorious.org/statusnet/mainline 2010-08-09 14:43:32 -04:00
Siebrand Mazeland
09dee24cbe Add two i18n related FIXMEs. 2010-08-08 21:13:21 +02:00
Matt Lee
66051a4799 added some crude code to enable people to add support for webfinger to
their domains

license: AGPLv3 or later.
2010-08-07 14:29:24 -04:00
Siebrand Mazeland
5549600505 Localisation updates from http://translatewiki.net 2010-08-07 18:33:40 +02:00
James Walker
c8a706081e strip whitespace from me:data and me:sig (per spec) 2010-08-07 09:48:21 -04:00
Eric Helgeson
edb62db613 Locale error message, clean up {}, Verified under 1.0.x && php 5.3 2010-08-06 23:07:34 -05:00
Eric Helgeson
fd2919be18 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:51:45 -05:00
Eric Helgeson
422a6ef518 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Brion Vibber
39277ebf78 And.... one more fix for queueing in SubMirror. 2010-08-06 12:04:34 -07:00
Brion Vibber
729912e36a Missing file from SubMirror. :P 2010-08-06 12:00:31 -07:00
Brion Vibber
79485340ab SubMirror: Drop mirror link from subscriptions list; has decoupled from subscriptions. 2010-08-06 11:55:56 -07:00
Brion Vibber
7e55fc0044 OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships.
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising

Work in progress: tweaking feedsub garbage collection so we can count other uses
2010-08-06 11:49:52 -07:00
Brion Vibber
ebd2fc2f7c Partial fix for ticket #2489 -- problems with SNI SSL virtual host certificate validation.
Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.

I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
2010-08-06 10:14:07 -07:00
Ian Denhardt
dd17e32c85 Got database inserts for photos working. 2010-08-06 10:26:28 -04:00
Brion Vibber
300ed65d30 SubMirror plugin initial checkin: allows setting up automatic mirroring of posts from any of your subscriptions into your own stream, either via repeat or by copying the text.
The UI for setup and editing is a bit nasty for now. Can be reached via 'Mirroring' tab in account settings, or from a link at top of subscriptions list.

Currently relies on the OStatus plugin to handle actual setup, parsing, and importing of feeds; to support more general feed formatting we may need some further work there to accept weird feeds.
Also requires an actual live subscription, but this could be changed in future. (Ensuring that PSHB feed subscriptions remain live even if nobody's directly subscribed might be tricky.)

The repeat style is our preferred method since it retains full attribution, but right now we don't handle repeats very well across site boundaries; when pushed out to Twitter or to other StatusNet instances via OStatus, currently we end up losing some of the data and can end up with the 'RT @blah' version.

WARNING: There's no loop detection yet; it's most likely possible to set up a fun loop of profiles repeating each others' stuff forever and ever and ever and ever...
2010-08-05 18:06:36 -07:00
Brion Vibber
433c43c999 Merge branch 'testing' into 0.9.x 2010-08-05 11:02:53 -07:00
Brion Vibber
77a96e3d7c Merge branch 'master' into testing 2010-08-05 10:56:49 -07:00
Ian Denhardt
43454eba36 got uploads sortof working - database portion doesn't work though. 2010-08-05 13:11:34 -04:00
Ian Denhardt
16ad70e16f Started working on proper photo upload. not fully functional yet. 2010-08-04 17:26:55 -04:00
Zach Copley
fd530a892f Fix for source attribution on notices; it was displaying the code instead of the source name sometimes. 2010-08-04 12:31:31 -07:00
Ian Denhardt
33bce7227f slight cleanup, we now get the image type from getimagesize(), rather than finding it ourselves. 2010-08-04 12:03:34 -04:00
Ian Denhardt
78d9edd431 Photos are cropped now. 2010-08-04 11:52:54 -04:00
Ian Denhardt
727758d275 Fixed scaling. thumbnails are bigger now, too. 2010-08-03 19:24:19 -04:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Evan Prodromou
004e42e3e0 Merge remote branch 'gitorious/1.0.x' into 1.0.x 2010-08-03 16:04:54 -07:00
Evan Prodromou
b17fc0ca5b update tests to include 'mentioned' links 2010-08-03 16:04:19 -07:00
Evan Prodromou
e2c90576c0 re-add mentioned link lost in last merge 2010-08-03 16:01:50 -07:00
Evan Prodromou
2ba36fc242 Merge branch 'activityhooks' into 0.9.x
Conflicts:
	classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc Merge branch 'testing' into 0.9.x 2010-08-03 15:57:05 -07:00
Evan Prodromou
cc71f1ae82 output Atom dates in UTC 2010-08-03 15:55:40 -07:00
Evan Prodromou
f83171824f correctly show <source> for atom feeds 2010-08-03 15:50:21 -07:00
Evan Prodromou
744233c6dc add actor info to tests 2010-08-03 15:49:49 -07:00
Evan Prodromou
8d19162122 more tests for activity generation 2010-08-03 15:26:19 -07:00
Evan Prodromou
6756a752c4 add some more tests for replies and group posts 2010-08-03 14:17:36 -07:00
Ian Denhardt
ab46007709 Thumbnails in the photo plugins. 2010-08-03 17:07:07 -04:00
Evan Prodromou
1a6148f0e4 initial unit tests for activity generation 2010-08-03 13:41:44 -07:00
Ian Denhardt
fe5f55cc24 rudementary photo albums. going to /username/photos displays all the images username has attached. 2010-08-03 13:21:11 -04:00
Siebrand Mazeland
74d8746697 Localisation updates from http://translatewiki.net 2010-08-03 15:31:54 +02:00
Evan Prodromou
f12cafb275 correct output for EndActivityInReplyTo event 2010-08-02 17:56:44 -07:00
Evan Prodromou
936f97b914 document activity entry hooks 2010-08-02 17:56:23 -07:00
Evan Prodromou
fe2b4fdf1c add some activity hooks 2010-08-02 17:16:04 -07:00
Ian Denhardt
eebc37604a Started work on photos plugin. not much yet. 2010-08-02 19:22:55 -04:00
James Walker
5fa19a0384 Merge branch '2429' into 0.9.x 2010-08-02 16:45:23 -04:00
James Walker
8120842780 Fix for #2429 - move OStatus XML writing to XMLStringer 2010-08-02 16:42:28 -04:00
Ian Denhardt
81a0611cd8 renamed GN{u,U}socialPhotos.php 2010-08-02 16:05:29 -04:00
Brion Vibber
c56939d596 Remove the 'Enable Twitter import' checkbox from Twitter admin panel by default; can be re-added with setting:
addPlugin('TwitterBridge', array('adminImportControl' => true, ....));

Added a note on the label that it requires manual daemon setup. (Note that by default the admin panel won't be shown, so it's no biggie to be hiding this for now.)
2010-08-02 13:00:50 -07:00