Commit Graph

10093 Commits

Author SHA1 Message Date
Matt Lee f07cf26b00 updated 2010-08-09 18:35:29 -04: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
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
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 422a6ef518 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Ian Denhardt dd17e32c85 Got database inserts for photos working. 2010-08-06 10:26:28 -04: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
Ian Denhardt 8d47f98894 cleaned up template; was badly indented and missing an opening <html> tag. 2010-08-02 15:39:00 -04:00
Ian Denhardt af2158b8b4 GNUsocialTemplatePlugin.php doesn't need to be executable. 2010-08-02 15:22:17 -04:00
James Walker 56294016a7 fix #2478 - ensure all XRD documents get proper content-type headers 2010-08-02 14:47:13 -04:00
James Walker eaef724c49 urgh. typo 2010-08-02 14:24:50 -04:00
James Walker e603632f13 add support for Salmon's new "mentioned" rel value 2010-08-02 14:06:14 -04:00
James Walker 517c7483d1 move to rel="salmon" (per latest spec) 2010-08-02 13:24:38 -04:00
Brion Vibber a1aea74fe2 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-08-02 09:43:58 -07:00
Ian Denhardt 48d57a8210 Added myself to the developer list. 2010-08-02 12:10:37 -04:00
Ian Denhardt 5d7dff100f Got rid of old duplicate files. 2010-08-02 12:09:44 -04:00
Ian Denhardt 762731d8ee Merge branch 'master' of git://gitorious.org/statusnet/mainline 2010-08-02 11:10:19 -04:00
Siebrand Mazeland 557c6aa40f Localisation updates from http://translatewiki.net 2010-08-01 01:04:01 +02:00
Siebrand Mazeland 46bffe3d69 Tweak message per suggestion of The Evil IP Address[1].
[1] http://translatewiki.net/w/i.php?title=Thread:Translating_talk:StatusNet/to_their_attention%3F&oldid=2220913
2010-08-01 00:16:39 +02:00
Mike Sheldon a31d977b43 Make TemplatePlugin compatible with PHP 5.3 2010-07-31 23:10:22 +01:00