Brion Vibber
f30744c7c5
refactor for multi....
2011-02-11 12:13:33 -08:00
Brion Vibber
f7b431d60b
woops
2011-02-11 12:08:35 -08:00
Brion Vibber
91535365b3
Work in progress: update-profile-data.php to update ostatus profile info from the current feed
2011-02-11 11:55:23 -08:00
Evan Prodromou
dc424ab63a
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-10 22:23:06 -05:00
Evan Prodromou
d876418acd
Merge remote branch 'dev/master'
2011-02-10 22:21:56 -05:00
Evan Prodromou
ff2553b9c7
get the subject first if you go to the feed
2011-02-11 03:01:24 +00:00
Evan Prodromou
fc317f8b72
check legacy <actor> and <subject> first from feed
2011-02-11 02:59:18 +00:00
Brion Vibber
b09276635c
Merge branch 'master' into 0.9.x
2011-02-10 12:04:13 -08:00
Brion Vibber
2bf8a68908
Fix for ticket #3039 : TwitterBridge was incorrectly sending repeats of Twitter-bound messages if the repeater has sending of things to Twitter disabled.
...
A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications.
2011-02-10 10:53:24 -08:00
Zach Copley
857e35c175
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
Show aside primary on settings pages for all themes.
correct error in README on default for deletion
2011-02-10 10:26:36 -08:00
Zach Copley
d9ace57625
FacebookBridge - remove unnecessary warning and noisy debugging statement
2011-02-10 10:24:38 -08:00
Samantha Doherty
8a87e9869f
Show aside primary on settings pages for all themes.
2011-02-10 13:23:20 -05:00
Evan Prodromou
523e8c86e9
correct error in README on default for deletion
2011-02-10 10:11:30 -05:00
Evan Prodromou
8fa44e58f9
Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
...
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.
This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.
Bug: 3028
2011-02-10 09:39:40 -05:00
Zach Copley
df19e88323
Atom output - Reinstate activity:actor and activity:subject
...
w/deprecation warnings. Also add statusnet:profile_info back into
author/actor.
2011-02-09 23:18:14 -08:00
Brion Vibber
a0c669808e
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-09 13:50:31 -08:00
Brion Vibber
a76f067631
Partial revert of 073f3e99: restores the original non-hashbang URLs for twitter users as the remote profile.
...
Should fix issue #3027 : twitter user avatars not getting imported.
Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
2011-02-09 13:46:48 -08:00
Evan Prodromou
bfa053ef17
Remove executable bits from Auth_SASL files
2011-02-09 11:04:52 -05:00
Evan Prodromou
9c4294fb50
include Auth_SASL from PEAR in extlib
2011-02-09 11:03:44 -05:00
Brion Vibber
956b3ef4d1
Merge branch 'ssltweak'
2011-02-09 00:11:28 -08:00
Brion Vibber
dc5daa237e
Further tweak for ssl paths in plugin check (sslserver may be set but empty)
2011-02-09 00:09:25 -08:00
Evan Prodromou
c273876298
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-09 03:09:24 -05:00
Evan Prodromou
10500e7f85
ensure*() functions throw exceptions for errors
2011-02-09 03:08:52 -05:00
Brion Vibber
9efedfc217
Tweak to use site/server fallback when no plugins/sslserver or site/sslserver and generating plugin CSS
2011-02-09 00:04:01 -08:00
Brion Vibber
75bf756111
LOG_WARN -> LOG_WARNING
2011-02-08 23:34:37 -08:00
Brion Vibber
a277a003b9
0.9.7beta2 (for js update)
2011-02-08 22:55:15 -08:00
Brion Vibber
ae492c7132
Revert jQuery Form to r2.17 -- the latest fails with our Meteor stuff the way it tweaks document.domain (which also causes other AJAX-related problems and needs to be destroyed one of these days...)
2011-02-08 22:28:23 -08:00
Zach Copley
98af8d2a19
FacebookBridge plugin - allow Facebook app ID and secret to be
...
initialized via config.php
2011-02-09 04:49:39 +00:00
Evan Prodromou
91485718c4
Merge branch 'testing'
2011-02-08 13:39:41 -05:00
Evan Prodromou
399977aebf
Merge remote branch 'origin/pluginstatic' into testing
2011-02-08 13:39:17 -05:00
Evan Prodromou
495dcb5847
Merge branch 'testing'
2011-02-08 11:53:37 -05:00
Evan Prodromou
ecf0dec0c1
change alpha1 to beta1
2011-02-08 11:53:30 -05:00
Evan Prodromou
8eb6646716
Merge branch 'testing'
...
Conflicts:
plugins/Facebook/facebookaction.php
plugins/Facebook/facebookhome.php
plugins/Facebook/facebookutil.php
2011-02-08 11:52:40 -05:00
Evan Prodromou
e903ff0525
Make ShowmessageAction not be a subclass of MailboxAction
...
The ShowmessageAction was using the MailboxAction to do its display of
a single direct message. Since we redid the nickname management, this
was breaking (MailboxAction requires a nickname argument,
ShowmessageAction does not, and nickname validation that used to
quietly fail now throws an exception).
I've moved the message list processing to its own widget class, so the
need to subclass MailboxAction has disappeared. I've rewritten this
action to use the MessageListItem widget, and it works fine now.
2011-02-08 11:33:36 -05:00
Evan Prodromou
3b19b63bab
correctly show the source of messages in a message list
2011-02-08 11:32:35 -05:00
Evan Prodromou
f500d4ea5b
Create and use MessageList widget
...
Our mailbox actions (inbox and outbox) were doing their own display of
messages. This was causing issues with especially showmessage, which
since the more rigourous nickname checks were added, no longer works as
a mailbox subclass.
I've taken the time to rip out the message listing code from MailboxAction
and moved it to a MessageList widget. The different mailboxes now have their
own subclasses that show the correct profile in the list.
2011-02-08 11:11:21 -05:00
Brion Vibber
c858e2bc34
Issue #3025 : string -> boolean for profile_background_tile entry in JSON user results from Twitter-compat API
...
This entry was using the strings 'true' and 'false' instead of literal booleans, which could confuse clients expecting literal booleans as in other places and on Twitter in this place.
2011-02-07 14:38:35 -08:00
Brion Vibber
1c3fabbc27
Add a brief explanation of what group inbox is at the top of the page (instructions section), plus a message to show when there are no private messages in the inbox.
2011-02-07 12:39:40 -08:00
Brion Vibber
ac5e7b727a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-02-07 12:20:12 -08:00
Brion Vibber
4883069177
Fix group regexes that got missed in Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not actual delivery, when using _underscores_ in the !group_name
2011-02-07 12:18:41 -08:00
Evan Prodromou
dbd496f901
hide feeds from group page if it's private-only
2011-02-07 14:24:35 -05:00
Evan Prodromou
204b5e8a63
Show a little indicator for private-only groups
2011-02-07 14:21:54 -05:00
Evan Prodromou
b41816fdc1
add hooks for Group profile information
2011-02-07 14:04:58 -05:00
Evan Prodromou
1d439ef5d8
Force notices to DMs when privacy = always
2011-02-07 12:58:42 -05:00
Evan Prodromou
80a4b9c76f
Change category and copyright year
2011-02-07 12:28:58 -05:00
Evan Prodromou
c37f0f8256
Merge branch 'testing' into privategroup
2011-02-07 12:27:09 -05:00
Evan Prodromou
e759b15a92
pagination for group inbox
2011-02-07 12:08:18 -05:00
Evan Prodromou
20824292c9
Rename PrivateGroup to GroupPrivateMessage to be clearer
2011-02-07 11:57:34 -05:00
Evan Prodromou
ee0bbdf89c
Add group info to new group message email
2011-02-07 11:55:16 -05:00
Evan Prodromou
951df6b02f
button on the group page to post a new message
2011-02-07 11:51:38 -05:00
