wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,157 Commits 8 Branches 0 Tags 330 MiB
49b755912f
Commit Graph

145 Commits

Author SHA1 Message Date
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
Brion Vibber
472dab4a86 WORK IN PROGRESS: Starting infrastructure to initiate Yammer import from web UI and process it in the background queues. Totally not complete yet. 2010-09-28 07:44:23 -07:00
Brion Vibber
22434a5dae Initial README for yammer importer 2010-09-28 07:44:23 -07:00
Brion Vibber
ec648fb717 Split Yammer importer files into subdirs before I get too lost adding UI 2010-09-28 07:44:23 -07:00
Brion Vibber
e6e8a16f1c Fixes for Yammer groups import: pulling explicit list, fixed avatar fetch 2010-09-28 07:44:22 -07:00
Brion Vibber
6bc3f5aacb Support non-image file uploads in Yammer import 2010-09-28 07:44:22 -07:00
Brion Vibber
b3210ee64c Add group link on Yammer import (won't work until memberships are fixed) 2010-09-28 07:44:22 -07:00
Brion Vibber
1685c8a4fa Fetch more user data in Yammer imports, including the primary email address (preconfirmed, so we can do stuff like tell people to reset their passwords and log in!) and some bio info. 2010-09-28 07:44:22 -07:00
Brion Vibber
37c67c3f9f Yammer import: mark group posts with the proper group inbox (should we append a !foo or leave them as is, as current?) 2010-09-28 07:44:22 -07:00
Brion Vibber
7ffaf82348 Pull group descriptions in Yammer import 2010-09-28 07:44:21 -07:00
Brion Vibber
e357e13d69 Image file attachment support for Yammer import 2010-09-28 07:44:21 -07:00
Brion Vibber
b18c7ee3eb Copy favorites in Yammer importer 2010-09-28 07:44:21 -07:00
Brion Vibber
f36a062f3a Full dump of input data in yamdump also for my reference... 2010-09-28 07:44:21 -07:00
Brion Vibber
271b553e6e Fix for replies in Yammer import 2010-09-28 07:44:21 -07:00
Brion Vibber
4b2089dc52 Avatars for Yammer import 2010-09-28 07:44:21 -07:00
Brion Vibber
907cb6558c Initial semi-working yammer import :D 
* no avatars
* no details of user accounts or their auth info
* no group memberships or subscriptions
* no attachments
* will probably esplode if >20 messages in your network *whistle innocently*
 2010-09-28 07:44:20 -07:00
Brion Vibber
7a197405be fix notices in SN_YammerClient 2010-09-28 07:44:20 -07:00
Brion Vibber
7c53c1a462 Poking around at import funcs... 2010-09-28 07:44:20 -07:00
Brion Vibber
7a81bc3713 YammerImport: initial processing code for users, groups, and messages 2010-09-28 07:44:20 -07:00
Brion Vibber
599f4fe121 Beginning stub of Yammer message->notice import 2010-09-28 07:44:20 -07:00
Brion Vibber
6d0ac28460 Split SN_YammerClient out to own class file 2010-09-28 07:44:20 -07:00
Brion Vibber
10379e8ddb initial work on yammer importer code 2010-09-28 07:44:19 -07:00
Brion Vibber
0477101af7 update README for YammerImport 2010-09-27 17:12:06 -07:00
Brion Vibber
f528cc5548 Yammer import API keys can now be overridden by the admin. 2010-09-27 16:56:48 -07:00
Brion Vibber
585c7f35ca 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-27 13:34:35 -07:00
Brion Vibber
05c12c58bb 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-27 12:34:01 -07:00
Brion Vibber
eeaab2bc00 Work in progress on fixing auth... looks like the iframe doesn't work though. Sigh. 2010-09-27 12:24:10 -07:00
Brion Vibber
ebbbaba378 Work in progress on getting the frontend Yammer import form going.... 2010-09-24 17:22:44 -07:00
Brion Vibber
19adb7c8d3 Pretty it up a bit more 2010-09-24 16:27:33 -07:00
Brion Vibber
35119f4072 Pretty up the Yammer import status display a bit 2010-09-24 16:15:45 -07:00
Brion Vibber
d962f7092f Initial progress display of Yammer import state in admin panel 2010-09-24 14:52:51 -07:00
Brion Vibber
bdd8a587e7 Ok, command-line workflow for YammerImportPlugin seems to mostly work, at least on tiny test site :D 2010-09-23 17:55:13 -07:00
Brion Vibber
dd414db9ea 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-23 16:40:22 -07:00
Brion Vibber
eb8be9988e Work in progress: YammerRunner state machine wrapper for running the Yammer import in chunks. 2010-09-23 15:23:56 -07:00
Brion Vibber
5183997e35 A little more cleanup... 2010-09-23 12:52:58 -07:00
Brion Vibber
44ff13c947 More doc comments on SN_YammerClient 2010-09-22 17:53:38 -07:00
Brion Vibber
084befc32f WORK IN PROGRESS: Starting infrastructure to initiate Yammer import from web UI and process it in the background queues. Totally not complete yet. 2010-09-22 17:51:50 -07:00
Brion Vibber
a005210438 Initial README for yammer importer 2010-09-22 13:12:39 -07:00
Brion Vibber
12ec7efe90 Split Yammer importer files into subdirs before I get too lost adding UI 2010-09-22 12:52:34 -07:00
Brion Vibber
acd7613933 Fixes for Yammer groups import: pulling explicit list, fixed avatar fetch 2010-09-21 23:19:36 -07:00
Brion Vibber
7a381f2533 Support non-image file uploads in Yammer import 2010-09-21 22:00:25 -07:00
Brion Vibber
0ed506ee93 Add group link on Yammer import (won't work until memberships are fixed) 2010-09-21 18:21:36 -07:00
Brion Vibber
da87d4334a Fetch more user data in Yammer imports, including the primary email address (preconfirmed, so we can do stuff like tell people to reset their passwords and log in!) and some bio info. 2010-09-21 18:15:32 -07:00
Brion Vibber
9652e77376 Yammer import: mark group posts with the proper group inbox (should we append a !foo or leave them as is, as current?) 2010-09-21 17:35:32 -07:00
Brion Vibber
db5a4ce70d Pull group descriptions in Yammer import 2010-09-21 17:25:02 -07:00
Brion Vibber
ed3d9a11bf Image file attachment support for Yammer import 2010-09-21 17:08:40 -07:00
Brion Vibber
47cf29b2a2 Copy favorites in Yammer importer 2010-09-21 16:27:26 -07:00
Brion Vibber
9be9d2f720 Full dump of input data in yamdump also for my reference... 2010-09-21 16:27:10 -07:00
Brion Vibber
0ff28ac8e0 Fix for replies in Yammer import 2010-09-21 16:19:02 -07:00
Brion Vibber
8091c4d291 Avatars for Yammer import 2010-09-21 16:10:44 -07:00
Brion Vibber
3e2cf3876d Initial semi-working yammer import :D 
* no avatars
* no details of user accounts or their auth info
* no group memberships or subscriptions
* no attachments
* will probably esplode if >20 messages in your network *whistle innocently*
 2010-09-21 15:54:39 -07:00
Brion Vibber
5b9efbb501 fix notices in SN_YammerClient 2010-09-21 15:29:04 -07:00
Brion Vibber
9b1b9b711b Poking around at import funcs... 2010-09-21 15:24:14 -07:00
Brion Vibber
05af14e1ca YammerImport: initial processing code for users, groups, and messages 2010-09-21 14:56:20 -07:00
Brion Vibber
14a3697a61 Beginning stub of Yammer message->notice import 2010-09-21 13:56:30 -07:00
Brion Vibber
025184ce75 Split SN_YammerClient out to own class file 2010-09-21 13:29:44 -07:00
Brion Vibber
324fada5ea initial work on yammer importer code 2010-09-21 13:13:37 -07:00