Brion Vibber
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
Siebrand Mazeland
ae65f93b2b
L10n updates and removal of superfluous whitespace.
2010-12-16 16:33:39 +01:00
Siebrand Mazeland
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
Brion Vibber
0330bad688
Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts)
2010-12-15 12:14:25 -08:00
Brion Vibber
bf20258f4b
Merge branch '0.9.x' into 1.0.x
2010-12-15 11:59:31 -08:00
Brion Vibber
6c67114198
Mark OembedAction, XrdAction, and (plugin) AutocompleteAction as read-only. Tweaked ApiStatusesShow and ApiTimelineUser to still claim read-only when hit with a HEAD request (usually link checkers or a precursor to a GET, and should be semantically equivalent to a GET without actually transferring data)
2010-12-14 16:14:15 -08:00
Brion Vibber
39cad55711
TwitterBridge: partial merge of id_str usage from 0.9.x for improved 32-bit and pre-5.2.10 compatibility. (on 64-bit in 5.2.6 we can pull the integer IDs, but silently lose some precision on the end.)
...
Fixes for Twitter bridge breakage on 32-bit servers. New "Snowflake" 64-bit IDs have become too big to fit in the integer portion of double-precision floats, so to reliably use these IDs we need to pull the new string form now.
Machines with 64-bit PHP installation should have had no problems (except on Windows, where integers are still 32 bits)
Conflicts:
plugins/TwitterBridge/twitterimport.php <- as this hasn't been broken out, the import code is NOT FULLY UPDATED HERE.
2010-12-13 12:13:24 -08:00
Brion Vibber
f947fe5d0c
Disable InProcessCache plugin for CLI scripts, which are more likely to be long-running, greatly increasing the chance of data corruption.
2010-12-09 10:24:06 -08:00
Evan Prodromou
99f3964394
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-12-09 10:48:12 -05:00
Evan Prodromou
f5f6a742cb
Additional in-process cache plugin InProcessCache
...
Some of our caching systems, like the disk cache or memcached, have
significant overhead (network connections or disk I/O).
This plugin adds an additional layer of in-process cache, so we don't
need to reconnect to external cache systems when we've already
received a data item from the cache. There are some concurrency issues
here, but typically they won't be important at the level of a single
web hit.
2010-12-09 10:45:36 -05:00
Brion Vibber
e25d4683c8
Merge branch 'master' into 0.9.x
2010-12-08 18:13:20 -08:00
Brion Vibber
516161213f
Tweak to PiwikAnalytics plugin to help browsers to pre-load piwik.js, may shave a little off load time.
...
Piwik's current default recommended JS for loading creates a <script> tag via document.write(). In addition to being generally evil, this means the browser doesn't know it's going to need piwik.js until that chunk of script gets executed... which can't happen until all scripts referenced *before* it have been loaded and executed.
The only reason for that bit of script though seems to be to pick 'http' or 'https' depending on the current page's scheme. This can be done more simply by using a protocol-relative link (eg "//piwik.status.net/piwik.js"), which the browser will resolve as appropriate. Since it's now sitting in the <script> tag, the browser's lookahead code will now see it and be able to start loading it while earlier things are parsing/executing.
May be better still to move to an asynchronous load after DOM-ready, but I'm not sure if that'll screw with the analytics code (eg, not being able to start things on the DOM-ready events since they're past).
2010-12-08 17:39:04 -08:00
Brion Vibber
d8d9edfc99
Merge branch 'master' into 0.9.x
2010-12-08 15:01:25 -08:00
Brion Vibber
26bd15ec0a
Mapstraction plugin: use minified sources for OpenLayers
...
The default full build of OpenLayers.js is 943kb as of 2.10; this gzips down to a couple hundred kb
but is still rather nasty, plus loading it off a remote host could slow things down.
Using a local copy let us cut down the size significantly by discarding unused features, and further
minification with yui-compressor shaves a bit more off. Cuts down to about 1/5 the size of the
original.
Also threw in a bundled & minified copy of the Mapstraction classes plus our usermap.js,
which covers the common case of using the default OpenLayers provider. This cuts out three
additional script loads, two of which weren't getting launched until after the mxn.js main
file got loaded.
2010-12-08 14:54:02 -08:00
Brion Vibber
fb315c6f61
Create a bundled & minified JS file for Mapstraction's common case (using OpenLayers); this'll avoid waiting on additional script loads for mxn.core.js and mxn.openlayers.core.js, and removes the need to load usermap.js separately as well.
2010-12-08 14:52:26 -08:00
Brion Vibber
34569017ce
Add stripped and minified local copy of OpenLayers 2.10, about 1/5 the size of the full version.
...
Included Makefile will recreate the OpenLayers.js using the statusnet.cfg strip configuration file
and yui-compressor to do some extra minification at the end. Requires fetching the OpenLayers
source download and dropping it in:
http://openlayers.org/download/OpenLayers-2.10.tar.gz
2010-12-08 14:28:55 -08:00
Brion Vibber
db4d69f099
Quick hack to discard twitter broadcast queue items on failure *IF* config option 'twitter' 'ignore_errors' is on:
...
$config['twitter']['ignore_errors'] = true;
A longer-term solution is to patch up the indirect retry handling to count retries better, or delay for later retry sensibly.
2010-12-07 12:11:37 -08:00
Brion Vibber
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
Brion Vibber
4b4b763255
For good measure, don't return autocomplete results when not logged in.
2010-12-06 17:20:14 -08:00
Brion Vibber
6662141328
reindent
2010-12-06 17:16:47 -08:00
Brion Vibber
febcf7258c
Tweak router target URL for Autocomplete suggestions
2010-12-06 17:15:56 -08:00
Brion Vibber
ee9e95877c
Update Autocomplete readme: current state seems to work fine on private sites, so removing that note.
2010-12-06 17:13:02 -08:00
Brion Vibber
4868aaf9ea
Ticket #2924 : include mini avatars in Autocomplete plugin drop-down list
...
Ticket #2923 : don't show "(null)" for some profiles with no full name set
2010-12-06 16:55:16 -08:00
Brion Vibber
daae13df1c
Start tweaking Autocomplete js
2010-12-06 16:20:54 -08:00
Brion Vibber
851dbf1361
fix breakage in AutocompletePlugin
2010-12-06 15:23:12 -08:00
Brion Vibber
c40fde900a
minify LinkPreview JS code
2010-12-06 15:11:42 -08:00
Brion Vibber
bb50e773e6
Ticket #2921 : cleanup on LinkPreview to make fewer requests while typing. Will now wait for each link's preview request to complete (successfully or unsuccessfully) before re-running it)
2010-12-06 14:49:24 -08:00
Brion Vibber
fb1fc8a046
Use short API-style error responses for LinkPreview's oembed proxy
2010-12-06 13:37:57 -08:00
Evan Prodromou
89f5dd4c18
updated NoticeTitle plugin to use new activity events
2010-12-05 16:31:43 -05:00
Brion Vibber
aa96c3c1d9
Fix for tickets #2917 , #2262 : user URL shortening options not being applied in non-web channels
...
common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919 : there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-12-02 13:41:56 -08: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
Brion Vibber
bc9fcaf2eb
Fix for ticket #2911 : Hitting enter on the "associate with current account" in OpenID flow failed due to forms being mixed together
...
Separating the two forms (one to create a local account, the other to attach the OpenID to an existing account) gets them working -- enter activates the appropriate default button.
2010-12-01 12:21:00 -08:00
Brion Vibber
f68d4e7d06
Fix dumb mistake -- changed function names partway through writing Nickname and forgot to update a couple places. :)
2010-12-01 11:21:00 -08:00
Evan Prodromou
0410462c4b
add OpenID data to the Webfinger XRD file so you can login with it elsewhere
2010-12-01 13:43:34 -05:00
Brion Vibber
18cbdfb49b
Ticket #2913 : Realtime background update marker no longer triggers false positives when clearing the marker on switching away from the tab in Firefox 4
...
We were clearing the counter on the window title in the blur event, which gets fired *after* we switch away, thus triggering Firefox to mark the tab as updated again.
Clearing the counter on *focus* instead avoids this, and keeps the counter out of the way as well.
2010-12-01 01:09:14 +00:00
Brion Vibber
c6f5975554
Fix ticket #2914 : Realtime no longer tells you it's got a message queued up when it's really the one you just sent out and is already visible.
2010-11-30 16:46:11 -08:00
Brion Vibber
f222e2132d
Went through realtimeupdate.js and added documentation comments -- does not alter the minified version. :)
...
Identified several bugs and fixmes, and added more thorough labeling of the issues with replicating the entire HTML structure of notices (no i18n, missing new features, maintenance problems, possible other issues)
2010-11-30 16:39:09 -08:00
Brion Vibber
749367e12f
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/router.php
2010-11-30 16:34:52 -08:00
Brion Vibber
b4fc54c308
Flush router cache when saving Twitter admin settings: adding/removing keys can enable/disable some actions. This avoids having users' Twitter settings unreachable after adding your keys to an installation with TwitterBridge on but not pre-configured.
2010-11-30 12:46:33 -08:00
Brion Vibber
bcccbd6d8a
BitlyPlugin: fix for shortening URLs containing ampersand (&)
2010-11-30 12:40:23 -08: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
Brion Vibber
dc350b5463
Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.
2010-11-29 14:15:25 -08:00
Siebrand Mazeland
ed0e91c7a1
Localisation updates from http://translatewiki.net .
2010-11-29 20:28:28 +01:00
Evan Prodromou
8212df3e1a
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-11-26 22:11:12 -05:00
Evan Prodromou
005a14272d
Make OStatusPlugin define push feed rel
2010-11-26 22:10:18 -05:00
Evan Prodromou
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
Evan Prodromou
0a4911552e
Move user xrd action to core and use hooks to extend
...
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
Craig Andrews
3f3b38766f
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-11-26 21:12:14 -05:00
Brion Vibber
b6e5b1d294
Add LogFilter plugin: quickie way to filter out/in log output based on priority or keyword matches. Should be helpful for folks who can't easily adjust their syslog filtering.
2010-11-24 10:13:03 -08:00
Brion Vibber
c65f199486
logging tweak for Twitter status ID issue
2010-11-23 09:49:32 -08:00
Brion Vibber
c169dcb522
Fixes for Twitter bridge breakage on 32-bit servers. New "Snowflake" 64-bit IDs have become too big to fit in the integer portion of double-precision floats, so to reliably use these IDs we need to pull the new string form now.
...
Machines with 64-bit PHP installation should have had no problems (except on Windows, where integers are still 32 bits)
2010-11-23 09:28:47 -08: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
Brion Vibber
c0ce953288
Update doc comment for Awesomeness plugin
2010-11-22 12:39:38 -08:00
Brion Vibber
5ad06e80b6
Tweak regex in Awesomeness plugin
2010-11-22 12:38:47 -08:00
Jeroen De Dauw
7e173f5db8
Added Awesomeness extension
2010-11-20 15:14:12 +01:00
Brion Vibber
37994e3ff1
Merge branch 'master' into 0.9.x
2010-11-19 15:53:29 -08:00
Brion Vibber
94f2f96f2e
Ticket #2724 : gracefully handle attempts to delete or fave/unfave a remote Twitter notice if a failure occurs.
...
Most annoying error case being where the notice was already faved or deleted on Twitter! :)
Such errors will now just fail out and log a note to the syslog -- the rest of what we were doing will continue on unhindered, so you can still delete, favorite, etc and it just won't sync the info over in that case.
2010-11-19 15:51:08 -08: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
645a4d1754
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-11-17 22:16:08 +00: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
Brion Vibber
197b56778a
Add $config['attachments']['process_links'] to allow disabling processing of mentioned URL links for attachment info (oEmbed lookups) and dereferencing of redirects that we didn't have shortened ourselves.
...
This option may be useful for intranet sites that don't have direct access to the internet, as they may be unable to successfully fetch those resources.
2010-11-17 13:03:59 -08:00
Evan Prodromou
fae63a5161
use minified version of meteorupdater.js
2010-11-17 12:22:02 -05:00
Evan Prodromou
83f6bb9da1
use minified version of realtime.js
2010-11-17 12:21:01 -05:00
Brion Vibber
d1fb52264b
Use session token protection on oEmbed proxy action for LinkPreview... and commit the file *sigh*
2010-11-16 15:36:53 -08:00
Brion Vibber
9cdb9cc18d
LinkPreview: clear preview thumbnails & data on form submission/reset
2010-11-16 15:31:03 -08:00
Brion Vibber
f7fe3fa386
Less redrawing of bits in the link thumbnail preview
2010-11-16 15:20:37 -08:00
Brion Vibber
acdb9ac1e5
LinkPreview: restructure to make it easier to keep old link data
2010-11-16 14:57:35 -08:00
Brion Vibber
73f28ffabe
LinkPreview: use a local proxy for oEmbed lookups so we use a consistent common code path, and don't open up to oohembed.com being evil
2010-11-16 14:41:30 -08:00
Brion Vibber
b5fc71253c
LinkPreview: restructure a bit so we can pass config over
2010-11-16 14:27:01 -08:00
Brion Vibber
eeb7f02b98
LinkPreview: piggyback on the counter update logic, cache lookups.
2010-11-16 14:16:23 -08:00
Brion Vibber
f103a55052
LinkPreview: link the thumbnails
2010-11-16 13:58:22 -08:00
Brion Vibber
5166e71d24
LinkPreview plugin more or less functioning (though not pretty), using oohembed remote lookup and fixed sizes.
2010-11-16 13:49:23 -08:00
Brion Vibber
e851882f96
LinkPreview: flesh out stub JS code a bit. URL splitting doesn't quite match core, note.
2010-11-16 13:16:25 -08:00
Brion Vibber
450707fec6
Stub LinkPreview plugin
2010-11-16 12:41:35 -08:00
Zach Copley
4f63b5cff6
FacebookSSO -> FacebookBridge
2010-11-16 02:33:17 +00:00
Zach Copley
bd566b6f85
Merge branch '0.9.x' into facebook-upgrade
2010-11-16 02:32:46 +00:00
Zach Copley
ca4c0a1601
- Map notices to Facebook stream items
...
- rename plugin FacebookBridgePlugin
- delete/like/unlike notices across the bridge
2010-11-16 02:30:08 +00:00
Brion Vibber
eb0495d107
Merge branch 'master' into 0.9.x
2010-11-15 17:46:43 -08:00
Brion Vibber
54de6d3260
Forgot to commit the JS for ModPlus. :)
2010-11-15 17:45:58 -08:00
Brion Vibber
e4eb3b3dfd
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-15 17:36:48 -08:00
Brion Vibber
25170f272c
visual cleanup on ModPlus remote profile info popup menu
2010-11-15 17:32:33 -08:00
Brion Vibber
fdcaac3653
Tweak remote profile action: hide stats from sidebar, tweak wording on remote notice
2010-11-15 16:38:18 -08:00
Brion Vibber
5fdcba472b
RemoteProfileAction cleanup:
...
- meta robots to prevent spidering
- a little notice if silenced
2010-11-15 16:12:16 -08:00
Brion Vibber
88c35c2cce
visual tweaks for RemoteProfileAction
2010-11-15 15:57:57 -08:00
Brion Vibber
16f1c764c0
RemoteProfileAction: redirect to the regular user profile page if given a local user.
2010-11-15 15:40:07 -08:00
Brion Vibber
0e763b4902
Stub RemoteprofileAction to show the standard profile header stuff for offsite users -- provides a way to get at the mod & block controls for remote users.
2010-11-15 15:34:12 -08:00
Brion Vibber
227d4b6889
Stub ModPlus plugin: will hold experimental UI improvements for mod actions
2010-11-15 14:15:41 -08:00
Brion Vibber
398e622fec
Save attached URLs when importing a Twitter status: this lets our thumbnail detection handle photos and videos linked to by Twitter posters.
2010-11-12 17:40:34 -08:00
Brion Vibber
65eeb7cba5
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/newgroup.php
2010-11-12 13:32:48 -08:00
Brion Vibber
6291e8201f
Fix for failure edge case in TwitterBridge outgoing repeat/retweets.
...
When the retweet failed with a 403 error (say due to it being a private tweet, which can't be retweeted) we would end up mishandling the return value from our internal error handling.
Instead of correctly discarding the message and closing out the queue item, we ended up trying to save a bogus twitter<->local ID mapping, which threw another exception and lead the queue system to re-run it.
- Fixed the logic check and return values for the retweet case in broadcast_twitter().
- Added doc comments explaining the return values on some functions in twitter.php
- Added check on Notice_to_status::saveNew() for empty input -- throw an exception before we try to actually insert into db. :)
2010-11-12 13:06:41 -08:00
Evan Prodromou
b6af5a25ba
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:48:17 -05:00
Evan Prodromou
fdf3a23da7
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:46:45 -05:00
Evan Prodromou
2d55bc0e5b
give users a chance to opt out of email summaries
2010-11-11 14:51:14 -05:00
Evan Prodromou
adb16b8098
fix update of email prefs in queue handler
2010-11-11 14:50:53 -05:00
Zach Copley
3c921f38de
Add an action to handle deauthorization callbacks from Facebook
2010-11-10 01:18:06 +00:00
Zach Copley
5b94d9e86b
Merge branch '0.9.x' into facebook-upgrade
2010-11-09 23:16:17 +00:00
Zach Copley
17ae690d59
Make a richer StatusNet profile from a user's Facebook profile
2010-11-09 23:14:50 +00:00
Evan Prodromou
e87323e426
change width of notices table to display better
2010-11-09 13:04:11 -05:00
Evan Prodromou
17ab5c31ed
some alignment in the table layout
2010-11-09 07:04:50 -05:00
Evan Prodromou
76aed36f38
set height and width of avatar td in email summary
2010-11-09 06:59:16 -05:00
Zach Copley
cd236efe12
- Still send notices to Facebook from existing Facebook app users
...
- Turns out we don't need the old REST lib to use the old REST API
(removed)
2010-11-09 00:56:53 +00:00
Evan Prodromou
974e41aa4b
change to a table for HTML output
2010-11-08 18:14:13 -05:00
Evan Prodromou
37407d8c77
stylesheet for outgoing email
2010-11-08 17:31:21 -05:00
Evan Prodromou
0a56523461
Fixup headers for HTML email
2010-11-08 17:22:16 -05:00
Evan Prodromou
797059340e
Complete email summary sending system
...
Added the necessary classes to send email summaries. First, added a
script to run on a daily basis. Second, added a queue handler for
sending email summaries for users, and another to queue summaries for
all users on the site. Fixed up the email_summary_status table to
store the last-sent notice id, rather than a datetime (since we don't
support 'since' parameters anymore). Finally, made the plugin class
load the right modules when needed.
2010-11-08 13:10:09 -05:00
Evan Prodromou
9003769609
Merge branch '0.9.x' into emailsummary
2010-11-08 13:09:25 -05:00
Evan Prodromou
35931e3a0e
first steps for email summary
2010-11-08 10:36:19 -05:00
Siebrand Mazeland
f8b2ec4b53
Localisation updates from http://translatewiki.net .
2010-11-07 22:33:23 +01:00
Siebrand Mazeland
7aa24cbc67
Localisation updates from http://translatewiki.net
2010-11-07 22:04:44 +01:00
Siebrand Mazeland
91e8e6f385
Fix typo. Spotted by EugeneZelenko.
2010-11-06 00:54:34 +01:00
Zach Copley
035081a803
Much more reliable Facebook SSO
2010-11-05 06:34:06 +00:00
Siebrand Mazeland
ca6d7f1042
Localisation updates from http://translatewiki.net .
2010-11-05 01:25:50 +01:00
Zach Copley
c0cce18913
- Some reorganizing
...
- Making the Facebook bridging work
2010-11-04 00:43:40 +00:00
Brion Vibber
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
Brion Vibber
a3928e5583
UserFlagPlugin fix for ticket #2118 and ticket #2847 : flagged state wasn't reflected in profile lists such as group members page and profile search .
...
Pulled common code for the profile page and profile list cases to give them the same logic on checking. Also fixes the problem that you'd get a flag button for yourself in profile lists, while we explicitly exclude that from the profile page -- it's now skipped in both places.
2010-11-03 14:06:06 -07:00
Brion Vibber
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
Brion Vibber
dc4fafbbd1
General cleanup & part of ticket #2864 : use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.
2010-11-03 12:59:19 -07:00
Brion Vibber
5592333b73
Fix for ticket #2168 : if we've already flagged a profile from another window, let the 'Flag' form submission gracefully show the updated state instead of throwing an error (error message isn't even exposed properly in AJAX submissions)
2010-11-03 12:32:11 -07:00
Brion Vibber
607d958977
UserFlag fixes to prevent PHP notices breaking AJAX submissions when display_errors is on. Key & seq defs weren't quite right, which caused accesses to unset array indices in DB_DataObject.
2010-11-03 12:20:25 -07:00
Brion Vibber
1ceaa50cb0
Merge branch 'twitstream' into 0.9.x
2010-11-02 16:55:55 -07:00
Brion Vibber
9cbda32768
Pull out the 'tweetctl' queue for now; these should go over control signals, and actual handling isn't implemented yet anyway.
2010-11-02 16:51:07 -07:00
Brion Vibber
a2f0f68d75
fakestream.php can now take --all option to pull the latest messages from multiple locally-authed accounts when generating simulated sitestreams info
2010-11-02 16:43:01 -07:00
Brion Vibber
445b306b54
fakestream.php: script to build an emulated Twitter Site Stream from live Twitter data, for testing.
2010-11-02 16:27:14 -07:00
Brion Vibber
28703deb8f
Allow custom apiroot for site streams testing on streamtest
2010-11-02 16:26:51 -07:00
Zach Copley
e716c3ebaf
Merge branch '0.9.x' into facebook-upgrade
2010-11-02 23:17:07 +00:00
Zach Copley
5ea0461145
Facebook SSO - Log the user out of Facebook when s/he logs out of StatusNet
2010-11-02 23:16:32 +00:00
Siebrand Mazeland
ec79572964
Localisation updates from http://translatewiki.net .
2010-11-03 00:04:26 +01:00
Siebrand Mazeland
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
Brion Vibber
905d621b6f
Merge branch '0.9.x' into twitstream
2010-11-02 15:10:56 -07:00
Brion Vibber
0229c22d23
Merge branch '1.0.x' into schema-x
2010-11-02 15:02:55 -07:00
Brion Vibber
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
Brion Vibber
c6d4612f49
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-02 13:14:42 -07:00
Brion Vibber
86201761ea
Use SN.msg() and onEndScriptMessages() to export localized UI messages from Realtime plugin and its descendents.
2010-11-02 13:12:58 -07:00
Brion Vibber
5a9bb0adc4
Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime.
...
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
2010-11-02 13:05:16 -07:00
Siebrand Mazeland
194bb02252
* add POT file
...
* remove superfluous whitespace
* break lines at 80 or before in README
2010-11-02 20:49:34 +01:00
Brion Vibber
151eebcc28
Starting on making Realtime plugin's UI messages localizable: pause/play, popup button text and tooltip text are now loaded from PHP code where we can get at gettext.
2010-11-02 11:46:29 -07:00
Brion Vibber
23f69c80b5
Merge branch '0.9.x' into twitstream
2010-11-02 11:15:57 -07:00
Zach Copley
5ccc548bbc
Facebook SSO - new settings page
2010-11-02 01:41:31 +00:00
Zach Copley
b54afa0cbc
Facebook SSO - add ability to register a new user or connect to an
...
existing local account
2010-11-01 23:50:45 +00:00
Zach Copley
2306f7a7f4
Merge branch '0.9.x' into facebook-upgrade
2010-11-01 19:13:31 +00:00
Siebrand Mazeland
68bfeaa6c6
Localisation updates from http://translatewiki.net .
2010-10-31 01:38:57 +02:00
Zach Copley
5738e0e4a9
Beginnings of a new Facebook integration plugin
2010-10-30 00:44:16 +00:00
Brion Vibber
283d56bed3
tweak RSSCloud plugin to use new schema layout (but still the old event); the timestamp bits were confusing things
2010-10-29 15:36:42 -07:00
Brion Vibber
62408fef09
Work in progress on twitter import daemon
2010-10-29 14:12:40 -07:00
Brion Vibber
d743539cf7
Fixups for twitter streaming daemon
2010-10-29 13:41:15 -07:00
Brion Vibber
47eada3a95
Work in progress on site streams-aware TwitterDaemon
2010-10-29 13:18:03 -07:00
Brion Vibber
86adc575ec
TweetInQueueHandler: run incoming tweets through the queues to keep the Twitter streaming daemon clear.
2010-10-29 13:14:12 -07:00
Brion Vibber
15b108620e
Fix a couple 'continue's from old looping code in Twitter importer (-> return null)
2010-10-29 13:06:32 -07:00
Brion Vibber
e76028b629
Work in progress: starting on new TwitterDaemon using the Site Streams API -- code is incomplete, pulling bits from streamtest.php pending a chance to test the actual site-streams mode
2010-10-28 18:26:48 -07:00
Brion Vibber
e62254f8cc
Merge branch '0.9.x' into twitstream
2010-10-28 16:30:40 -07:00
Brion Vibber
e7c7fd39fc
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-28 16:27:53 -07:00
Brion Vibber
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
Siebrand Mazeland
456f4a6573
Localisation updates from http://translatewiki.net
2010-10-29 01:21:42 +02:00
Brion Vibber
48492600a8
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-28 00:15:59 +00:00
Brion Vibber
e43553a3d9
Tweak for OAuth headers not seen in $_SERVER
2010-10-28 00:14:45 +00:00
Siebrand Mazeland
035b4949fd
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-28 01:59:45 +02:00
Siebrand Mazeland
7a564276a9
Localisation updates from http://translatewiki.net .
2010-10-28 01:58:43 +02:00
Brion Vibber
9e9b7b972c
Merge branch 'instrument' into 0.9.x
2010-10-27 16:47:06 -07:00
Brion Vibber
ace655aecf
ApiLogger plugin: dumps some information about API hits to aid in researching future HTTP-level cachability improvements.
...
Data are sent to the 'info' level of logging, like so:
[lazarus.local:4812.86b23603 GET /mublog/api/statuses/friends_timeline.atom?since_id=1353]
STATLOG action:apitimelinefriends method:GET ssl:no query:since_id cookie:no auth:yes
ifmatch:no ifmod:no agent:Appcelerator Titanium/1.4.1 (iPhone/4.1; iPhone OS; en_US;)
Fields:
* action: case-normalized name of the action class we're acting on
* method: GET, POST, HEAD, etc
* ssl: Are we on HTTPS? 'yes' or 'no'
* query: Were we sent a query string? 'yes', 'no', or 'since_id' if the only parameter is a since_id
* cookie: Were we sent any cookies? 'yes' or 'no'
* auth: Were we sent an HTTP Authorization header? 'yes' or 'no'
* ifmatch: Were we sent an HTTP If-Match header for an ETag? 'yes' or 'no'
* ifmod: Were we sent an HTTP If-Modified-Since header? 'yes' or 'no'
* agent: User-agent string, to aid in figuring out what these things are
The most shared-cache-friendly requests will be non-SSL GET requests with no or very predictable
query parameters, no cookies, and no authorization headers. Private caching (eg within a supporting
user-agent) could still be friendly to SSL and auth'd GET requests.
We kind of expect that the most frequent hits from clients will be GETs for a few common timelines,
with auth headers, a since_id-only query, and no cookies. These should at least be amenable to
returning 304 matches for etags or last-modified headers with private caching, but it's very
possible that most clients won't actually think to save and send them. That would leave us expecting
to handle a lot of timeline since_id hits that return a valid API response with no notices.
At this point we don't expect to actually see if-match or if-modified-since a lot since most of our
API responses are marked as uncacheable; so even if we output them they're not getting sent back to
us.
Random subsampling can be enabled by setting the 'frequency' parameter smaller than 1.0:
addPlugin('ApiLogger', array(
'frequency' => 0.5 // Record 50% of API hits
));
2010-10-27 16:43:38 -07:00
Siebrand Mazeland
d0bbd343f0
i18n/L10n updates and superfluous whitespace removed.
2010-10-28 01:35:40 +02:00
Siebrand Mazeland
04fcfeaf6f
* Superfluous whitespace removed.
...
* i18n review (no changes needed).
2010-10-28 01:23:57 +02:00
Craig Andrews
255ba42ef1
use library function to determine if https should be used for recaptcha
2010-10-27 00:11:55 -04:00
Craig Andrews
9f9126e524
Load MS Virtual Earth javascript over https when browsing in https
2010-10-27 00:09:43 -04:00
Craig Andrews
bc6a61dc89
Use https for gravatars
...
No reason not to use https, and doing so prevents mixed content warnings when the avatars are used on https pages.
2010-10-26 23:56:59 -04:00
Craig Andrews
5476ffa944
add StrictTransportSecurity plugin
2010-10-26 23:46:18 -04:00
Brion Vibber
8ff44a1fb9
Merge branch '0.9.x' into twitstream
2010-10-26 15:39:31 -07:00
Evan Prodromou
5d56d9bb69
UI on profile settings page to opt out of following everyone
2010-10-26 15:33:35 -04:00
Evan Prodromou
7a80ebeb13
flag to let users opt out of following everyone
2010-10-26 15:21:30 -04:00
Evan Prodromou
e5a3b973b8
Plugin to follow all new users by default
2010-10-26 15:10:18 -04:00
Evan Prodromou
22633a5af6
can't subscribe to blacklisted domains/users
2010-10-26 11:48:27 -04:00
Evan Prodromou
bec00094a7
Blacklist plugin checks PuSH and Salmon notices
2010-10-26 11:20:43 -04:00
Brion Vibber
b483a0549f
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -07:00
Brion Vibber
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Siebrand Mazeland
1545c1228b
Localisation updates from http://translatewiki.net .
2010-10-23 20:50:55 +02:00
Siebrand Mazeland
3329685beb
* onPluginVersion added.
...
* i18n fix: use _m() in plugins, don't use _()
* some translator documentation added.
* superfluous whitespace removed.
2010-10-23 19:23:25 +02:00
Brion Vibber
e292d8fb65
Fix for 140-char replies being unexpectedly cropped when bridged to Twitter.
...
This drops the '@' -> ' @' hack for CURL meta-chars in outgoing Twitter bridge, added in commit 04b95c25
back in the day.
The Twitter bridge has since been switched from using direct CURL calls to using HTTPClient, which even with the CURL backend enabled doesn't trigger this issue, as POST parameters are formatted directly.
Prepending the space before we did the message cropping was leading to 140-char messages getting cropped unnecessarily, which was confusing:
Examples of broken messages:
http://identi.ca/notice/57172587 vs http://twitter.com/marjoleink/status/28398050691
http://identi.ca/notice/57172878 vs http://twitter.com/marjoleink/status/28398492563
2010-10-22 12:10:11 -07:00
Brion Vibber
6841a8d093
RegisterThrottlePlugin tweak for silencing checks: make sure we don't crash during registration if another profile registered from this address has been since deleted.
...
Followup to commit 1caa08429f
2010-10-22 11:07:19 -07:00
Evan Prodromou
1caa08429f
Collective guilt for registrants from the same IP address
...
If someone tries to register from an IP address that a silenced user
has registered from, prevent it.
When silencing someone, silence everyone else who registered from the
same IP address.
2010-10-22 13:29:51 -04:00
Evan Prodromou
07bc50eaed
Merge branch 'bettercachelog' into 0.9.x
2010-10-22 09:25:13 -04:00
Evan Prodromou
e1e79e6236
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-22 09:24:49 -04:00
Evan Prodromou
2484d8edc2
more detailed information in cachelogplugin
2010-10-22 09:24:19 -04:00
Zach Copley
131c339c5a
Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct
...
returnto URL
2010-10-22 02:08:38 +00:00
Zach Copley
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
Zach Copley
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -07:00
Siebrand Mazeland
31f52ec37c
Update translator documentation and remove superfluous whitespace.
2010-10-21 02:02:37 +02:00
Brion Vibber
c24f4ddfdb
Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.
2010-10-20 16:14:32 -07:00
Brion Vibber
bcc06d05e8
Initial OpenID+OAuth thingy.
2010-10-20 15:59:27 -07:00
Siebrand Mazeland
fb32108707
Localisation updates from http://translatewiki.net .
2010-10-20 19:51:49 +02:00
Siebrand Mazeland
bee51e1cec
Localisation updates from http://translatewiki.net .
2010-10-20 02:43:14 +02:00
Brion Vibber
3b6f738ab7
Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema
2010-10-19 17:25:56 -07:00
Siebrand Mazeland
5ee4e52488
Localisation updates from http://translatewiki.net .
2010-10-20 01:24:09 +02:00
Brion Vibber
a67160e01e
Merge branch '1.0.x' into schema-x
...
Conflicts:
lib/common.php
2010-10-19 15:19:46 -07:00
Brion Vibber
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
Brion Vibber
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
Evan Prodromou
0f68fd203d
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-18 16:43:08 -04:00
Evan Prodromou
749fe8ca2e
OpenX plugin admin panel
2010-10-18 16:42:43 -04:00
Siebrand Mazeland
3c10602561
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-18 22:11:33 +02:00
Siebrand Mazeland
e6df1b19df
Localisation updates from http://translatewiki.net
2010-10-18 22:03:29 +02:00
Brion Vibber
140308bb03
Merge branch '0.9.x' into 1.0.x
2010-10-18 12:49:20 -07:00
Brion Vibber
aa80d8fee3
Clean up edge cases in OStatus FeedDiscoveryTest
2010-10-18 12:45:55 -07:00
Siebrand Mazeland
a7d818bcdb
Remove superfluous whitespace
2010-10-18 21:44:51 +02:00
Brion Vibber
d67a9b437c
Avoid notice in DirectionDetectorPlugin when dealing with empty string.
2010-10-18 12:23:01 -07:00
Brion Vibber
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
Brion Vibber
e04a6ef93e
Make HTTP timeout configurable on OStatus's remote-tests.php (needs to be pumped up a fair amount when doing Salmon pings with queues off on the test boxes, especially without the fast math library)
2010-10-18 11:27:22 -07:00
Siebrand Mazeland
77191f455a
Change incorrect use of e.g. to i.e.
...
Spotted by The Evil IP address.
2010-10-16 14:20:30 +02:00
Siebrand Mazeland
1d6d0cbcbd
Use common case instead of WARNING in all caps.
...
Spotted by The Evil IP address.
2010-10-16 14:15:02 +02:00
Brion Vibber
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
Craig Andrews
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
Evan Prodromou
ecb582e419
accept profile URL as a LRDD identifier
2010-10-14 11:07:37 -04:00
Evan Prodromou
23ac961624
Show Webfinger, URI and profile page as subject and aliases
2010-10-14 11:06:57 -04:00
Brion Vibber
4101de7dd7
Merge branch '1.0.x' into schema-x
2010-10-13 15:46:45 -07:00
Brion Vibber
22047f6412
Merge branch '0.9.x' into twitstream
2010-10-13 15:37:54 -07:00
Evan Prodromou
ddb60a8191
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-13 15:18:32 -04:00
Brion Vibber
6c77d86b7f
Merge branch 'master' into 0.9.x
2010-10-13 12:04:20 -07: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
Brion Vibber
90e54f6cf0
ModHelper -> silence only, don't let them sandbox (it's too confusing atm without a good audit trail)
2010-10-13 10:00:16 -07:00
Brion Vibber
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
Brion Vibber
bc0d7f14db
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-12 14:54:04 -07:00
Brion Vibber
93172cc828
Initial version of ModHelper plugin, with basic functionality but the UI stripped out until it's easier to get it done.
...
* users need to have 'modhelper' role manually added via userrole.php for now
* modhelper users can sandbox/unsandbox and silence/unsilence any user
** note that no new logging has been added for these moderator actions
* no user deletion for modhelpers
* probably no UserFlags special views for modhelpers
2010-10-12 12:33:57 -07:00
Evan Prodromou
f11c1c77ca
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-12 11:16:14 -04:00
Siebrand Mazeland
5215423ea9
Localisation updates from http://translatewiki.net .
2010-10-09 16:15:48 +02:00
Brion Vibber
aa02f6020e
Merge branch '0.9.x' into 1.0.x
2010-10-08 11:47:50 -07:00
Brion Vibber
67dc78b621
Merge branch 'fatals' into 0.9.x
2010-10-08 11:28:51 -07:00
Brion Vibber
34e9549756
execution guard fixes in Facebook plugin files
2010-10-08 11:26:57 -07:00
Brion Vibber
a30ea4568f
Normalize execution guards in OpenID plugin files; avoids annoying fatal errors when .php files get spidered.
2010-10-08 11:23:53 -07:00
Brion Vibber
5fe59322bc
Check for Twitter foreign link actually existing before trying to delete it; friendlier error message in TwittersettingsAction
2010-10-08 11:12:36 -07:00
Brion Vibber
7adc6027ff
Fix fatal error in FacebookremoveAction if we end up getting called double and the foreign_link entry has already been removed.
2010-10-08 11:06:30 -07:00
Brion Vibber
e23ad7392f
Normalize execution guards in imap plugin files.
2010-10-08 11:01:13 -07:00
Brion Vibber
69b13cb279
Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P
2010-10-08 10:42:59 -07:00
Brion Vibber
6c959c83ce
Merge branch '0.9.x' into 1.0.x
2010-10-07 13:32:26 -07:00
Brion Vibber
fd0768be29
Merge branch 'master' into 0.9.x
2010-10-07 13:30:34 -07:00
Brion Vibber
603e1dc563
Add a README for BitlyUrlPlugin
2010-10-07 13:23:18 -07:00
Brion Vibber
bd5925a6db
Tweak bit.ly admin panel messages to distinguish the admin settings from config.php globals
2010-10-07 13:17:20 -07:00
Brion Vibber
fbfd96dfb9
Drop out the 'allow user override' checkbox on bit.ly admin panel until we find a good way to shove the user settings in. :)
2010-10-07 13:08:23 -07:00
Brion Vibber
cad4805516
Clean up bit.ly admin panel behavior, and hide it from the shorteners list if it's not fully configured.
2010-10-07 13:05:51 -07:00
Brion Vibber
80f0b9421f
bit.ly admin panel to set the API keys to use.
2010-10-07 12:50:12 -07:00
Brion Vibber
51254ed85e
Pull up the guts of my fixed bit.ly plugin from an old work branch (that had made other changes we weren't happy with in the plugin management). Now works if given a global API key.
2010-10-07 12:03:33 -07:00
Brion Vibber
458f93bddd
OStatus fixup-shadow.php: add check for user_group entries with 'uri' entry shadowing an actual local_group -- this can cause trouble now that we sometimes actually use the uri field for lookups, and leaving the entries around would break updating the table to fill out formerly missing uris, since the unique index entry would already be taken by the bad entry.
2010-10-07 11:26:07 -07:00
Brion Vibber
a9654beb5d
Fix regression in OStatus remote group delivery: local group check was bogus in updated Ostatus_profile::localGroupFromUrl()
2010-10-07 10:56:10 -07:00
Evan Prodromou
1e3d5f8025
hide notice form if not able to post
2010-10-07 10:32:29 -04:00
Evan Prodromou
8d2ccee3f6
PHPCS-clean RequireValidateEmail
2010-10-07 09:13:38 -04:00
Brion Vibber
99194e03fa
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-10-06 17:16:13 -07:00
Brion Vibber
3cd03ee6ec
Merge branch '0.9.x' into twitstream
2010-10-06 13:08:33 -07:00
Brion Vibber
9c3fd10257
Prelim --all mode on streamtest.php to use site streams; doesn't use the destination user for import yet, and not actually tested yet until I'm whitelisted for the beta. :)
2010-10-05 17:08:04 -07:00
Brion Vibber
408483f771
Fix up Twitter JSON formatting to be consistent between the polling and streaming API interfaces; basic stream tester can now import your notices (ooooh)
2010-10-05 14:26:11 -07:00
Brion Vibber
0eaa26476c
Split the guts of Twitter status -> notice import from twitterstatusfetcher daemon into TwitterImport class which can be called from other places, letting us reuse code for the streaming API.
2010-10-05 13:57:32 -07:00
Brion Vibber
dc6c0f325c
Cleanup on input path
2010-10-05 13:41:15 -07:00
Brion Vibber
eb04df583a
Buncha cleanup
2010-10-05 13:25:28 -07:00
Brion Vibber
76353ede54
Clean up event handling a bit
2010-10-05 12:42:55 -07:00
Brion Vibber
5058e8fd14
Twitter streaming API reader: Cleanup input handling & split from HTTP headers to body
2010-10-05 12:17:16 -07:00
Brion Vibber
8ff45823ba
Merge branch '0.9.x' into 1.0.x
2010-10-05 11:40:49 -07:00
Brion Vibber
3b304fc0ef
Initial stub code for pulling data from Twitter's User Streams and Site Streams interfaces. This should allow us to make a much more efficient background importer which can use a relatively small number of connections getting push data for either a single user or for many users with credentials on the site.
2010-10-04 18:28:54 -07:00
Siebrand Mazeland
007866d340
Localisation updates from http://translatewiki.net
2010-10-05 00:59:47 +02:00
Brion Vibber
f58008ebaf
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-04 15:22:02 -07:00
Brion Vibber
d6b3d7fb1a
Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)
2010-10-04 14:24:04 -07:00
Brion Vibber
2295bbec9e
Extra debug helper line in push callback
2010-10-04 14:22:32 -07:00
Brion Vibber
5c4723919f
Merge branch '0.9.x' into 1.0.x
2010-10-04 13:06:40 -07:00
Brion Vibber
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
Brion Vibber
5b49366f49
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/AnonymousFave/AnonymousFavePlugin.php
2010-10-04 11:42:16 -07:00
Brion Vibber
7d0d89ddea
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-04 11:37:41 -07:00
Brion Vibber
5dee862b2c
Fix broken code in OStatus feed maint/test scripts (using field name from older dev code, would load up wrong record)
2010-10-04 10:27:03 -07:00
Siebrand Mazeland
1652ded48c
i18n/L10n review, extension credits added.
2010-10-04 00:02:24 +02:00
Siebrand Mazeland
362f395e03
Add documentation URL.
2010-10-03 23:56:13 +02:00
Siebrand Mazeland
67f97194e4
i18n/L10n review, plugin credits added.
2010-10-03 23:54:57 +02:00
Siebrand Mazeland
458512aafd
Localisation updates from http://translatewiki.net
2010-10-03 22:46:38 +02:00
Siebrand Mazeland
0f4f6fdb01
* i18n/L10n review.
...
* add onPluginVersion()
2010-10-02 22:25:32 +02:00
Brion Vibber
5c2b073a50
NoticeTitle plugin: link the post title to detail view of the post
2010-10-01 17:54:47 -07:00
Siebrand Mazeland
08054e85fe
Localisation updates from http://translatewiki.net .
2010-10-01 22:34:59 +02:00
Siebrand Mazeland
3dd921332d
Add plugin description thanks to Brion.
2010-10-01 22:21:12 +02:00
Siebrand Mazeland
04b70219db
* i18n review/translator hints added.
...
* whitespace updates.
* added @todo because of missing plugin description. I wasn't able to find out what this does exactly quick enough.
2010-10-01 22:15:26 +02:00
Siebrand Mazeland
2188b6d501
* i18n review/translator documentation added.
...
* onPluginVersion() added.
2010-10-01 22:11:38 +02:00
Siebrand Mazeland
f415e2353d
* i18n review
...
* onPluginVersion
2010-10-01 22:01:18 +02:00
Siebrand Mazeland
267d7b6bff
* i18n review
...
* onPluginVersion() added
2010-10-01 21:53:20 +02:00
Siebrand Mazeland
06ca06fbd1
* L10/i18n review.
...
* Translator hints added
* whitespace updates
2010-10-01 21:45:19 +02:00
Zach Copley
33b16be0a4
Better markup for anon fave tally
2010-10-01 11:31:44 -07:00
Zach Copley
8439774cf7
Allow turning off Anonymous Favoring for specific users' notices
2010-10-01 11:12:53 -07:00
Brion Vibber
d8df140ebb
ShareNotice plugin -- basic buttons per-notice to share the text & a link to the notice on other sites.
...
Default settings list Twitter, Facebook, and Identi.ca as targets.
Using icons built-in, and no magic offsite JS or anything so it won't slow down or break if third-party site goes down.
Default styles are a little limited, but can be customized in theme should one be so inclined.
2010-09-30 18:05:45 -07:00
Brion Vibber
6e58a926e3
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 18:05:44 -07:00
Brion Vibber
8c85f83300
GroupFavorited plugin: adds 'Popular' tab to group navigation showing a popular pages subset for just posts in the group. Not necessarily terribly efficient, should be tested and benchmarked on non-trivial sites
2010-09-30 18:05:44 -07:00
Brion Vibber
ff906331d6
fix comment
2010-09-30 18:05:44 -07:00
Brion Vibber
cb449682e3
Initial SlicedFavorites plugin to allow for customized variants of 'Popular' tab (favorited action) that include or exclude a given set of users. No added UI tabs in this version, beware!
2010-09-30 18:05:44 -07:00
Brion Vibber
46167d6b35
ShareNotice plugin -- basic buttons per-notice to share the text & a link to the notice on other sites.
...
Default settings list Twitter, Facebook, and Identi.ca as targets.
Using icons built-in, and no magic offsite JS or anything so it won't slow down or break if third-party site goes down.
Default styles are a little limited, but can be customized in theme should one be so inclined.
2010-09-30 18:03:25 -07:00
Zach Copley
d8d557cadf
Merge branch 'restricted-disqus' into 0.9.x
2010-09-30 17:00:13 -07:00
Zach Copley
84fba0271d
Forgot to update a call in DisqusPlugin
2010-09-30 16:59:05 -07:00
Zach Copley
1770bcaa60
Merge branch 'restricted-disqus' into 0.9.x
2010-09-30 16:53:44 -07:00
Zach Copley
cdd43d8da9
Less intrusive insertion of Disqus notice count into notice lists
2010-09-30 16:51:19 -07:00
Zach Copley
0d5dadc81d
Change Disqus plugin to allow restricting to users with "richedit" role
2010-09-30 16:39:56 -07:00
Brion Vibber
55a080ea4e
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 16:25:15 -07:00
Brion Vibber
2ecbae308d
GroupFavorited plugin: adds 'Popular' tab to group navigation showing a popular pages subset for just posts in the group. Not necessarily terribly efficient, should be tested and benchmarked on non-trivial sites
2010-09-30 15:56:38 -07:00
Brion Vibber
5c11ad15e1
fix comment
2010-09-30 14:52:00 -07:00
Brion Vibber
3ed726bbcc
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-30 14:47:53 -07:00
Brion Vibber
143897bf45
Initial SlicedFavorites plugin to allow for customized variants of 'Popular' tab (favorited action) that include or exclude a given set of users. No added UI tabs in this version, beware!
2010-09-30 14:46:32 -07:00
Zach Copley
23c45d6c49
Merge branch 'anon-fave-plugin' into 0.9.x
2010-09-30 13:59:02 -07:00
Zach Copley
8a28d9cc4d
Merge branch 'anon-fave-plugin'
2010-09-30 13:57:39 -07:00
Brion Vibber
8ad933c86f
Add 'restricted' option to NoticeTitle; if set, only users with 'richedit' role get the fancy extra title field.
2010-09-30 13:33:25 -07:00
Brion Vibber
d7f03dab9e
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:33:20 -07:00
Brion Vibber
bc2b72a872
Add 'restricted' option to NoticeTitle; if set, only users with 'richedit' role get the fancy extra title field.
2010-09-30 13:30:39 -07:00
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
Zach Copley
8e7532245a
Remove debugging statements
2010-09-29 16:35:17 -07:00
Zach Copley
54f19da3ab
Make createAnonProfile() static
2010-09-29 16:35:16 -07:00
Zach Copley
f79f44801c
- Lookup anon profiles by ID (safer because they are guranteed to be unique) and probably faster
...
- Obfuscate the anonymous user session token to make it hard to figure out the profile ID
2010-09-29 16:35:15 -07:00
Zach Copley
0fe0f42173
Ajax update notice tally
2010-09-29 16:35:15 -07:00
Zach Copley
9109fe3c63
Set initialize_fave_tallys.php executable
2010-09-29 16:35:14 -07:00
Zach Copley
4d6973cd70
Intialize new fave tallys with total existing fave count per notice
2010-09-29 16:35:13 -07:00
Zach Copley
5b49fc25bf
- Increment/decrement notice fave tally
...
- Display tally in notice output
2010-09-29 16:35:13 -07:00
Zach Copley
73297d3749
New DB_DataObject for storing favorites tally
2010-09-29 16:35:13 -07:00
Zach Copley
c10f17dc6b
Initial plugin for allowing anonymous favoriting
2010-09-29 16:35:13 -07: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
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
f0b39defb2
Merge branch 'yammer' of gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-09-27 17:26:14 -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
Siebrand Mazeland
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
Siebrand Mazeland
430d1da976
Update POT files.
2010-09-28 00:03:06 +02:00
Brion Vibber
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
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
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
Brion Vibber
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
Brion Vibber
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
Evan Prodromou
0dc5080a5d
Merge remote branch 'gitorious/master'
2010-09-25 06:30:36 -04:00
Zach Copley
dc63626641
Optionally restrict Disqus comments to specific users' notices
2010-09-24 18:29:02 -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
Evan Prodromou
210e486d80
remove unnecesssary fieldset from sitemap admin panel
2010-09-24 16:50:03 -04: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
Zach Copley
62f7d6c74d
Fix strings in Disqus plugin for i18n
2010-09-23 15:46:01 -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
Siebrand Mazeland
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02: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
Evan Prodromou
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
Evan Prodromou
f0105893b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-22 10:35:27 -04: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
Craig Andrews
2db8aa3ec3
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:06:24 -04:00
Craig Andrews
8d019c03ee
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:05:18 -04: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
Brion Vibber
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
Evan Prodromou
78ed0348b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-21 14:07:48 -04:00
Evan Prodromou
f7ec40fa42
make some static functions public for OStatus_profile
2010-09-21 06:13:19 -04:00
Brion Vibber
f9e04993dd
Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.
2010-09-20 16:26:50 -07:00
Brion Vibber
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Siebrand Mazeland
10f6e14134
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-09-20 21:12:56 +02:00
Siebrand Mazeland
bccbe8f519
* i18n/L10n update.
...
* superfluous whitespace removed.
2010-09-20 21:12:43 +02:00
Siebrand Mazeland
a58877a2f8
* i18n/L10n update.
...
* added onPluginVersion().
* superfluous whitespace removed.
2010-09-20 21:12:07 +02:00
Siebrand Mazeland
5cc08ccd07
Superfluous whitespace removed.
2010-09-20 21:11:05 +02:00
Brion Vibber
a3de417ca5
DirectionDetector plugin: tabs to spaces
2010-09-20 12:02:04 -07:00
Brion Vibber
d055b63187
DirectionDetector plugin: cleanup on reference usage & code comments.
...
Changed getClearText() to return its value instead of changing the input to keep things clearer to maintainers.
2010-09-20 12:00:39 -07:00
Siebrand Mazeland
500f8e5a87
* i18n/L10n updates.
...
* remove superfluous whitespace.
2010-09-20 20:54:30 +02:00
Brion Vibber
2475e25e78
Update DirectionDetector plugin to 0.2.0 from everplays
2010-09-20 11:49:39 -07:00
Siebrand Mazeland
e0952bf56b
Superfluous whitespace removed.
2010-09-20 20:40:55 +02:00
Siebrand Mazeland
c0bc3b3042
Superfluous whitespace removed.
2010-09-20 20:39:28 +02:00
Siebrand Mazeland
b4887a0756
Add FIXME for bad message implementation.
2010-09-20 20:00:33 +02:00
Siebrand Mazeland
9679467201
Add onPluginVersion()
2010-09-20 19:59:13 +02:00
Siebrand Mazeland
dfa164069d
Superfluous whitespace removed.
2010-09-20 19:46:01 +02:00
Siebrand Mazeland
f975c17329
Add onPluginVersion()
2010-09-20 19:45:43 +02:00