Commit Graph

819 Commits

Author SHA1 Message Date
Mikael Nordfeldth
5308e04e83 Don't disable queuedaemons before Cron stuff is done 2013-11-18 00:50:12 +01:00
Mikael Nordfeldth
1a0e17fea6 Minor queue fixes, probably not very important. Preparing for cron 2013-11-13 18:15:21 +01:00
Mikael Nordfeldth
f110fc5c9a Using GNUSOCIAL_VERSION instead of STATUSNET_VERSION 2013-11-01 13:51:41 +01:00
Mikael Nordfeldth
9b6633698c Group discovery from text functions polished
Also removed the entirely unused saveGroups function.

Now avoiding multiGet and using listFind in Profile->getGroups()
so we don't have to deal with ArrayWrapper.
2013-10-29 13:40:14 +01:00
Mikael Nordfeldth
fcba540a14 Removed legacy OMB. Use OStatus for remote profiles. 2013-10-28 16:22:09 +01:00
Mikael Nordfeldth
53b8412aae printv doesn't exist. Use echo to always print on errors. 2013-10-20 21:02:47 +02:00
Mikael Nordfeldth
352bef2374 Add support (and upgrade path) for group profiles 2013-10-15 11:12:50 +02:00
Mikael Nordfeldth
5da72e5aa2 Legacy fixup script from bad block/sub interaction 2013-10-15 11:00:11 +02:00
Mikael Nordfeldth
202f6ad7a9 Removing legacy code and fixup_* for Status_network tags 2013-10-15 10:54:03 +02:00
Mikael Nordfeldth
01935c7cd0 Legacy StatusNet <0.8 stuff, not needed anymore 2013-10-14 13:40:38 +02:00
Mikael Nordfeldth
a0e107f17f Implemented WebFinger and replaced our XRD with PEAR XML_XRD
New plugins:
* LRDD
    LRDD implements client-side RFC6415 and RFC7033 resource descriptor
    discovery procedures. I.e. LRDD, host-meta and WebFinger stuff.

    OStatus and OpenID now depend on the LRDD plugin (XML_XRD).

* WebFinger
    This plugin implements the server-side of RFC6415 and RFC7033. Note:
    WebFinger technically doesn't handle XRD, but we serve both that and
    JRD (JSON Resource Descriptor), depending on Accept header and one
    ugly hack to check for old StatusNet installations.

    WebFinger depends on LRDD.

We might make this even prettier by using Net_WebFinger, but it is not
currently RFC7033 compliant (no /.well-known/webfinger resource GETs).

Disabling the WebFinger plugin would effectively render your site non-
federated (which might be desired on a private site).

Disabling the LRDD plugin would make your site unable to do modern web
URI lookups (making life just a little bit harder).
2013-09-30 22:04:52 +02:00
Mikael Nordfeldth
633191d808 Making sure scripts and tests check for GNUSOCIAL defined (instead of STATUSNET)
Orbited plugin may not work at all anymore, I had no means to try it.
But there's a check whether 'LACONICA' is defined there, which is a
very unlikely thing in the future. So far only tests and scripts have
been migrated consistently, though.
2013-09-28 15:20:10 +02:00
Mikael Nordfeldth
4ca1c10fb8 IMPORTANT: 'GNUSOCIAL' defined, or daemons wouldn't work
Apparently I forgot scripts/commandline.inc in the commit for 'GNUSOCIAL'
definition 4c6803a054.

define('GNUSOCIAL', true); indicates that we're running GNUSOCIAL, and that
one should be aware of this if applying patches.
2013-09-23 22:10:26 +02:00
Mikael Nordfeldth
63306081bc Subscription "get by" functions now don't use ArrayWrappers
They were getting in the way of some strict-typing stuff.
2013-09-21 18:38:14 +02:00
Mikael Nordfeldth
93e878d7ca Make better use of Subscription class
removed lib/subs.php as it was essentially only a wrapper for Subscription
2013-09-19 17:29:05 +02:00
Mikael Nordfeldth
f00949946b minor fixes and cleanups in the scripts directory 2013-09-18 00:25:11 +02:00
Mikael Nordfeldth
2a4dc77a63 The overloaded DB_DataObject function staticGet is now called getKV
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV

   sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq)

If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV!

