Commit Graph

3005 Commits

Author SHA1 Message Date
Brion Vibber
33af29b47c Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there. 2010-03-03 19:22:22 +00:00
Brion Vibber
3bb42d1170 Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.) 2010-03-03 19:00:02 +00:00
Zach Copley
a82cd89a97 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  Using position relative only for the remote subscription in section
  Added group subscription button to groups mini list
  Added event hooks at the start and end of groups mini list
2010-03-03 10:28:45 -08:00
Zach Copley
61ada4558d Fix for disappearing 'connect' menu if xmpp and sms are disabled.
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08:00
Sarven Capadisli
15574c59de Added event hooks at the start and end of groups mini list 2010-03-03 12:55:01 -05:00
Sarven Capadisli
06fb1124f5 Added event hooks for start and end of subscriptions mini list 2010-03-03 11:14:39 -05:00
Brion Vibber
79ffebb51b OStatus: save file records for enclosures
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.

Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
Craig Andrews
09705a1e98 stupid mistake... let's not talk about this. 2010-03-02 14:25:27 -08:00
Craig Andrews
c30f95c55c Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure" 2010-03-02 14:25:06 -08:00
Sarven Capadisli
e9c127ddd8 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 15:26:27 -05:00
Sarven Capadisli
4113f28851 Added Subscribe button to remote user entity actions in profie lists 2010-03-02 15:25:32 -05:00
Brion Vibber
72460091dd Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 12:21:48 -08:00
Brion Vibber
6b134ae4c7 Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
Brion Vibber
f596e072e7 Fix for regression in updated mention checks, sometimes lost links to folks mentioned in the replied message. 2010-03-02 09:53:00 -08:00
Evan Prodromou
e2578cfad6 Revert "Show <activity:subject> and no activity actors for user feed"
This reverts commit c25fc8a4b5.
2010-03-02 03:40:43 -05:00
Evan Prodromou
2526a5ae94 Merge branch 'master' into testing 2010-03-02 02:57:35 -05:00
Evan Prodromou
f504a9237e Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-02 02:56:57 -05:00
Evan Prodromou
c25fc8a4b5 Show <activity:subject> and no activity actors for user feed
We only need one author for user feeds: the user themselves. So, show
the user as the activity:subject, and don't repeat the same
activity:actor for every notice unnecessarily.
2010-03-02 02:54:52 -05:00
Zach Copley
871b3aa6c0 Remove un-needed config variable for enabling/disabling Twitter integration 2010-03-01 21:52:31 -08:00
Zach Copley
6b2d67216e Initial Twitter bridge admin panel 2010-03-01 21:35:24 -08:00
Zach Copley
0ca7aa68d3 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: (25 commits)
  Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
  more output in updateostatus.php
  lost important fields when switching queries
  show service debug info
  pass listener URI into consumer for OMB
  remove strict check on OMB exception strings
  return correct HTTP status code for OMB errors
  send smaller error pages for OMB API endpoints
  Remove check for secret in token deletion on Subscription::cancel()
  Better logging on bad token in subscription
  Return empty array when no subscriptions to remote
  drop tokens for OMB on unsubscribe
  fix path for updateostatus.php
  Script to convert OMB subscriptions to OStatus subscriptions
  show service debug info
  pass listener URI into consumer for OMB
  remove strict check on OMB exception strings
  return correct HTTP status code for OMB errors
  send smaller error pages for OMB API endpoints
  Remove check for secret in token deletion on Subscription::cancel()
  ...
