Commit Graph

3444 Commits

Author SHA1 Message Date
Evan Prodromou 1094e7c2c6 Update openid docs 2011-09-30 14:52:51 -04:00
Evan Prodromou 4af466f1a6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 14:25:06 -04:00
Evan Prodromou 82badb19c7 Move docs menu to site primary menu 2011-09-30 14:24:27 -04:00
Zach Copley e7ef9e2117 Remove gettext wrapper from log msg 2011-09-30 18:20:22 +00:00
Zach Copley 1d2a3be88e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-30 18:15:38 +00:00
Zach Copley fd62f6b934 Don't throw exception if bookmark has no attachments; log error and render as normal notice instead. 2011-09-30 18:13:25 +00:00
Evan Prodromou e3c010a870 try to check whether file exists over and over and over 2011-09-30 13:03:42 -04:00
Evan Prodromou 4e5af7513c 50px more for bookmarklet popup 2011-09-30 10:15:40 -04:00
Evan Prodromou 2e8d92dbe9 use the 'top' action for bookmarklet popup 2011-09-30 10:10:15 -04:00
Evan Prodromou 3aad58c37f Only show some profiles in events 2011-09-30 09:40:15 -04:00
Zach Copley d438a55434 Fix navigation for SubMirrorPlugin 2011-09-29 20:11:51 +00:00
Samantha Doherty d51a93ddb9 Quick style for event attendee avatar lists. 2011-09-29 16:00:10 -04:00
Evan Prodromou 699a90f11c Show Event attendees in mini-list 2011-09-29 15:12:30 -04:00
Evan Prodromou 797e187acb Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline into merge-requests/174 2011-09-28 16:14:42 -04:00
Scott Sweeny 94b524d6dc plugins/MobileProfile/MobileProfilePlugin.php: add 'maemo' to recognized devices 2011-09-27 23:54:42 -04:00
Zach Copley 8ca9f33f45 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-09-27 16:59:43 +00:00
Zach Copley cd30c94096 Move check for valid access token to the right place 2011-09-27 16:59:10 +00:00
Evan Prodromou 23e02ea76a Merge branch '1.0.x' into testing 2011-09-27 11:45:24 -04:00
Evan Prodromou 9f954eddc5 remove unsupported hcard action 2011-09-27 11:43:41 -04:00
Zach Copley ec53e68cf2 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-09-27 04:33:00 +00:00
Zach Copley 000e5c0c01 Do a better job of saving the original avatar from Facebook 2011-09-27 04:31:41 +00:00
Zach Copley 3b28f226c7 Facebook bridge back in business with new JS-SDK and OAuth 2.0 flow.
Might be better to rewrite the login mechanism to use server side flow
now that Facebook provides it.
2011-09-27 04:09:47 +00:00
Evan Prodromou eb711321c3 Merge branch '1.0.x' into testing 2011-09-26 14:10:43 -04:00
Samantha Doherty b0ee583270 Tiny layout fix for QnA. 2011-09-26 08:26:38 -04:00
Zach Copley 634fb64c11 Facebook bridge mostly working again with new OAuth 2.0 flow 2011-09-26 05:32:19 +00:00
Siebrand Mazeland e7dac240ef Localisation updates from http://translatewiki.net. 2011-09-26 00:01:00 +02:00
Zach Copley 118e84be19 Update to latest Facebook PHP sdk 2011-09-22 15:47:55 -07:00
Evan Prodromou 59043dca7f Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou 1014e295ee bad sprintf format for new follow activity notices 2011-09-21 10:18:16 -04:00
Evan Prodromou 838c3988ee Change defaults for ActivityPlugin to only log joins and follows 2011-09-21 10:15:34 -04:00
Zach Copley 58b9f83a02 Allow repeats to flow through the Twitter bridge 2011-09-21 05:23:47 +00:00
Zach Copley c9cbc31481 Don't send notices from the ActivityPlugin to Twitter 2011-09-21 02:31:51 +00:00
Evan Prodromou ac1ea3e8cf Remove template plugin
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Evan Prodromou 0ee660af23 fix problem with using wrong arg to EndLeaveGroup event 2011-09-18 19:28:17 -04:00
Evan Prodromou 822cb1482a right URLs for search subs 2011-09-18 19:20:28 -04:00
Evan Prodromou e2914189f3 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-09-18 17:33:38 -04:00
Evan Prodromou bba39c4aaf reorder routes for ostatus for better matches 2011-09-18 17:32:59 -04:00
Evan Prodromou 52ed4678f3 correct link for searchsubs 2011-09-18 17:32:13 -04:00
Zach Copley 116840a80e Reorder directory router connections / fix regex 2011-09-18 13:35:09 -07:00
Evan Prodromou dbb7324b25 test for missing profile in ostatus queue handler 2011-09-18 14:36:49 -04:00
Evan Prodromou 2f1953ca25 Correct args for join event 2011-09-18 14:06:35 -04:00
Evan Prodromou 75bdc37b61 Correct args for join event 2011-09-18 14:06:27 -04:00
Evan Prodromou e43ea4c9f5 fix RealtimePlugin root hack hack 2011-09-18 13:03:12 -04:00
Evan Prodromou 06f19d523a inverted if() in RealtimePlugin check for tag 2011-09-18 12:52:00 -04:00
Evan Prodromou 915dd9c9b5 Copy-and-paste error in OStatus button output 2011-09-18 12:44:16 -04:00
Evan Prodromou 01ea6a18f9 make activity plugin use its own notice source 2011-09-18 12:40:17 -04:00
Evan Prodromou 3d4ea0a71f Correct the routes for notice and user sitemaps 2011-09-18 12:14:43 -04:00
Evan Prodromou 7c1d73ed3d Sitemap plugin no longer forces an index on user.created 2011-09-18 12:07:59 -04:00
Zach Copley 670288e68f Merge branch 'twitter-bridge-fixes'
* twitter-bridge-fixes:
  Make sure the session token gets output no matter what (whoops)
  Move submit (connect) button to the very bottom
  Move license checkbox to the end of the form
  Don't allow Twitter registration if site is invite only
2011-09-17 16:33:28 -07:00
Zach Copley d4ed6db1d8 Make sure the session token gets output no matter what (whoops) 2011-09-17 15:50:13 -07:00