This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class)

Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
2013-08-18 13:13:56 +02:00
Mikael Nordfeldth
0cb5b6fba7 No need for newline when running 'echo' 2013-08-12 15:22:23 +02:00
Mikael Nordfeldth
542f00f735 printf tries to evaluate "%" in paths, echo does not 2013-08-12 13:18:40 +02:00
Mikael Nordfeldth
20bad68845 Added SSL option to web and cli installers 2013-08-12 13:08:14 +02:00
Evan Prodromou
3fc1d245a1 Merge 1.1.x into master 2013-07-16 10:57:06 -07:00
Evan Prodromou
66f4a39105 Squashed commit of the following:
commit bd23a7da105d635414643dfcedd9c8f710d565b8
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 07:49:03 2013 -0400

    Make the after flag work correctly

commit 5c5845a2f866f0bbffedd8e2e5d1f512f87d5329
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 06:14:43 2013 -0400

    Add an 'after' flag for backup script
2013-06-29 07:52:09 -04:00
Evan Prodromou
4092ee1bd1 Squashed commit of the following:
commit bd23a7da105d635414643dfcedd9c8f710d565b8
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 07:49:03 2013 -0400

    Make the after flag work correctly

commit 5c5845a2f866f0bbffedd8e2e5d1f512f87d5329
Author: Evan Prodromou <evan@e14n.com>
Date:   Sat Jun 29 06:14:43 2013 -0400

    Add an 'after' flag for backup script
2013-06-29 07:49:43 -04:00
Evan Prodromou
0a23946e6b Add messages, directed notices to sim 2013-06-17 20:16:49 -07:00
Evan Prodromou
fb3981bb04 Set the site profile on install 2013-06-17 20:16:31 -07:00
Evan Prodromou
faf4e7e535 Make favorites in createsim 2013-06-16 02:18:19 +00:00
Jean Baptiste Favre
f175512748 Remove static definition of imdaemon.php as valid daemon. 2013-06-15 18:59:17 +02:00
Evan Prodromou
1c1bcd7cc6 Add JSON output for backups
Conflicts:
	lib/useractivitystream.php
2013-05-24 13:51:57 -04:00
Evan Prodromou
4f818c5c81 Add JSON output for backups 2013-05-24 13:50:24 -04:00
Evan Prodromou
4b7a91bb81 Squashed commit of the following:
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc adaf175
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 09:41:05 2012 -0400

    Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196

commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:33:06 2012 -0500

    fix for XMPP high CPU usage - issue no 3232

commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date:   Thu Jul 5 12:30:34 2012 -0500

    fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:40 -04:00