2010-03-01 16:38:56 -08:00
Evan Prodromou
2c677e0f2d Revert "show service debug info"
This reverts commit 19ec0e3a62.
2010-03-01 18:49:39 -05:00
Evan Prodromou
f7c2c19ce8 lost important fields when switching queries 2010-03-01 18:07:21 -05:00
Evan Prodromou
19ec0e3a62 show service debug info 2010-03-01 18:03:18 -05:00
Evan Prodromou
64918cfd35 pass listener URI into consumer for OMB 2010-03-01 18:03:18 -05:00
Evan Prodromou
c3ba26bb99 Return empty array when no subscriptions to remote 2010-03-01 18:03:17 -05:00
Zach Copley
a5dc5f9c62 Upgrade XML output scrubbing to better deal with newline and a few other chars 2010-03-01 14:58:06 -08:00
Evan Prodromou
4d9daf2149 Use notice for context when deciding who @nickname refers to
In a federated system, "@nickname" is insufficient to uniquely
identify a user. However, it's a very convenient idiom. We need to
guess from context who 'nickname' refers to.

Previously, we were using the sender's profile (or what we knew about
them) as the only context. So, we assumed that they'd be mentioning to
someone they followed, or someone who followed them, or someone on
their own server.

Now, we include the notice information for context. We check to see if
the notice is a reply to another notice, and if the author of the
original notice has the nickname 'nickname', then the mention is
probably for them. Alternately, if the original notice mentions someone
with nickname 'nickname', then this notice is probably referring to
_them_.

Doing this kind of context sleuthing means we have to render the
content very late in the notice-saving process.
2010-02-27 16:06:46 -05:00
Evan Prodromou
babca69f67 add bugfix to version number. 2010-02-27 11:04:24 -05:00
Zach Copley
d3fc8e2219 Pull conversation URL from Conversation instead of assuming it's local 2010-02-26 14:47:38 -08:00
Evan Prodromou
4b696cf51f add a flag to impede adding sessions to URLs (for permanent stuff) 2010-02-26 17:28:44 -05:00
Zach Copley
b0acaeafe3 Check for conversation with unique conversation ID 2010-02-26 13:06:06 -08:00
Evan Prodromou
fc576562a3 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 12:40:59 -05:00
Evan Prodromou
6781f95c73 Merge branch 'blacklistplus' into testing
Conflicts:
	EVENTS.txt
2010-02-26 12:40:30 -05:00
Evan Prodromou
ea044722e0 'on' is what checkboxes use for boolean true 2010-02-26 12:28:58 -05:00
Evan Prodromou
d9d1a77bb0 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 11:40:12 -05:00
Zach Copley
6cc26a613b Remove unnecessary requires 2010-02-25 22:08:25 -08:00
Zach Copley
eabae96fb4 Get ApiAction autoloading properly 2010-02-25 22:08:17 -08:00
Zach Copley
e650794300 Remove unnecessary requires 2010-02-25 22:06:31 -08:00
Zach Copley
3daf17d935 Get ApiAction autoloading properly 2010-02-25 22:02:40 -08:00
Brion Vibber
b573c5e260 Fix for group timeline feeds by name 2010-02-25 21:27:59 -08:00
Brion Vibber
08c17bfcaa try/catch on omb profile pings 2010-02-25 21:06:53 -08:00
Brion Vibber
da4b21d3a9 try/catch on omb profile pings 2010-02-25 21:06:16 -08:00
Evan Prodromou
417f5d653f update to beta6 2010-02-25 23:27:20 -05:00
Evan Prodromou
254e210763 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-25 21:53:50 -05:00
Evan Prodromou
f9e5acbfa7 remove linkback from default plugins 2010-02-25 21:53:18 -05:00
Brion Vibber
2fa953da22 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-02-25 18:52:26 -08:00
Brion Vibber
2feb09f434 OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first) 2010-02-25 18:51:44 -08:00
Zach Copley
c49fbb63c5 Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  init_conversation.php script to copy old notice conversations into the conversation table
  cache results of webfinger lookups
  Parse an hcard for hints, if available
  use new hcard method for webfinger
  add hkit for hCard parsing
  use new dedicated hcard method for Webfinger profile
  Add an hcard action
2010-02-25 18:13:34 -08:00
Zach Copley
207cc89074 Set avatar height correctly 2010-02-25 18:06:03 -08:00