wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,427 Commits 8 Branches 0 Tags 330 MiB
b653b2fb64
Commit Graph

40 Commits

Author SHA1 Message Date
Siebrand Mazeland
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
Siebrand Mazeland
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
Siebrand Mazeland
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
Zach Copley
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
Siebrand Mazeland
78eed32781 Localisation updates from http://translatewiki.net. 2011-02-26 00:34:44 +01:00
Brion Vibber
880b1b666e Merge branch 'master' into 0.9.x 2011-02-25 12:24:18 -08:00
Zach Copley
77c280a48b Revert "FacebookBridge - Add lots of debug output (revert me)" 
This reverts commit c44a622449.
 2011-02-24 14:21:50 -08:00
Zach Copley
7d50189ec2 FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set 2011-02-24 13:57:21 -08:00
Zach Copley
de6d46ea4b FacebookBridge - dequeue messages that aren't bound for Facebook 2011-02-24 13:29:56 -08:00
Zach Copley
c44a622449 FacebookBridge - Add lots of debug output (revert me) 2011-02-24 12:59:37 -08:00
Zach Copley
65dbf485e4 FacebookBridge - make a huge fuss if we can't create a valid Facebookclient 2011-02-24 12:52:31 -08:00
Siebrand Mazeland
a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Zach Copley
d9ace57625 FacebookBridge - remove unnecessary warning and noisy debugging statement 2011-02-10 10:24:38 -08: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
67b83bcca8 FacebookBridge use Plugin::path() 2011-02-03 12:22:39 -05:00
Siebrand Mazeland
e6e402cefd Localisation updates from http://translatewiki.net. 2011-01-29 23:10:15 +01:00
Evan Prodromou
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
Evan Prodromou
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
Brion Vibber
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
Brion Vibber
963e7576f2 Merge branch 'testing' into moveaccount 2011-01-19 10:41:14 -08:00
Brion Vibber
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
Siebrand Mazeland
380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01:00
Zach Copley
77eda41030 Added Start/EndRegistrationTry events to Facebook Bridge's user registration 2011-01-06 12:15:59 -08:00
Zach Copley
f3d48d2dfe Add README with intallation/upgrade instructions to the Facebook Bridge plugin 2011-01-05 15:34:10 -08:00
Siebrand Mazeland
cf824621b9 Localisation updates from http://translatewiki.net. 2010-12-16 16:30:30 +01:00
Siebrand Mazeland
c4f67f7647 * fix typo in parameter notation 
* add FIXME for unused message
* remove superfluous whitespace
 2010-12-02 12:42:58 +01:00
Siebrand Mazeland
6bdce2b1e5 Localisation updates from http://translatewiki.net. 2010-11-30 21:35:25 +01:00
Siebrand Mazeland
ee67a0673d Localisation updates from http://translatewiki.net. 2010-11-30 18:53:04 +01:00
Brion Vibber
8161bf0797 Merge branch 'namecase' into 0.9.x 2010-11-29 16:47:51 -08:00
Zach Copley
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
Brion Vibber
8d3577da34 Replace a couple plugin usages of NICKNAME_FMT with Nickname::normalize() 2010-11-29 15:11:07 -08:00
Siebrand Mazeland
ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Zach Copley
7e6c0e542f FacebookBridge - fail gracefully if the user has already deleted a 
linked notice on Facebook.
 2010-11-22 21:40:47 +00:00
Zach Copley
d927969209 Automatically make Facebook admin panel available if the FacebookBridge 
plugin is installed.
 2010-11-18 21:55:43 -08:00
Zach Copley
cb530566de Facebook: Add needed perms to plain login URL 2010-11-18 13:34:41 -08:00
Zach Copley
229c2693f4 Fix name of Facebook Bridge plugin 2010-11-18 13:28:49 -08:00
Zach Copley
163f18b8ac Remove dumb debugging statement 2010-11-17 22:15:30 +00:00
Zach Copley
2c68703923 Facebook: Gracefully handle disconnection 2010-11-17 21:53:56 +00:00
Zach Copley
4f63b5cff6 FacebookSSO -> FacebookBridge 2010-11-16 02:33:17 +00:00