Evan Prodromou
4a95a0bb60 scripts to join and leave groups 2012-02-07 16:26:51 +01:00
Evan Prodromou
6793616521 Success exit from settag.php if desired state already exists
If you're adding a tag that already exists, or deleting a tag that
doesn't exist, using settag.php, the exit value is 0 instead of
previous -1. This makes scripting around tags a wee bit easier.
2011-10-24 20:13:10 -04:00
Evan Prodromou
b42cc773ed Script to move a statusnetwork from one db server to another
This script helps move a statusnetwork from one DB server to
another. It's for use with multi-site installations (like status.net).
2011-10-16 04:44:08 -04:00
Evan Prodromou
841c71f37d Add profile lists for all tags on upgrade 2011-09-27 11:16:14 -04:00
Evan Prodromou
b0667ea6d4 correct source for createsim notices 2011-09-18 12:37:14 -04:00
Evan Prodromou
73afcad34c add hooks for upgrades 2011-09-15 17:05:32 -04:00
Evan Prodromou
b2ed258e42 Avoid resetting modified for Faves in upgrade script 2011-09-12 15:24:47 -04:00
Evan Prodromou
14f03a237e initialize fave, sub, and membership URIs 2011-09-12 12:13:04 -04:00
Evan Prodromou
b7a5041e80 better output for updateurls.php (and it runs) 2011-09-07 18:53:06 -04:00
Evan Prodromou
e06202852a Make sure reshare notices get the right object_type and verb 2011-09-07 18:34:31 -04:00
Evan Prodromou
f77c850b80 initialize the local_group table 2011-09-07 18:27:20 -04:00
Evan Prodromou
5d54b6019e Move all URL-update scripts to one script 2011-09-07 18:20:14 -04:00
Evan Prodromou
f9f33e2c72 Remove dangerous old database destroyer script 2011-09-07 16:59:33 -04:00
Evan Prodromou
c5d332f40a move yet-another-rediscover-script to OStatus plugin 2011-09-07 16:56:38 -04:00
Evan Prodromou
f0f9435248 one too many cache-clearing scripts. 2011-09-07 16:54:03 -04:00
Evan Prodromou
c262243113 SearchMonkey was shut down October 2010 2011-09-07 16:50:02 -04:00
Evan Prodromou
9ed1beb3a0 Move inbox initialization to upgrade.php
Move the inbox initialization code to upgrade.php. Might not catch
group messages, but maybe that's not a big deal.
2011-09-07 16:48:10 -04:00
Evan Prodromou
dc4f2c3b10 Move conversation table initialization to upgrade script 2011-09-07 16:23:49 -04:00
Evan Prodromou
9e64ae59ba move fixup group uri code to upgrade.php 2011-09-07 16:14:21 -04:00
Evan Prodromou
c265463112 fixup conversations in upgrade.php 2011-09-07 16:09:05 -04:00
Evan Prodromou
3065911afd move fixup_conversations.php to upgrade.php 2011-09-07 16:08:52 -04:00
Evan Prodromou
196be4e6fb move notices-rendered code into upgrade script 2011-09-07 12:10:26 -04:00
Evan Prodromou
34c7c7112a remove script to initialize old-format inboxes 2011-09-07 12:03:52 -04:00
Evan Prodromou
eaf32b7728 remove obsolete sitemap script 2011-08-23 13:31:47 -04:00
Evan Prodromou
f2387d9ad8 remove old and dangerous rebuild scripts 2011-08-22 18:23:28 -04:00
Zach Copley
fc2e6ea172 Fix syntax err 2011-08-04 12:06:57 -07:00
Zach Copley
b2c8f1292d Adjustment to the simulation script so I can use my own word list for test notices 2011-08-03 09:46:29 +00:00
Evan Prodromou
7e9c17bd15 make the default scope depend on site/private 2011-07-01 21:50:04 -04:00
Evan Prodromou
c7608a9ddd fix missing variable for createsim.php 2011-06-27 17:29:33 -04:00
Siebrand Mazeland
a0c80bb478 Use _() instead of _m() as there is no context or plural. 2011-06-19 11:49:33 +02:00
Zach Copley
321060ca71 Script to update (pull) OStatus profiles info and avatars 2011-06-02 18:18:46 -07:00
Evan Prodromou
7f1a30dc40 allow setting some initial tags on a new network 2011-06-01 10:53:46 -04:00
Evan Prodromou
4fd25301b8 add options to show sites with/without a tag 2011-06-01 10:21:03 -04:00
Evan Prodromou
78a9d4966e set the permissions properly for installer 2011-05-05 14:38:19 -07:00
Evan Prodromou
f8c3458216 Option to pre-load a plugin with checkschema script
One of the problems we've had with running large-scale hosting systems
for StatusNet is enabling new plugins. If the plugin is not enabled,
its database tables are not checked at script time. Conversely, if it
is enabled, it may take several hours to run checkschema for tens of
thousands of sites -- during which time users might see DB errors.

A new argument to checkschema lets it pre-load one or more plugins
before checking the schema. This lets us prepare the plugins' database
tables before they're used in production. In a multihome environment,
this can be combined with tags to gradually roll out a new plugin.

In the config file, a stanza like:

   $site = Status_network::getFromHostname(...);

   if ($site->hasTag('fooenabled')) {
      addPlugin('Foo');
   }

...will only enable the plugin on certain sites. Meanwhile, a bash
script like this should gradually enable the plugin:

   # For all sites...
   for site in `php allsites.php`; do
       # Update the schema for the Foo plugin
       php checkschema.php -s$site.wildcard -xFoo;
       # Enable the Foo plugin
       php settag.php -s$site.wildcard fooenabled;
   done
2011-05-04 21:05:25 -07:00
Evan Prodromou
5b23b82b0d script to show software version 2011-04-26 13:01:00 -04:00
Evan Prodromou
239d92176d More interesting test notices in createsim.php 2011-04-12 14:28:26 -04:00
Evan Prodromou
5b9062a518 pre-fill users and groups in createsim.php 2011-04-11 12:38:12 -04:00
Evan Prodromou
9cfd1a59ee use InboxNoticeStream for createsim 2011-04-07 15:29:56 -04:00
Brion Vibber
065a327a86 Add the root index.php to gettext .pot template file generation; some error messages and such in there weren't making it into the TranslateWiki.net database. 2011-04-03 15:22:11 -07:00
Evan Prodromou
47b3fdf059 add scope limit flags to some notices in createsim.php 2011-03-26 16:06:17 -04:00
Evan Prodromou
841a9130e9 fix off-by-one and more replies 2011-03-26 15:36:47 -04:00
Evan Prodromou
efab3c6558 All groups start with a random admin 2011-03-26 15:16:04 -04:00
Evan Prodromou
6902c0af35 Add group posts to createsim.php 2011-03-26 15:08:27 -04:00
Evan Prodromou
bc2f64d7ab Add reply_to to make conversations in createsim.php 2011-03-26 14:58:11 -04:00
Evan Prodromou
3e293363f6 add groups and joins to createsim.php 2011-03-25 17:39:14 -04:00
Evan Prodromou
83fb5e6023 Mass replacement of #-comments with //-comments
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Brion Vibber
09a4cebd47 fix flushrouter.php -- tried to call Cache::delete statically 2011-03-16 15:01:58 -07: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
Brion Vibber
55b1f3d84c Scalability work on user backup stream generation.
UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.

Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.

