b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
aa14a14f86
using wrong rules for facebook replies
2012-02-20 11:29:49 -05:00
183ffce78f
check reply_to flag before sending replies to Facebook
2012-02-20 10:58:56 -05:00
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
cd30c94096
Move check for valid access token to the right place
2011-09-27 16:59:10 +00:00
ec53e68cf2
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 04:33:00 +00:00
000e5c0c01
Do a better job of saving the original avatar from Facebook
2011-09-27 04:31:41 +00:00
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
eb711321c3
Merge branch '1.0.x' into testing
2011-09-26 14:10:43 -04:00
634fb64c11
Facebook bridge mostly working again with new OAuth 2.0 flow
2011-09-26 05:32:19 +00:00
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
118e84be19
Update to latest Facebook PHP sdk
2011-09-22 15:47:55 -07:00
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
eb90389a22
Localisation updates from http://translatewiki.net .
2011-07-01 13:02:21 +02:00
89aebb4ef0
Localisation updates from http://translatewiki.net .
2011-06-18 18:14:28 +02:00
36d619480a
Rip out user, group and site design customization code
...
Squashed commit of the following:
commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:51:47 2011 -0400
Remove design-related stuff from the API
commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:40:16 2011 -0400
Mop up misc design related code
commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:21:00 2011 -0400
Remove Design DB_DataObject class and references to it in schema
commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:15:54 2011 -0400
Remove design-related actions and widgets
commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:10:57 2011 -0400
Remove navigation / routing to design settings actions
commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:03:09 2011 -0400
CurrentUserDesignAction -> Action
commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:54:22 2011 -0400
* GroupDesignAction -> GroupAction (new base class for group actions)
commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:36:40 2011 -0400
OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
c3f081c583
Localisation updates from http://translatewiki.net .
2011-06-05 21:15:31 +02:00
b0e80d1e28
Fix xgettext translator comment.
2011-06-05 19:27:42 +02:00
7c5fb37e59
Localisation updates from http://translatewiki.net .
2011-06-05 11:50:05 +02:00
d4aef7a007
Localisation updates from http://translatewiki.net .
2011-05-05 23:24:49 +02:00
5d72b600a1
Localisation updates from http://translatewiki.net .
2011-04-27 14:53:02 +02:00
cb8eb4d307
Localisation updates from http://translatewiki.net .
2011-04-20 10:19:58 +02:00
13ae3ab259
Localisation updates from http://translatewiki.net .
2011-04-18 13:41:15 +02:00
5f3dbc3e98
Localisation updates http://translatewiki.net .
2011-04-17 20:30:47 +02:00
4c00b830bf
Localisation updates from http://translatewiki.net .
2011-04-17 01:15:30 +02:00
409550e1dc
Localisation updates from http://translatewiki.net .
2011-04-13 15:48:18 +02:00
0644cdb6d0
Localisation updates from http://translatewiki.net .
2011-04-11 15:10:09 +02:00
396a0c08b3
Localisation updates from http://translatewiki.net .
2011-04-09 20:53:29 +02:00
b77531897a
Fixed incorrect single quotes with newlines from Commit:3e8bf13aab25050cce09a3180ea7b56c41ed40e3.
2011-04-08 18:47:04 +02:00
3e8bf13aab
Update translator documentation.
...
L10n/i18n updates.
2011-04-08 10:59:10 +02:00
09523a19d7
Localisation updates from http://translatewiki.net .
2011-04-03 15:35:52 +02:00
d2a2575648
Localisation updates from http://translatewiki.net .
2011-04-01 22:59:31 +02:00
ade7172a25
L10n/i18n updates.
2011-04-01 22:32:56 +02:00
4ac471f380
Localisation updates from http://translatewiki.net .
2011-03-31 23:30:07 +02:00
24945715d0
Provisional fix for ticket #3108 : Facebook bridge sends "likes" as the notice's original poster instead of as the person doing the liking.
...
Adds optional $profile parameter for Facebookclient constructor and uses that for the foreign_link lookup if provided instead of the notice's poster.
2011-03-30 17:02:40 -07:00
14456cbbb2
Fix gettext domain for messages in plugins "_()" to "_m()".
...
Some other i18n and L10n updates, too.
i18n/L10n review not complete.
2011-03-30 22:31:23 +02:00
cbe003eb38
don't leak private notices to facebook
2011-03-28 16:10:24 -04:00
4e64bd4e5b
Localisation updates from http://translatewiki.net .
2011-03-24 16:08:03 +01:00
5bb6fae307
Localisation updates from http://translatewiki.net .
2011-03-18 20:59:45 +01:00
7a9b989349
Localisation updates from http://translatewiki.net .
...
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
5fd9767e80
Localisation updates from http://translatewiki.net .
...
* Fix previous commit. Pot files were built against master instead of 1.0.x.
2011-03-03 18:39:12 +01:00
0210b765ad
Localisation updates from http://translatewiki.net .
...
Looks like some documentation patches from 0.9.x didn't make it into 1.0.x (see statusnet.pot diff). Have to check with Brion what went wrong there.
2011-03-03 18:21:17 +01:00
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
78eed32781
Localisation updates from http://translatewiki.net .
2011-02-26 00:34:44 +01:00
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
77c280a48b
Revert "FacebookBridge - Add lots of debug output (revert me)"
...
This reverts commit c44a622449
2011-02-24 14:21:50 -08:00
7d50189ec2
FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set
2011-02-24 13:57:21 -08:00
de6d46ea4b
FacebookBridge - dequeue messages that aren't bound for Facebook
2011-02-24 13:29:56 -08:00
c44a622449
FacebookBridge - Add lots of debug output (revert me)
2011-02-24 12:59:37 -08:00
65dbf485e4
FacebookBridge - make a huge fuss if we can't create a valid Facebookclient
2011-02-24 12:52:31 -08:00
a86d293c93
Localisation updates from http://translatewiki.net .
2011-02-14 19:43:16 +01:00
d9ace57625
FacebookBridge - remove unnecessary warning and noisy debugging statement
2011-02-10 10:24:38 -08:00
75bf756111
LOG_WARN -> LOG_WARNING
2011-02-08 23:34:37 -08:00
98af8d2a19
FacebookBridge plugin - allow Facebook app ID and secret to be
...
initialized via config.php
2011-02-09 04:49:39 +00:00
67b83bcca8
FacebookBridge use Plugin::path()
2011-02-03 12:22:39 -05:00
e6e402cefd
Localisation updates from http://translatewiki.net .
2011-01-29 23:10:15 +01:00
592e2be5e1
Make new menu the default menu
...
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.
This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.
Let's put that episode behind us.
The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
e53793edf4
make 'admin' a safe user name
...
'admin' is a pretty common username that people try when installing;
it was blacklisted because all of our admin panels were at /admin/*,
which would conflict with the admin user's namespace.
Changed the location of all admin panels to /panel/*, blacklisted the
nickname 'panel', and allowed 'admin'. Tested with a fresh install;
seems to work great.
2011-01-23 10:18:35 -05:00
ddde99cd89
Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms)
2011-01-20 15:55:36 -08:00
963e7576f2
Merge branch 'testing' into moveaccount
2011-01-19 10:41:14 -08:00
56e2bc10d9
Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us.
2011-01-18 12:34:27 -08:00
380ca7187c
Localisation updates from http://translatewiki.net .
2011-01-14 12:10:05 +01:00
77eda41030
Added Start/EndRegistrationTry events to Facebook Bridge's user registration
2011-01-06 12:15:59 -08:00
f3d48d2dfe
Add README with intallation/upgrade instructions to the Facebook Bridge plugin
2011-01-05 15:34:10 -08:00
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
c4f67f7647
* fix typo in parameter notation
...
* add FIXME for unused message
* remove superfluous whitespace
2010-12-02 12:42:58 +01:00
6bdce2b1e5
Localisation updates from http://translatewiki.net .
2010-11-30 21:35:25 +01:00
ee67a0673d
Localisation updates from http://translatewiki.net .
2010-11-30 18:53:04 +01:00
8161bf0797
Merge branch 'namecase' into 0.9.x
2010-11-29 16:47:51 -08:00
f1f67c2af5
FacebookBridge:
...
- Don't try to access Foreign_link if it doesn't exist
- Remove noisy debugging statement
2010-11-29 23:57:41 +00:00
8d3577da34
Replace a couple plugin usages of NICKNAME_FMT with Nickname::normalize()
2010-11-29 15:11:07 -08:00
ed0e91c7a1
Localisation updates from http://translatewiki.net .
2010-11-29 20:28:28 +01:00
7e6c0e542f
FacebookBridge - fail gracefully if the user has already deleted a
...
linked notice on Facebook.
2010-11-22 21:40:47 +00:00
d927969209
Automatically make Facebook admin panel available if the FacebookBridge
...
plugin is installed.
2010-11-18 21:55:43 -08:00
cb530566de
Facebook: Add needed perms to plain login URL
2010-11-18 13:34:41 -08:00
229c2693f4
Fix name of Facebook Bridge plugin
2010-11-18 13:28:49 -08:00
163f18b8ac
Remove dumb debugging statement
2010-11-17 22:15:30 +00:00
2c68703923
Facebook: Gracefully handle disconnection
2010-11-17 21:53:56 +00:00
4f63b5cff6
FacebookSSO -> FacebookBridge
2010-11-16 02:33:17 +00:00
Evan Prodromou
Siebrand Mazeland
Zach Copley
Brion Vibber