Commit Graph

2293 Commits

Author SHA1 Message Date
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
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
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
75bf756111 LOG_WARN -> LOG_WARNING 2011-02-08 23:34:37 -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
399977aebf Merge remote branch 'origin/pluginstatic' into testing 2011-02-08 13:39:17 -05: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
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
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
Evan Prodromou
5db1479a95 Form for posting a group message on group inbox 2011-02-07 11:24:00 -05:00
Evan Prodromou
4a435e6670 Show group local nav on group inbox 2011-02-07 10:18:54 -05:00
Evan Prodromou
143cc4bdd0 Show private messages to groups in a list
Shows the messages to a private group in a list. New classes for
showing a group private message and list of group private messages.

New actions for showing a stream of group private messages and a
single group private message.
2011-02-07 09:46:26 -05:00
Evan Prodromou
842bc5708e Send a private group message with a d command 2011-02-04 15:51:59 -05:00
Evan Prodromou
a002d57736 save group privacy settings 2011-02-03 16:39:52 -05:00
Evan Prodromou
8bf57019c1 autoload private group classes 2011-02-03 15:30:57 -05:00
Evan Prodromou
094bb9e1c3 redo the group dm schema, again 2011-02-03 15:28:41 -05:00
Evan Prodromou
99db745f9d Merge branch 'testing' into privategroup
Conflicts:
	lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Evan Prodromou
67b83bcca8 FacebookBridge use Plugin::path() 2011-02-03 12:22:39 -05:00
Evan Prodromou
ffb7ca3e99 Realtime needs to load from own directory, not subclass's 2011-02-03 12:18:57 -05:00
Evan Prodromou
68cf2bdced Bookmark uses Plugin::path() 2011-02-03 12:04:54 -05:00
Evan Prodromou
77769e4b3c YammerImport uses Plugin::path() 2011-02-03 11:51:58 -05:00
Evan Prodromou
55af561887 ShareNotice uses Plugin::path() 2011-02-03 11:49:00 -05:00
Evan Prodromou
0c7104ec2f MobileProfile uses Plugin::path() 2011-02-03 11:46:20 -05:00
Evan Prodromou
26f0a24ab6 Merge branch 'testing' into pluginstatic 2011-02-03 11:42:58 -05:00
Evan Prodromou
70cf37cb88 fix variable name in NewMenu 2011-02-03 11:42:36 -05:00
Evan Prodromou
9ae3d3de36 NewMenu uses Plugin::path() 2011-02-03 11:41:47 -05:00
Evan Prodromou
27eeee08c1 FIXME for Plugin::path() in TinyMCE 2011-02-03 11:38:11 -05:00
Evan Prodromou
2195020566 TabFocus uses Plugin::path() 2011-02-03 11:30:14 -05:00
Evan Prodromou
50675e356b ModPlus uses Plugin::path() 2011-02-03 11:28:39 -05:00
Evan Prodromou
2f598f8c7b LinkPreview uses Plugin::path() 2011-02-03 11:25:56 -05:00
Evan Prodromou
3496559d8e InfiniteScroll uses Plugin::path() 2011-02-03 11:23:39 -05:00
Evan Prodromou
0ba450373d DirectionDetector uses Plugin::path() 2011-02-03 11:20:57 -05:00
Evan Prodromou
6494f5938c ClientSideShorten uses Plugin::path() 2011-02-03 11:19:03 -05:00
Evan Prodromou
0bab5e4a9e Autocomplete uses Plugin::path() 2011-02-03 11:16:30 -05:00
Evan Prodromou
22e8893fba OStatus uses Plugin::path() 2011-02-03 11:09:26 -05:00
Evan Prodromou
c8386c7ecb TwitterBridge uses Plugin::staticPath() 2011-02-03 11:03:24 -05:00
Evan Prodromou
26407c3e35 Realtime plugin uses Plugin::path() 2011-02-03 10:58:06 -05:00