eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
13,378 Commits 8 Branches 3 Tags
963d05265301c71138f9bb9bf08bab70a17419f1
Commit Graph

106 Commits

Author SHA1 Message Date
Siebrand Mazeland
cb8eb4d307 Localisation updates from http://translatewiki.net. 2011-04-20 10:19:58 +02:00
Siebrand Mazeland
13ae3ab259 Localisation updates from http://translatewiki.net. 2011-04-18 13:41:15 +02:00
Siebrand Mazeland
5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland
4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Siebrand Mazeland
409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland
0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Siebrand Mazeland
396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Siebrand Mazeland
c50b06dd7e Localisation updates from http://translatewiki.net. 2011-04-04 01:27:23 +02:00
Siebrand Mazeland
d2a2575648 Localisation updates from http://translatewiki.net. 2011-04-01 22:59:31 +02:00
Siebrand Mazeland
4ac471f380 Localisation updates from http://translatewiki.net. 2011-03-31 23:30:07 +02:00
Siebrand Mazeland
5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +01:00
Siebrand Mazeland
199e05f9de Localisation updates from http://translatewiki.net. 2011-03-17 11:17:22 +01:00
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
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
Evan Prodromou
77769e4b3c YammerImport uses Plugin::path() 2011-02-03 11:51:58 -05:00
Siebrand Mazeland
e6e402cefd Localisation updates from http://translatewiki.net. 2011-01-29 23:10:15 +01: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
Siebrand Mazeland
380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01:00
Siebrand Mazeland
cf824621b9 Localisation updates from http://translatewiki.net. 2010-12-16 16:30:30 +01:00
Siebrand Mazeland
ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Siebrand Mazeland
7a564276a9 Localisation updates from http://translatewiki.net. 2010-10-28 01:58:43 +02:00
Siebrand Mazeland
e6df1b19df Localisation updates from http://translatewiki.net 2010-10-18 22:03:29 +02:00
Brion Vibber
bca215563f Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport) 2010-10-13 11:10:04 -07:00
Siebrand Mazeland
5215423ea9 Localisation updates from http://translatewiki.net. 2010-10-09 16:15:48 +02:00
Siebrand Mazeland
007866d340 Localisation updates from http://translatewiki.net 2010-10-05 00:59:47 +02:00
Siebrand Mazeland
458512aafd Localisation updates from http://translatewiki.net 2010-10-03 22:46:38 +02:00
Siebrand Mazeland
08054e85fe Localisation updates from http://translatewiki.net. 2010-10-01 22:34:59 +02:00
Brion Vibber
ee6b4c409d YammerImport admin UI now auto-refreshes during running BG progress, whee 2010-09-28 15:54:44 -07:00
Brion Vibber
588758ed6d Made YammerImport more robust against errors; can now pause/resume/reset the import state from the admin interface. 2010-09-28 15:45:00 -07:00
Brion Vibber
6cf7b24017 YammerImport: fix for importing over existing user/group nicknames; copies the new data if available onto the existing entry 2010-09-28 13:33:37 -07:00
Brion Vibber
17e5ffbe4e YammerImport: set some more default fields for user_group registration (still need a group admin tho) 2010-09-28 13:07:55 -07:00
Brion Vibber
05682afee4 YammerImporter: 'group_id' field not always present in message data; avoid notice warning when checking it if it's missing 2010-09-28 13:02:34 -07:00
Brion Vibber
a8d0c04870 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-09-28 12:59:23 -07:00
Siebrand Mazeland
f6c1b8aa49 Localisation updates from http://translatewiki.net 
* adding the fuzzy messages back now that translatewiki.net processes them properly again.
 2010-09-28 21:06:47 +02:00
Brion Vibber
c20cfe2d8e PHP 5.2 compat fix in YammerPlugin (can't call $var::staticFunction() directly until PHP 5.3) 2010-09-28 11:52:19 -07:00
Brion Vibber
5b3de9aaa4 update README for YammerImport 2010-09-28 07:44:25 -07:00
Brion Vibber
61fde6c8ff Yammer import API keys can now be overridden by the admin. 2010-09-28 07:44:25 -07:00
Brion Vibber
7d51cda25d Yammer import (work run via background queues) now can be started from the admin panel! :DDDD Still requires that the app be registered on your network manually first. 2010-09-28 07:44:25 -07:00
Brion Vibber
c2de0a7407 Ok, got the AJAX clicky-throughs working for yammer auth (if app is already registered), but needs prettification. Yammer ignores callback URLs unless they're pre-registered with the app, and this apparently requires manual intervention to become a 'trusted' app, you don't get it on those you register yourself. Sigh. Also can't use an iframe since it breaks out of the frame (fair 'nuff) 2010-09-28 07:44:25 -07:00
Brion Vibber
a57d67c915 Work in progress on fixing auth... looks like the iframe doesn't work though. Sigh. 2010-09-28 07:44:25 -07:00
Brion Vibber
698f5c7a20 Work in progress on getting the frontend Yammer import form going.... 2010-09-28 07:44:25 -07:00
Brion Vibber
e4b084f093 Pretty it up a bit more 2010-09-28 07:44:25 -07:00
Brion Vibber
89dc215d9b Pretty up the Yammer import status display a bit 2010-09-28 07:44:24 -07:00
Brion Vibber
69cb47ccf4 Initial progress display of Yammer import state in admin panel 2010-09-28 07:44:24 -07:00
Brion Vibber
8f438da254 Ok, command-line workflow for YammerImportPlugin seems to mostly work, at least on tiny test site :D 2010-09-28 07:44:24 -07:00
Brion Vibber
ae507b0485 Work in progress: most of the infrastructure for running import via BG queues or CLI script is now in place (untested, no UI, needs tweaks & fixes) 2010-09-28 07:44:24 -07:00
Brion Vibber
e8ad436a99 Work in progress: YammerRunner state machine wrapper for running the Yammer import in chunks. 2010-09-28 07:44:24 -07:00
Brion Vibber
a78f184652 A little more cleanup... 2010-09-28 07:44:23 -07:00
Brion Vibber
e8526b2e1f More doc comments on SN_YammerClient 2010-09-28 07:44:23 -07:00