f0b39defb2
Merge branch 'yammer' of gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-09-27 17:26:14 -07:00
87a12b7fcf
Fix for i18n: avoid notice spew in php-gettext with the stub po file for english by using a working plurals rule
2010-09-27 17:23:09 -07:00
0477101af7
update README for YammerImport
2010-09-27 17:12:06 -07:00
f528cc5548
Yammer import API keys can now be overridden by the admin.
2010-09-27 16:56:48 -07:00
ec83fef9b7
Take trailing newline out of i18n.
2010-09-28 01:33:09 +02:00
ec7ab3af4d
Localisation updates from http://translatewiki.net
...
* first export of L10n for languages other than English. Could use some testing/QA.
2010-09-28 01:09:29 +02:00
d17f0bf025
Localisation updates from http://translatewiki.net
...
* StatusNet core updates.
2010-09-28 01:03:14 +02:00
2d08750c47
Localisation updates from http://translatewiki.net
...
* add support for Hungarian (hu)
2010-09-28 01:02:08 +02:00
def37ee796
Update core POT file.
2010-09-28 00:59:34 +02:00
430d1da976
Update POT files.
2010-09-28 00:03:06 +02:00
7c4fcefd31
Enhanced OStatus fixup-shadow.php cleanup script to check for direct matches against user.uri and user_group.uri (for local groups). This should catch cases that were missed before because we were only doing pattern-matching checks, and the pattern didn't match because the site has been renamed and the old URI no longer matches the current domain / path structure.
...
Could use some more thorough testing in practice!
2010-09-27 14:23:10 -07:00
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
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
eeaab2bc00
Work in progress on fixing auth... looks like the iframe doesn't work though. Sigh.
2010-09-27 12:24:10 -07:00
80e0e60c37
Add a comment in UserxrdAction warning future maintainers not to break domain migrations if adding domain checking to the webfinger lookup in future.
2010-09-27 11:38:26 -07:00
617b6f4f7d
User user_group.uri to look up local groups for OStatus addressing checks when available. Will still fall back to the URL-scheme-checking code if there's no matching user_group record.
...
Should help with keeping remote groups working when renaming sites -- as long as user_group.uri has been filled out on the site changing its domain and other issues with POST handling are resolved.
2010-09-27 11:29:54 -07:00
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
0dc5080a5d
Merge remote branch 'gitorious/master'
2010-09-25 06:30:36 -04:00
dc63626641
Optionally restrict Disqus comments to specific users' notices
2010-09-24 18:29:02 -07:00
7721e64a42
Merge branch '0.9.x'
2010-09-24 18:20:45 -07:00
ebbbaba378
Work in progress on getting the frontend Yammer import form going....
2010-09-24 17:22:44 -07:00
19adb7c8d3
Pretty it up a bit more
2010-09-24 16:27:33 -07:00
35119f4072
Pretty up the Yammer import status display a bit
2010-09-24 16:15:45 -07:00
d962f7092f
Initial progress display of Yammer import state in admin panel
2010-09-24 14:52:51 -07:00
9cd7bffcc0
Merge remote branch 'gitorious/master'
2010-09-24 16:50:33 -04:00
210e486d80
remove unnecesssary fieldset from sitemap admin panel
2010-09-24 16:50:03 -04:00
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
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
c75bd62a4c
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:19:21 -07:00
da04858902
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:16:32 -07:00
62f7d6c74d
Fix strings in Disqus plugin for i18n
2010-09-23 15:46:01 -07:00
eb8be9988e
Work in progress: YammerRunner state machine wrapper for running the Yammer import in chunks.
2010-09-23 15:23:56 -07:00
5183997e35
A little more cleanup...
2010-09-23 12:52:58 -07:00
7e177b7ec6
Add Netbeans project metadata dir to .gitignore
2010-09-23 12:48:15 -07:00
2006ced30a
Merge branch '0.9.x'
2010-09-23 11:07:25 -04:00
a2bfcc9734
Provisional versions of two new themes (plus new base).
2010-09-23 10:50:45 -04:00
0f1fc36a05
Merge branch '0.9.x'
2010-09-23 09:50:46 -04:00
5f409a0d7c
Cloudy theme fixes: show notice form only on appropriate pages; IE fix for top padding.
2010-09-22 22:41:17 -04:00
44ff13c947
More doc comments on SN_YammerClient
2010-09-22 17:53:38 -07:00
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
84331ca7bd
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:33:06 +00:00
77609e0c4a
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:30:50 +00:00
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02:00
a005210438
Initial README for yammer importer
2010-09-22 13:12:39 -07:00
12ec7efe90
Split Yammer importer files into subdirs before I get too lost adding UI
2010-09-22 12:52:34 -07:00
be14f409e4
initial script to restore a backed-up user
2010-09-22 12:08:39 -04:00
4d01f8fbb6
save a URI with the user
2010-09-22 12:08:17 -04:00
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
f0105893b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-22 10:35:27 -04:00
acd7613933
Fixes for Yammer groups import: pulling explicit list, fixed avatar fetch
2010-09-21 23:19:36 -07:00
Brion Vibber
Siebrand Mazeland
Evan Prodromou
Zach Copley
Samantha Doherty