There should be a better way to do this, swapping out the stringer output for raw output more consitently.
2011-02-25 12:15:38 -08:00
Brion Vibber
4026e208c2 Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
As with deleteuser.php, can pass -y to bypass the prompt if you're sure.
2011-01-19 15:13:46 -08:00
Evan Prodromou
fb681990d9 Account moving is a background activity 2011-01-17 17:31:56 -05:00
Evan Prodromou
905aded81a move account-moving classes to their own libraries 2011-01-16 17:17:55 -05:00
Evan Prodromou
7f7dc13930 first example of moving a user 2011-01-16 17:15:26 -05:00
Brion Vibber
26baad63f2 Merge branch '0.9.x' into 1.0.x 2010-12-22 15:25:38 -08:00
Evan Prodromou
4b41d05a13 Make restoreuser use new FeedImporter queue handler 2010-12-17 16:27:20 -05:00
Evan Prodromou
2e2519afee Move account restoration code to a shared library
Moved most of the heavy-lifting for account restoration out of
restoreuser.php and into its own class, with the hope that we'll do
the work from the Web eventually.
2010-12-15 17:53:38 -05: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
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
Evan Prodromou
0cc332eab6 a quick script to flush the router from cache if needed 2010-11-30 10:27:32 -05:00
Brion Vibber
2b0d1d9fc4 Merge branch 'master' into 0.9.x 2010-11-22 11:13:22 -08:00
Brion Vibber
9c6e63b0bc Fixes for delete_status_network.sh:
* add some sanity checking: abort on failures instead of plodding through
* add some progress / error output
* fetch the target database server name from the status_network entry and use that to target the DROP DATABASE

