Brion Vibber
8c37b86e73
Added an option to TinyMCE plugin to restrict the rich-text editor to users who have the 'richedit' role. This allows enabling it for a subset of accounts on a site while leaving other users using the regular posting system, which is more stable.
2010-09-30 13:22:25 -07:00
Brion Vibber
93bea7ff28
Fix for OpenID-only private sites: we were removing the 'login' and 'register' actions from the routing system entirely, which meant that login links & redirects from unauthenticated views on private sites (as well as various re-auth situations even on non-private sites) would break and send to the main page instead.
...
Changed it to leave the 'login' and 'register' actions in the system; we're already taking them over and redirecting them to the OpenID login page, so they won't be reached by accident; but now those redirects can be reached on purpose. ;)
Better long-term fix may be to allow some aliasing, so we can have common_local_url('login') actually send us straight to the OpenID login page instead of having to go through an intermediate redirect, but this'll do.
2010-09-30 12:35:25 -07:00
Brion Vibber
20f2167425
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
2010-09-30 11:31:29 -07:00
Brion Vibber
1acc7d66c6
Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.
2010-09-30 11:29:31 -07:00
Evan Prodromou
49611af76d
Merge branch '0.9.x'
2010-09-29 19:24:48 +02:00
Evan Prodromou
d2ef0cf233
add hooks to the feedlist widget to give fine-grained control over feed links
2010-09-29 19:23:46 +02:00
Brion Vibber
91f25ca817
YammerImport admin UI now auto-refreshes during running BG progress, whee
2010-09-28 15:59:30 -07:00
Brion Vibber
62d9b66dff
Made YammerImport more robust against errors; can now pause/resume/reset the import state from the admin interface.
2010-09-28 15:59:29 -07:00
Brion Vibber
c62e4d0800
YammerImport: fix for importing over existing user/group nicknames; copies the new data if available onto the existing entry
2010-09-28 15:59:29 -07:00
Brion Vibber
3a1f1a49b2
YammerImport: set some more default fields for user_group registration (still need a group admin tho)
2010-09-28 15:59:29 -07:00
Brion Vibber
782046dc01
YammerImporter: 'group_id' field not always present in message data; avoid notice warning when checking it if it's missing
2010-09-28 15:59:29 -07:00
Brion Vibber
3839627a6f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-28 15:58:11 -07: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
Siebrand Mazeland
b9177f5e2e
* i18n/L10n and translator documentation updates.
...
* whitespace and indentation updates
2010-09-29 00:39:45 +02:00
Siebrand Mazeland
9587f9f55b
* i18n/L10n and translator documentation updates.
...
* whitespace and indentation updates
2010-09-28 23:42:18 +02:00
Siebrand Mazeland
b03ece26eb
* i18n/L10n and translator documentation updates.
...
* whitespace and indentation updates
2010-09-28 23:21:09 +02: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
Evan Prodromou
dd3e33ff52
Merge branch '0.9.x'
2010-09-28 11:06:32 -04:00
Brion Vibber
9a0027cab1
Merge branch 'yammer-master'
2010-09-28 07:45:43 -07:00
Brion Vibber
4e5a69ad6f
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-28 07:45:38 -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
