Commit Graph

8632 Commits

Author SHA1 Message Date
Sarven Capadisli
023b9bb00f Renamed subscribe button from New to Remote since it only does remote
subscriptions at the moment.
2010-03-03 13:30:14 -05: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
7d7847295a Using position relative only for the remote subscription in section 2010-03-03 13:17:00 -05:00
Brion Vibber
e793b5661c Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-03 09:57:08 -08:00
Sarven Capadisli
2c9887bce5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 12:57:03 -05:00
Sarven Capadisli
c8bdf3cacb Added group subscription button to groups mini list 2010-03-03 12:56:19 -05:00
Sarven Capadisli
15574c59de Added event hooks at the start and end of groups mini list 2010-03-03 12:55:01 -05:00
Brion Vibber
7313cd9094 Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Conflicts:
	plugins/OStatus/OStatusPlugin.php
2010-03-03 09:53:38 -08:00
Zach Copley
8a58b52a68 Merge branch 'twitter-facebook-mods'
* twitter-facebook-mods:
  Make Facebook plugin look for API key and secret before doing anything
  Show global key and secret, if defined, in Twitter bridge admin panel
  Remove double word from Twitter bridge README
  - Have Twitter bridge check for a global key and secret if it can't
  stupid mistake... let's not talk about this.
  Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"
  Update Facebook plugin README with info about new admin panel
  Initial Facebook admin panel
  Some wording / spelling fixes
  - Make 'Sign in with Twitter' optional
  Remove un-needed config variable for enabling/disabling Twitter integration
  Initial Twitter bridge admin panel
  Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-03 09:53:16 -08:00
Zach Copley
4aa516db45 Make Facebook plugin look for API key and secret before doing anything 2010-03-03 09:52:25 -08:00
Zach Copley
ecccb344e0 Show global key and secret, if defined, in Twitter bridge admin panel 2010-03-03 09:52:25 -08:00
Zach Copley
9342e6f818 Remove double word from Twitter bridge README 2010-03-03 09:52:24 -08:00
Zach Copley
ca86a4efb8 - Have Twitter bridge check for a global key and secret if it can't
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
2010-03-03 09:52:24 -08:00
Craig Andrews
b1e172a3d9 stupid mistake... let's not talk about this. 2010-03-03 09:52:24 -08:00
Craig Andrews
8a3f27ac91 Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure" 2010-03-03 09:52:24 -08:00
Zach Copley
b533e0e735 Update Facebook plugin README with info about new admin panel 2010-03-03 09:52:24 -08:00
Zach Copley
84663dccff Initial Facebook admin panel 2010-03-03 09:52:24 -08:00
Zach Copley
625215cd80 Some wording / spelling fixes 2010-03-03 09:52:23 -08:00
Zach Copley
61036953de - Make 'Sign in with Twitter' optional
- Updates to the Twitter bridge plugin README
2010-03-03 09:52:23 -08:00
Zach Copley
705891f9be Remove un-needed config variable for enabling/disabling Twitter integration 2010-03-03 09:52:23 -08:00
Zach Copley
de65b15f9d Initial Twitter bridge admin panel 2010-03-03 09:52:23 -08:00
Zach Copley
1fd91de82c Upgrade XML output scrubbing to better deal with newline and a few other chars 2010-03-03 09:52:22 -08:00
Brion Vibber
f3cea24304 Fix for hcard parsing: typo caused notice spew accessing unset array index 2010-03-03 09:36:26 -08:00
Brion Vibber
9801c60bea Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 09:33:38 -08:00
Brion Vibber
1e63fda669 Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster. 2010-03-03 09:32:25 -08:00
Brion Vibber
ffa1931c9d Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements. 2010-03-03 09:31:14 -08:00
Sarven Capadisli
11750e832f Added remote join action for group profile 2010-03-03 12:02:10 -05:00
Sarven Capadisli
b65ee23e82 Added event hooks for group subscribe 2010-03-03 12:01:38 -05:00
Sarven Capadisli
ea10805e3f Moved the remote subscription button to subscription mini list 2010-03-03 11:22:21 -05:00
Sarven Capadisli
06fb1124f5 Added event hooks for start and end of subscriptions mini list 2010-03-03 11:14:39 -05:00
Sarven Capadisli
1a4652b1ad Changed label text for remote subscription to something similar. Given
that this button will be used within context of subscriptions, 'New'
works along with the '+' icon.
2010-03-03 10:32:54 -05:00
Zach Copley
f7ba5566bc Make Facebook plugin look for API key and secret before doing anything 2010-03-02 18:27:37 -08:00
Zach Copley
32c08f53de Show global key and secret, if defined, in Twitter bridge admin panel 2010-03-03 01:49:14 +00:00
Zach Copley
097e3f89b6 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-03 00:54:35 +00:00
Zach Copley
08422dfa17 Remove double word from Twitter bridge README 2010-03-02 16:53:53 -08:00
Zach Copley
9520c0996d Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: save file records for enclosures
  Changed the geo location cookie Expire to Session.
2010-03-02 16:51:21 -08:00
Zach Copley
ca21f1da86 - Have Twitter bridge check for a global key and secret if it can't
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
2010-03-02 16:49:29 -08: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
Sarven Capadisli
9f94d6defa Changed the geo location cookie Expire to Session. 2010-03-02 19:15:24 -05:00
Brion Vibber
49a872b56f OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
Plus misc warnings/notices cleanup in the submission path.
2010-03-02 15:43:32 -08:00
Brion Vibber
8da1b71d69 Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications 2010-03-02 15:43:25 -08:00
Brion Vibber
7175e7c7a1 OStatus fix: look for <link>s in the current element's children, not in all its descendants. Was breaking notice URL transfer, pulling a profile link by mistake. 2010-03-02 15:38:52 -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
Sarven Capadisli
1550d1004d Don't need to float the anchor 2010-03-02 15:24:07 -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
b1ffbf17d3 Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort. 2010-03-02 12:06:40 -08:00