Note that database names and other overrides in status_network entry may still not be seen.
2010-11-22 11:10:10 -08:00
Brion Vibber
9a590e0843 Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-11-19 10:43:20 -08:00
Brion Vibber
573f98c5bc scripts/deletegroup.php -- basic CLI script to delete a group by id or local nickname. Like deleteuser.php, this can be used in batch runs by providing the -y override. 2010-11-18 14:40:05 -08:00
Brion Vibber
62dfdb34a6 Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-11-15 13:56:17 -08:00
Brion Vibber
defaa3b332 clear_jabber.php script to clear confirmed jabber/xmpp addresses from one or more accounts 2010-11-15 13:26:42 -08:00
Brion Vibber
b716d01a41 Merge branch '0.9.x' into 1.0.x 2010-11-03 16:09:49 -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
Siebrand Mazeland
5bd6458f00 i18n/L10n, translator documentation updates. 2010-11-02 23:00:50 +01:00
Brion Vibber
345b7d33b8 some sorta vaguely working bits 2010-10-29 15:28:48 -07:00
Brion Vibber
9ced8af8dc fix notices in dumpschema 2010-10-29 15:11:41 -07:00
Brion Vibber
0c64df8cd9 Quickie script to aid in building release tarballs -- encapsulates the archive-i18n gen-changelog gen-retar steps. 2010-10-29 14:34:27 -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
Evan Prodromou
511566a132 userrole.php will take a profile id for remote profiles 2010-10-26 11:19:47 -04:00
Brion Vibber
8b0ba03a2e Starting to encapsulate some of the schema_version checksum / updater logic 2010-10-19 17:07:37 -07:00
Brion Vibber
a053871ddc update -> create on dumpschema options, easier for me to remember 2010-10-18 17:49:08 -07:00
Brion Vibber
eb93bdbb03 some more tweaking to do the mappings during filterDef; not totally sure I like it 2010-10-15 16:32:37 -07:00
Brion Vibber
d84923470f fix bug with --diff on missing table 2010-10-13 17:35:18 -07:00
Brion Vibber
a421dd934a Nicer diff display for schema dump 2010-10-13 16:58:28 -07:00
Brion Vibber
229c772634 Filter table definitions to scrub out unsupported features before trying to alter a table. This lets us skip those where we end up trying to change unsupported features. 2010-10-13 16:04:28 -07:00
Brion Vibber
621233e1ad some of the ensureTable stuff partially working 2010-10-12 17:58:26 -07:00
Brion Vibber
9364e446b1 Start reworking things to build create table stuff (can view via dumpschema.php --build) 2010-10-11 19:10:51 -07:00
Brion Vibber
3c979ec506 Add --all option on dumpschema.php to check all core tables 2010-10-07 17:02:42 -07:00
Brion Vibber
cc69ede1ee stop str_repeat from whinging about being run with repeat value of 0. :P 2010-10-07 17:01:14 -07:00
Brion Vibber
443be8a99c some more cleanup on table defs 2010-10-07 17:00:40 -07:00
Brion Vibber
82e9a2eee8 Add --diff option to dumpschema.php to run a (quickie text) diff betwen the theoretical and detected schemas for the given tables 2010-10-07 16:49:15 -07:00
Brion Vibber
312b87ea79 output tweak hack for primary keys on single line 2010-10-07 16:23:36 -07:00
Brion Vibber
fcef2aaab7 Pretty up the table dumper :D 2010-10-07 15:48:38 -07:00
Brion Vibber
6df4ed697c quickie script to test schema fetch 2010-10-06 18:28:19 -07:00
Brion Vibber
8ff45823ba Merge branch '0.9.x' into 1.0.x 2010-10-05 11:40:49 -07:00
Brion Vibber
c6e8fbebef scripts/fixup_group_uri.php to fill in empty user_group.uri entries; needed before changing domain names on sites that are hosting groups for remote users 2010-10-04 15:13:27 -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
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
Siebrand Mazeland
ec83fef9b7 Take trailing newline out of i18n. 2010-09-28 01:33:09 +02:00
Evan Prodromou
be14f409e4 initial script to restore a backed-up user 2010-09-22 12:08:39 -04: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
78ed0348b0 Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-09-21 14:07:48 -04:00
Evan Prodromou
91a1862510 printfv and printfq functions in commandline.inc 2010-09-21 14:06:39 -04:00
Evan Prodromou
ab24007f4c throw a catchable exception in getUser() 2010-09-21 06:12:43 -04:00
Siebrand Mazeland
06272668ec Update group ID for translations export. 2010-09-18 23:50:36 +02:00
Siebrand Mazeland
234b1e6c23 Remove do_translatewiki_plugin(). No longer needed.
Replaced by MediaWiki Translate extension script http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Translate/scripts/genStatusNetPluginsConfig.php?view=markup
2010-09-18 00:23:38 +02:00
Evan Prodromou
b1802b8720 don't redeclare getUser() for backupuser.php 2010-09-15 23:32:27 -04:00
Evan Prodromou
670ad53215 Merge branch '0.9.x' into activityexport 2010-09-15 23:31:20 -04:00
Evan Prodromou
dffec9f223 move getUser() function to commandline.inc 2010-09-15 16:00:00 -04:00
Evan Prodromou
1ceb93cce4 move useractivitystream class to its own module 2010-09-15 15:18:01 -04:00
Evan Prodromou
518db02525 rename script to backupuser.php 2010-09-15 11:21:37 -04:00
Evan Prodromou
960ddd9704 groups in backup output 2010-09-15 07:12:23 -04:00
Evan Prodromou
eec540723e export user data as an activity stream 2010-09-13 17:24:19 -04:00
Evan Prodromou
6bbc8ca234 Merge branch '0.9.x' into 1.0.x 2010-09-09 15:02:53 -04:00
Evan Prodromou
6832a34216 Merge branch 'master' into testing 2010-09-09 15:02:10 -04:00
James Walker
dfca3ff709 fix typo in the comment (for better copy & pasting) 2010-09-09 13:14:52 -04:00
Evan Prodromou
a319b40c97 common_cache_key() -> Cache::key() 2010-09-06 10:07:43 -04:00
Evan Prodromou
8f81762d68 common_memcache() => Cache::instance() 2010-09-06 09:56:45 -04:00
Evan Prodromou
1dadb8efc0 Merge branch '0.9.x' into 1.0.x 2010-08-13 14:51:51 -07:00
Siebrand Mazeland
f60ee85f68 Update extension configuration file creation (doesn't work yet in translatewiki.net). 2010-08-13 22:21:33 +02:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
James Walker
5daa5bc2af try/catch just in case.. 2010-07-28 12:04:37 -04:00
James Walker
dd7647aa95 script to normalize status_network tags 2010-07-28 11:49:09 -04:00