8e04e88800
Use Profile->getBestName() in PersonalGroupNav instead of manually picking nickname vs fullname. Logic should still work the same when no nickname is provided, but it doesn't make any sense -- probably needs cleanup. :)
2010-11-03 13:11:34 -07:00
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
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
e716c3ebaf
Merge branch '0.9.x' into facebook-upgrade
2010-11-02 23:17:07 +00:00
764a297383
Output filename in log msg if one is supplied
2010-11-02 23:13:20 +00:00
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
a65362f7fa
Add context for different uses of "%1$s (%2$s)"
2010-11-02 23:08:59 +01:00
0229c22d23
Merge branch '1.0.x' into schema-x
2010-11-02 15:02:55 -07:00
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
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
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
692ef9c330
Include fulltext indexes in MySQL table create
2010-11-01 13:27:44 -07:00
2306f7a7f4
Merge branch '0.9.x' into facebook-upgrade
2010-11-01 19:13:31 +00:00
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
9b7ac27c69
* add translator documentation.
...
* i18n FIXME tagging.
2010-11-01 16:49:34 +01:00
b89dfa3a5b
Fix i18n issues that are solved by using plural.
2010-11-01 16:49:33 +01:00
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +02:00
83233a8a43
Fix i18n for B/kB/MB and add translator documentation.
2010-10-31 00:34:28 +02:00
234b03d945
* translator documentation updates.
...
* added FIXMEs in actions/showgroup.php.
* superfluous whitespace removed.
2010-10-30 14:36:54 +02:00
8391058ea4
Tabs to spaces, superfluous whitespace removed.
2010-10-30 13:47:19 +02:00
2c420cc5eb
New Start/EndHtmlElement events. Allows adding namespaces.
2010-10-29 23:38:00 +00:00
f5019ac5aa
tweaks for the installer whee
2010-10-29 16:26:45 -07:00
345b7d33b8
some sorta vaguely working bits
2010-10-29 15:28:48 -07:00
ac2447c395
tweak
2010-10-29 14:58:52 -07:00
1daa1bfa39
fix notice
2010-10-29 14:49:05 -07:00
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
36baff3d41
Merge remote branch 'gitorious/master'
2010-10-29 11:14:00 -04:00
c8dab140f4
add a hack to show ads on single-notice pages
2010-10-29 11:13:33 -04:00
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
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
fb0c3f4f99
Kill a ping queue item if we get an error on loading up the notice's poster's profile, rather than letting the item be retried over and over as if it were a transitory error.
...
This shouldn't generally happen as it's an indicator of database inconsistency, but it's a condition we know happens.
2010-10-28 12:58:30 -07:00
9e15290963
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-27 13:47:54 -04:00
1851933c34
Enable Strict Transport Security plugin by default
2010-10-27 10:12:35 -04:00
22a0cf6251
Set cookies with "secure" flag on SSL sites. Improves security.
2010-10-26 17:55:09 -04:00
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
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
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
78396db28a
Forgot to add the OAuth verifier pin page to sensitive array
2010-10-25 12:36:03 -07:00
0dcc3f8d71
We don't need to have editapplication (only showapplication) in the
...
sensitive array because it doesn't expose the consumer keypair
2010-10-25 12:10:52 -07:00
3954ab39ae
Add OAuth token exchange endpoint to 'sensitive' array; i.e.: use SSL if
...
available
2010-10-25 11:52:17 -07:00
59a7d78acb
Atom Service Document
2010-10-24 23:43:26 -04:00
43a67b150a
show a single notice in atom entry format
2010-10-24 15:58:53 -04:00
69a1ecec9b
check for a post
2010-10-24 15:04:12 -04:00
eb30c6651a
Additional fixes found while looking at ticket #2532 : when given a screen name as API parameter for a profile, do the nickname lookup on local users only. The profile table can't guarantee unique lookups, so using names isn't currently safe there. This won't affect anything using local nicknames correctly, and may avoid some weird bugs if there were conflicts between local and remote nicknames.
2010-10-22 13:53:10 -07:00
2d124e4aab
Fix for ticket #2532 : fixed API block create/destroy when specifying the target user/profile as a separate query parameter, such as api/blocks/create.xml?param=xxx
...
The router settings weren't quite right so we ended up with bogus regex values passed in as the 'id' parameter, which broke the regular fallback ordering of parameter checks.
2010-10-22 13:51:28 -07:00
3969870cf3
Normalize HTML body ids to lowercase when the user is logged out as well.
2010-10-22 18:32:08 +00:00
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
d6f4588b9e
Workaround for http_build_query() oddities in low-level router parent code when PHP config is set with non-default separator.
2010-10-21 19:10:43 -07:00
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
fb86e7c285
Normalize all action HTML body ids to lowercase
2010-10-21 13:03:56 -07:00
648f79be10
Change OAuth authorization page's action name to be inline with
...
other web page action names so the body id outputs correctly. Fix
some other bugs.
2010-10-21 13:00:59 -07:00
500157998a
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 01:18:53 +00:00
f283a283b7
Fix syntax error
2010-10-21 01:17:59 +00:00
fb12094f61
i18n/L10n updates, translator docs updated, superfluous whitespace removed.
2010-10-21 03:10:46 +02:00
bfdb8385ec
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
2010-10-20 17:28:28 -07:00
e56385a7bb
Use a new table (oauth_token_association) to associate authorized
...
request tokins with OAuth client applications and profiles.
2010-10-20 17:21:04 -07:00
28ec9d6463
* translator documentation added.
...
* moved some translator comments that were not directly above the line with the message to the correct location.
* i18n for UI text.
* superfluous whitespace removed.
2010-10-21 01:12:56 +02:00
8004e2809d
Fix for ticket #2845 : singleuser nickname configuration was being overridden by site owner in router setup.
...
I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.
Setting $config['singleuser']['nickname'] should now work again as expected.
2010-10-20 14:34:25 -07:00
e980da3d20
Add FIXME
2010-10-20 20:01:12 +02:00
dc62cf1c0b
* i18n/L10n fixes.
...
* translator documentation updated/added.
* superfluous whitespace removed.
2010-10-20 19:34:27 +02:00
17f5cc4f29
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-20 18:26:51 +02:00
1459110124
Fix nasty bug in parameter for e-mail notification for favourite.
2010-10-20 11:16:21 +02:00
5ca29ab0de
Merge branch 'anon-consumer' into 0.9.x
2010-10-19 21:01:53 -07:00
e8b6d7c946
Add support for an anonymous OAuth consumer. Note: this requires a
...
small DB tweak. Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788
2010-10-19 20:54:53 -07:00
3b6f738ab7
Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema
2010-10-19 17:25:56 -07:00
8b0ba03a2e
Starting to encapsulate some of the schema_version checksum / updater logic
2010-10-19 17:07:37 -07:00
25b9552ec3
More complete sentence and translator documentation added.
2010-10-20 00:53:42 +02:00
4b4894b121
Many i18n/L10n updates and lots of descriptions for translators added.
2010-10-20 00:35:39 +02:00
a67160e01e
Merge branch '1.0.x' into schema-x
...
Conflicts:
lib/common.php
2010-10-19 15:19:46 -07:00
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
aeb1c23a2f
fix index drop on pg
2010-10-19 12:23:49 -07:00
e07254d15b
$config['db']['mysql_foreign_keys'] option to experimentally enable foreign keys on MySQL. (Would only work on InnoDB tables, may explode, etc)
2010-10-19 12:11:49 -07:00
7751d455de
Initial foreign key setup support
2010-10-19 12:08:59 -07:00
5ac694c74f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 12:08:48 -07:00
5866493cae
OAuth - better log messages
2010-10-19 12:07:59 -07:00
53cf39c97a
strip column prefix lengths from key defs on pg
2010-10-18 18:26:11 -07:00
d3f8a880a9
Fix misnamed unique constraint
2010-10-18 18:16:07 -07:00
b865ded7ff
Quoting fixes for postgres
2010-10-18 18:15:58 -07:00
ebe9972df6
tweak unique constraint setup
2010-10-18 18:07:25 -07:00
4aa6c4e49f
MySQL schema: fix dropping unique indexes, add support for changing table properties back from old code.
2010-10-18 17:44:41 -07:00
a923ef9719
Drop reverseTypeMap from schemas; we're now doing the forward-mapping on the canonical def before comparing
2010-10-18 17:21:12 -07:00
e44f1fe989
PG tweak
2010-10-18 17:15:51 -07:00
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
e8da3618c2
Bump version/string: 0.9.6 "Man on the Moon"
2010-10-18 14:49:02 -07:00
3a36714847
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 15:42:21 -04:00
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
edf8990aa9
fix notice on non-https views
2010-10-18 11:12:26 -07:00
47ac8458ca
default for nofollow external is sometimes
2010-10-18 11:41:18 -04:00
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
e4422f9e48
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 10:15:27 -04:00
eb93bdbb03
some more tweaking to do the mappings during filterDef; not totally sure I like it
2010-10-15 16:32:37 -07:00
e0cb6d6f7f
fix notice on non-https views
2010-10-15 15:03:54 -07:00
fa50ab2a94
fix notice on non-https views
2010-10-15 15:01:55 -07:00
1a2170914e
woops wrong path
2010-10-15 15:01:43 -07:00
3dd4157f26
tweak copyright headers on installer
2010-10-15 14:49:05 -07:00
90c35dc541
Cleanup on making the schema work for installer (not quite there yet)
2010-10-15 13:47:38 -07:00
77300f94a3
fix typo on params on Schema->createTable()
2010-10-15 13:34:54 -07:00
dcf0acd503
Make StatusNet::initDefaults() public so we can call it from the installer.
2010-10-15 13:34:35 -07:00
201efe6b62
Split the core-setup bits of common.php out to framework.php (better ideas?) so we can easily set up our framework to run Schema setup before we have a core database to load a live config from.
2010-10-15 13:33:26 -07:00
a335dcbcbb
Update installer to use new Schema code to create the core tables instead of db/statusnet.sql or db/statusnet_pg.sql
2010-10-15 12:20:10 -07:00
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
9abe6fa666
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-15 13:46:44 -04:00
a2090ecc97
Merge branch '2828' into 0.9.x
2010-10-14 16:52:01 -07:00
3f74f44603
Fix for ticket #2828 : apostrophe in site name set in installer created a broken config.php.
...
Now running values through var_export() before putting them into the config.php, ensuring strings will be properly quoted.
2010-10-14 16:25:43 -07:00
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
1a4dc03bfe
document and default for site|ssllogo
2010-10-14 14:56:38 -04:00
8f3b18f27f
fix copy-and-paste error in javascript url creation
2010-10-14 14:53:20 -04:00
72454db118
make the logo be compatible with HTTPS pages, if possible
2010-10-14 14:22:49 -04:00
b31c49c5d4
Make HTTPS urls in File::url() if necessary
2010-10-14 14:22:17 -04:00
97a7fb246c
correctly use sslserver if it is set
2010-10-14 01:35:11 -04:00
7436e5d13e
use HTTPS for scripts and stylesheets if the current page is HTTPS
2010-10-14 01:09:02 -04:00
ac63f8baae
show HTTPS urls for JavaScript if HTTPS used for page
2010-10-14 01:00:13 -04:00
74c5aa8f9a
consolidate some theme path code between ssl and non-ssl
2010-10-14 00:59:53 -04:00
ca0323d01b
use HTTPS for favicon.ico if page is HTTPS
2010-10-14 00:50:26 -04:00
d91f894ccb
try to show HTTPS-encrypted theme files for HTTPS-encrypted pages
2010-10-14 00:46:32 -04:00
40c64388e6
try and show an SSL image for the creative commons image
2010-10-14 00:31:13 -04:00
cef10c7167
add static method StatusNet::isHTTPS()
2010-10-14 00:16:23 -04:00
4f4b0a2612
logic fix in diffing :D
2010-10-13 16:56:49 -07:00
0de3661d57
Fix for PG filtering
2010-10-13 16:21:24 -07:00
c0bb3062f6
suppress notices for non-present sections
2010-10-13 16:11:02 -07:00
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
4101de7dd7
Merge branch '1.0.x' into schema-x
2010-10-13 15:46:45 -07:00
07963a2a10
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-13 15:18:33 -04:00
ddb60a8191
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-13 15:18:32 -04:00
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
f79dbaf9a7
Add a doc page that links to the StatusNet wiki API page
...
Add a redirect action that merely redirects to another action
Redirect /api to /doc/api so users don't get the "lame" "No such user" error message
2010-10-12 23:38:16 -04:00
621233e1ad
some of the ensureTable stuff partially working
2010-10-12 17:58:26 -07:00
04f3f57e2e
Merge branch 'oauth-1.0a' into 0.9.x
2010-10-12 17:52:04 -07:00
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
5270e93131
Spelling - OAuth not Oath
2010-10-12 16:20:09 -07:00
f4f16af8ac
Add a basic group deletion for moderator users.
2010-10-12 15:49:20 -07:00
9d9e80ea21
Followup to IIS installer tweaks in [ 9bb48c36]:
...
* skip 0-byte config files when initializing, go ahead and redirect to installer if no non-0-byte files
* tweak warning on installer.php to let you know if you have a 0-byte config.php that's not writable, as opposed to generally already having a config.php with data in it
2010-10-12 13:00:03 -07:00
4580d6065c
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-12 11:16:32 -04:00
f11c1c77ca
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-12 11:16:14 -04:00
72cba88650
fix for column prefixes in table/index building
2010-10-11 19:28:02 -07:00
2c9f877ab5
fix for index gen
2010-10-11 19:18:47 -07:00
9cb42c8e45
tweak for strings
2010-10-11 19:17:21 -07:00
7723d15cd0
tweak for mysql
2010-10-11 19:14:33 -07:00
9364e446b1
Start reworking things to build create table stuff (can view via dumpschema.php --build)
2010-10-11 19:10:51 -07:00
d0dbedf3bb
PgsqlSchema can now pull primary, unique, mutli-value, *and* foreign keys :D
2010-10-11 15:55:45 -07:00
5434f43176
Now pulling non-primary/unique index data for PG as well... need to sort out conflicts with the other data and make foreign references work right :D
2010-10-11 14:15:02 -07:00
f85511c28f
quick syntax fix
2010-10-11 13:05:44 -07:00
7f674cc957
Merge branch 'schema-x' of /Users/brion/pages/mublog into schema-x
2010-10-08 16:38:18 -07:00
2d0807bc1c
Starting on adapting postgresql schema class to look stuff up in the new drupalish format...
...
Fetching basic column data and unique indexes. Still needs detail work, multi-value indexes, foreign keys, and distinguishing the primary key.
Since we don't get comments and such, for cleaner comparisons we should probably do a filtering on supported features.
2010-10-08 16:36:32 -07:00
2e475ceab0
Some more poking at schema stuff, on the road towards a more portable table-modification with the new schema bits
2010-10-07 18:33:02 -07:00
459727bd61
Update ApiOauthAccessTokenAction to OAuth 1.0a
2010-10-07 18:32:27 -07:00
efa8ff82f4
fix up some more 'not null's and such
2010-10-07 17:31:56 -07:00
85156fcbed
Fix detection of auto_increment fields in MySQL (sets them as 'serial' type)
2010-10-07 17:22:36 -07:00
14e4f50f29
Some cleanup on detecting types
2010-10-07 16:49:49 -07:00
63c4cb3f36
Finish patching up the index fetching in new schema stuff for mysql
2010-10-07 15:14:10 -07:00
6c959c83ce
Merge branch '0.9.x' into 1.0.x
2010-10-07 13:32:26 -07:00
5e0f3e7bd4
Workaround for regression in input validation due to more PCRE oddities. Recommend redoing common_validate_utf8() using something more reliable, perhaps. :P
2010-10-07 12:32:10 -07:00
8658e4f8c4
Use 7 digits for oob OAuth pin instead of 6
2010-10-07 11:01:17 -07:00
fa45805d6d
Events for showing the notice form
2010-10-07 10:22:57 -04:00
69e621a3e8
- Update ApiOauthAuthorizeAction to 1.0a
...
- Fix enumerable bugs
- New page for displaying 1.0a verifier (still needs work)
2010-10-06 19:20:47 -07:00
f71912440a
- New base InfoAction for dialog box like msgs
...
- Fix titles on error pages
2010-10-06 19:06:57 -07:00
a680e1798c
Work in progress on fetching table defs from existing tables in new format -- unfinished
2010-10-06 18:28:32 -07:00
99194e03fa
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-10-06 17:16:13 -07:00
f97b863fd7
Update ApiOauthRequestTokenAction to support OAuth 1.0a
2010-10-06 13:40:03 -07:00
f4f56eea3a
Override new_request_token() to store OAuth 1.0a verified callback URL
2010-10-06 13:40:03 -07:00
63663dbd0e
Stab that 'p' parameter!
2010-10-06 13:40:02 -07:00
4247be5116
Add plain text error format to clientError()
2010-10-06 13:40:01 -07:00
83566f014c
Fix bad reference
2010-10-06 13:40:01 -07:00
06d918d575
Strip out the special 'p' paramter added by index.php from
...
$_SERVER['QUERY_STRING'] before doing OAuth requests. Required by the
latest version of the OAuth lib.
2010-10-06 13:39:58 -07:00
71176b9a98
Merge branch '0.9.x' into 1.0.x
2010-10-06 13:07:29 -07:00
ebfa8bce27
Basic validation of UTF-8 input via GET/POST vars: invalid UTF-8 sequences will cause the string to drop. Not necessarily super-thorough; should be improved in future to drop individual bad sequences, do normalization of combining forms, etc. General input validation (for ints, types of strings, etc) still would be good to have!
2010-10-06 13:00:30 -07:00
8ff45823ba
Merge branch '0.9.x' into 1.0.x
2010-10-05 11:40:49 -07:00
8aa9c271df
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-05 14:09:17 -04:00
d946c82740
Urgh... fix for fix for horrific $ escaping problems (some awful mix of single and double-quoted strings in the terror that is mail.php)
2010-10-04 15:29:30 -07:00
d6b3d7fb1a
Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)
2010-10-04 14:24:04 -07:00
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
ad7623a87f
Add a $config['plugins']['locale_path'] which can be set to override the individual plugins' locale subdirectories.
...
This will apply to *ALL* plugins in *ALL* languages, so should probably only be used when doing site customization...
You'd probably do:
$config['site']['locale_path'] = '/srv/awesome/data/locale';
$config['plugins']['locale_path'] = '/srv/awesome/data/locale';
with a structure like:
srv/
awesome/
data/
locale/
en/
LC_MESSAGES/
statusnet.po
OpenID.po
AnonymousFave.po
etc, all alongside each other. You could separate plugins from the core if you like.
Where locale files have not already been generated, you can build one for a plugin like so:
php scripts/update_po_templates.php --plugin=MyPlugin
and pull out the template file:
plugins/MyPlugin/locale/MyPlugin.pot
Edit that (make sure you at least set the CHARSET, probably to UTF-8) and save your customized .po
files into the structure as above, and use msgfmt to generate .mo files for final output.
2010-09-30 19:23:42 -07:00
54c88cba57
Add a $config['plugins']['locale_path'] which can be set to override the individual plugins' locale subdirectories.
...
This will apply to *ALL* plugins in *ALL* languages, so should probably only be used when doing site customization...
You'd probably do:
$config['site']['locale_path'] = '/srv/awesome/data/locale';
$config['plugins']['locale_path'] = '/srv/awesome/data/locale';
with a structure like:
srv/
awesome/
data/
locale/
en/
LC_MESSAGES/
statusnet.po
OpenID.po
AnonymousFave.po
etc, all alongside each other. You could separate plugins from the core if you like.
Where locale files have not already been generated, you can build one for a plugin like so:
php scripts/update_po_templates.php --plugin=MyPlugin
and pull out the template file:
plugins/MyPlugin/locale/MyPlugin.pot
Edit that (make sure you at least set the CHARSET, probably to UTF-8) and save your customized .po
files into the structure as above, and use msgfmt to generate .mo files for final output.
2010-09-30 19:18:46 -07:00
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
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
23c45d6c49
Merge branch 'anon-fave-plugin' into 0.9.x
2010-09-30 13:59:02 -07:00
8a28d9cc4d
Merge branch 'anon-fave-plugin'
2010-09-30 13:57:39 -07:00
20f2167425
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
2010-09-30 11:31:29 -07:00
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
0ac333ec80
Add Start/EndFavorNoticeForm and Start/EndDisFavorNoticeForm hooks
2010-09-29 16:35:14 -07:00
331502a979
Add Start/EndShowNoticeInfo events
2010-09-29 16:35:13 -07:00
21759c3132
New eventsi: Start/EndShowNoticeOptions and Start/EndShowFaveForm
2010-09-29 16:35:12 -07:00
d2ef0cf233
add hooks to the feedlist widget to give fine-grained control over feed links
2010-09-29 19:23:46 +02:00
b9177f5e2e
* i18n/L10n and translator documentation updates.
...
* whitespace and indentation updates
2010-09-29 00:39:45 +02:00
2d08750c47
Localisation updates from http://translatewiki.net
...
* add support for Hungarian (hu)
2010-09-28 01:02:08 +02:00
84331ca7bd
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:33:06 +00:00
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
1bc45e191d
Merge branch 'twitter-avatar'
2010-09-21 12:46:16 -07:00
94de78fa0f
Workaround for #2485 : in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.
2010-09-21 12:38:04 -07:00
28fdc733a7
change the location and title of the feeds section
2010-09-21 14:09:46 -04:00
aef42e2f65
Don't spew a notice warning to output while processing logging for PEAR DB errors
2010-09-20 16:52:22 -07:00
24bb6feba7
Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form
2010-09-20 16:39:51 -07:00
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
2f38c9c99c
Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases.
2010-09-20 13:19:58 -07:00
55ad954b15
Basic license admin panel (maybe we can make it fancier later)
2010-09-17 16:38:12 -07:00
20a0a4acff
Explicitly mark a translator note on the command list help message that the command names must not be translated
2010-09-16 11:05:31 -07:00
670ad53215
Merge branch '0.9.x' into activityexport
2010-09-15 23:31:20 -04:00
85154a49d0
Add plural support for minutes/hours/days/months ago.
...
Reapply of revised b27882c9162d4c0f9a47
2010-09-16 00:07:47 +02:00
2d4c0f9a47
Revert "Add plural support for minutes/hours/days/months ago." -- currently doesn't work and spews error messages
...
This reverts commit b27882c916
2010-09-15 14:10:18 -07:00
1ceb93cce4
move useractivitystream class to its own module
2010-09-15 15:18:01 -04:00
0a5aa95746
flag to leave out author information in activity output
2010-09-15 07:11:50 -04:00
d2877f4c3d
change user attribute from private to protected so subclasses can use it
2010-09-15 07:08:28 -04:00
c218eb5077
L10n: Fix punctuation.
2010-09-14 22:30:55 +02:00
a2fe29388d
Activity::asString() should format numerical not string time
2010-09-13 17:05:02 -04:00
d207f19d22
accept null constructor for ActivityContext
2010-09-13 16:23:10 -04:00
39802077a8
* update/add translator documentation
...
* remove superfluous whitespace
2010-09-13 21:10:55 +02:00
8c94ebf537
* update/add translator documentation
...
* remove superfluous whitespace
2010-09-13 21:10:54 +02:00
d6be5be548
Move translator hint to where gettext will actually see it and replace tab by spaces.
2010-09-13 21:10:53 +02:00
a590f2cb0f
Fix typos in translator comments.
2010-09-13 21:10:53 +02:00
6817420e6c
Remove trailing whitespace and update comment consistency on methods.
2010-09-13 21:10:52 +02:00
b27882c916
Add plural support for minutes/hours/days/months ago.
2010-09-13 21:10:51 +02:00
0d1b60b11d
Update translator documentation.
2010-09-12 18:34:33 +02:00
128607a270
Update translator documentation and add punctuation where missing to exception messages.
2010-09-12 18:24:44 +02:00
e88ee4ec46
Fix i18n issue and add translator documentation.
2010-09-12 18:11:28 +02:00
8adef3127c
Update translator documentation.
2010-09-12 17:49:56 +02:00
99f6a70937
* add two FIXMEs for gettext messages not being processed.
...
* update translator documentation.
2010-09-12 17:44:28 +02:00
6b010ac79c
Update/add translator documentation.
2010-09-12 17:27:38 +02:00
9bc4aaeca3
Update incomplete documentation.
2010-09-12 17:17:43 +02:00
76c0e3169b
move othersettings to urlsettings
2010-09-11 16:22:03 -04:00
fca7ea664b
move view designs setting to user design tab
2010-09-11 16:16:38 -04:00
12eee30586
Merge branch '1.0.x' into shortcontrol10x
2010-09-10 22:20:52 -04:00
4419e43f7f
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
cb1d5049b8
Bump version to 0.9.5
2010-09-08 15:35:23 -07:00
e6c84dec19
Pragma was accidentally triggering some underwear-catapult-connected hardware
2010-09-08 15:41:39 -04:00
338aa4bf1d
Merge branch 'apinamespace' into 0.9.x
2010-09-07 16:39:43 -04:00
8d54809c35
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-09-07 13:45:52 -04:00
86a702953a
Merge branch '0.9.x' into 1.0.x
2010-09-06 10:12:17 -04:00
a319b40c97
common_cache_key() -> Cache::key()
2010-09-06 10:07:43 -04:00
e42d2124a3
common_keyize() -> Cache::keyize()
2010-09-06 10:03:51 -04:00
c2de44a530
remove NOOP function common_broadcast_notice()
2010-09-06 09:59:08 -04:00
8f81762d68
common_memcache() => Cache::instance()
2010-09-06 09:56:45 -04:00
f2d6e1e375
Add basic support for Georgian (ka)
2010-09-05 10:45:03 +02:00
f7c46effa2
set_notify -> setNotify
2010-09-03 17:50:29 -04:00
44f1b94301
get_screenname -> getScreenname
2010-09-03 17:50:29 -04:00
c54ef9b8b6
is_otr -> isOtr
2010-09-03 17:50:29 -04:00
d68914e4f3
is_autoreply -> isAutoreply
2010-09-03 17:50:29 -04:00
cce92e394b
public_notice -> publicNotice
2010-09-03 17:50:29 -04:00
00e21d4a6f
broadcast_notice -> broadcastNotice
2010-09-03 17:50:29 -04:00
9ccf65a311
get_user -> getUser
2010-09-03 17:50:29 -04:00
054111bb54
add_notice -> addNotice
2010-09-03 17:50:29 -04:00
a3725de47b
handle_incoming -> handleIncoming
2010-09-03 17:50:29 -04:00
463e9c10d1
handle_command -> handleCommand
2010-09-03 17:50:29 -04:00
671b0f4cd9
format_notice -> formatNotice
2010-09-03 17:50:29 -04:00
a70cceaddd
send_confirmation_code -> sendConfirmationCode
2010-09-03 17:50:28 -04:00
1eccd2a4bd
send_from_site -> sendFromSite
2010-09-03 17:50:28 -04:00
b4d02650df
get_user_im_prefs_from_user -> getUserImPrefsFromUser
2010-09-03 17:50:28 -04:00
8263ae601b
get_user_im_prefs_from_screenname -> getUserImPrefsFromScreenname
2010-09-03 17:50:28 -04:00
f038eacca4
enqueue_incoming_raw -> enqueueIncomingRaw
2010-09-03 17:50:28 -04:00
e7a026091c
enqueue_outgoing_raw -> enqueueOutgoingRaw
2010-09-03 17:50:28 -04:00
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
764e0ab962
receive_raw_message -> receiveRawMessage
2010-09-03 17:50:28 -04:00
80176b0b2c
send_notice -> sendNotice
2010-09-03 17:50:28 -04:00
6a848bcc8a
send_message -> sendMessage
2010-09-03 17:50:28 -04:00
326258bfef
Merge branch '0.9.x' into 1.0.x
2010-09-02 22:57:37 -04:00
6c14235d6c
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-02 22:56:18 -04:00
388495f6b1
use etag preferably for caching
2010-09-02 22:26:20 -04:00
c8a69f433c
add some caching headers
2010-09-02 22:26:19 -04:00
0c5ca46ba3
combine our standard scripts into one big script
2010-09-02 22:21:07 -04:00
2196d00b1b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/command.php
2010-09-02 15:04:25 -07:00
e365e709c5
Merge branch 'master' into testing
2010-09-02 14:58:11 -07:00
cbcb9b0080
Fixes for Mac metadata files mucking up theme zip files
2010-09-02 14:24:46 -07:00
c24458a9f0
Ticket #2638 : allow themes to specify a base theme to load with 'include' setting in a theme.ini file
2010-09-02 14:11:52 -07:00
c7d81f2d9d
hooks for showing <title> and <h1> elements
2010-09-02 17:10:25 -04:00
7517409bf1
Merge branch 'testing' into 0.9.x
2010-09-02 16:56:52 -04:00
11f7fce3bb
Fixes for custom theme upload:
...
* skip more files (.xcf image sources, .html docs)
* skip files before rejecting them for funky filenames!
* allow period in filenames (eg foo-1.4.ttf) but blacklist some unsafe extensions-within-extensions
2010-09-02 12:11:45 -07:00
4cbbfdab84
Fix for #2635 : use ssl-sometimes settings for Twitter settings & auth pages
2010-09-02 10:55:26 -07:00
f64fff379c
* when using multiple parameters, number them
...
* fix double space to single space
* use consistent punctuation in messages
* complete translation hints for all commands
* add an i18n fixme for missing plural support
* trailing whitespace removed
2010-08-28 16:51:49 +02:00
2eb894e535
Document UI text and number parameters.
2010-08-28 16:28:23 +02:00
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
a68c10280f
Merge branch 'master' into 0.9.x
2010-08-16 16:56:15 -07:00
033a757013
More schema work in progress... removing duped code from schema child classes, rebuilding things a bit more (incomplete; non-working state)
2010-08-16 16:31:18 -07:00
eaa4ded053
first pass at columndef->drupal-style array converter (need to handle some more things probably; untested)
2010-08-16 15:14:16 -07:00
b2a5e0d09b
StatusNet 0.9.4 "Orange Crush"
2010-08-16 10:09:33 -07:00
7f9ab683b2
fixed a %d that should be a %s in an error message
2010-08-16 10:03:58 -07:00
e687862ca1
fixed a %d that should be a %s in an error message
2010-08-16 13:26:27 +12:00
7183175429
Merge branch 'master' into 1.0.x
2010-08-13 14:33:41 -07:00
9b7536351b
hide the Whats Up Nickname if notice title enabled
2010-08-13 12:22:58 -07:00
ed8d8eb5ee
hooks to allow changing RSS content
2010-08-13 11:44:26 -07:00
f7d599f8ea
Fix for ticket 2513: "Can't linkify" error when some links are shortened
...
When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)
http://status.net/open-source/issues/2513
2010-08-12 15:25:32 -07:00
ae696728f5
Merge branch '0.9.x' into 1.0.x
2010-08-12 12:56:23 -07:00
111fc33e1a
Output "web" instead of gettext translation file metadata when notice.source is empty
2010-08-11 18:53:34 -07:00
d15a41c96e
0.9.4beta2 update some notes in README, note the fix from beta1
2010-08-11 10:32:52 -07:00
db46d73a5f
Add dummy support for Esperanto.
2010-08-11 12:46:54 +02:00
19e6b84050
StatusNet_network staticGet lookup fix
2010-08-10 17:22:26 -07:00
5c210f724a
update version for 0.9.4beta1
2010-08-10 16:28:33 -07:00
08fc6053ec
Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice).
2010-08-10 13:49:11 -07:00
6a2659ed67
Workaround for index setup on SubMirror until I'm done w/ arbitrary index support for Schema setup.
2010-08-10 11:45:34 -07:00
855f1f6623
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-08-09 13:11:41 -07:00
09dee24cbe
Add two i18n related FIXMEs.
2010-08-08 21:13:21 +02:00
ebd2fc2f7c
Partial fix for ticket #2489 -- problems with SNI SSL virtual host certificate validation.
...
Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.
I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
2010-08-06 10:14:07 -07:00
433c43c999
Merge branch 'testing' into 0.9.x
2010-08-05 11:02:53 -07:00
77a96e3d7c
Merge branch 'master' into testing
2010-08-05 10:56:49 -07:00
fd530a892f
Fix for source attribution on notices; it was displaying the code instead of the source name sometimes.
2010-08-04 12:31:31 -07:00
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
004e42e3e0
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-08-03 16:04:54 -07:00
eaef724c49
urgh. typo
2010-08-02 14:24:50 -04:00
e603632f13
add support for Salmon's new "mentioned" rel value
2010-08-02 14:06:14 -04:00
a1aea74fe2
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-08-02 09:43:58 -07:00
44d01f70a6
Localisation updates from http://translatewiki.net
...
* add support for Danish
2010-07-31 23:59:22 +02:00
1bb18e9bab
Merge branch '2471' into 0.9.x
2010-07-30 17:52:12 -07:00
0caebc9308
Fix for ticket #2471 : install.php returns unsuccessfully but doesn't display error message if PHP < 5.2.6 is used
...
http://status.net/open-source/issues/2471
Old bit of code didn't get updated for new installer
2010-07-30 13:16:47 -07:00
47f19988d1
allow schema to work on more than one connection (namely, the Status_network DB)
2010-07-29 21:04:28 -04:00
c2a26ba653
removing redundant constructor
2010-07-29 21:03:48 -04:00
fb2e00eacc
Merge branch 'master' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-07-29 20:44:11 +00:00
0faa988e91
Fix for issue ID 2290: make sure errors are returned in the right
...
format, and use callback for errors when the request is JSONP
2010-07-29 20:31:22 +00:00
e10621a52a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-07-28 17:51:07 -04:00
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
ab2c3686b7
Merge branch 'testing' into 0.9.x
2010-07-28 11:59:42 -07:00
dbb5e9e191
accept mailto: URIs as OStatus identifiers
2010-07-22 16:00:26 -07:00
65862d8f7f
Suppress HTTP error headers for JSONP API output
2010-07-16 14:40:22 -07:00
453a06fff4
Exceptions are caught and continued on JSON, XML, Atom and RSS output in API
2010-07-13 11:11:29 -04:00
1044f27e47
handle missing profile for notices better in Rss10Action
2010-07-13 10:59:15 -04:00
d706a3e21b
handle missing profile for notices better in NoticeList
2010-07-13 10:59:01 -04:00
6968c96b44
log exceptions in atom feeds, but don't let them kill the output
2010-07-13 10:53:47 -04:00
dfd65a4290
push exception on missing profile down to Notice::getProfile()
2010-07-13 10:51:25 -04:00
ab149755b6
handle notices without profiles better in RSS output
2010-07-13 10:42:06 -04:00
1b3b7f9a42
Ticket 2427: fix regression in plugin i18n
2010-07-12 10:27:23 -07:00
974c4df029
Ticket 2433: Skip locale fallback list check on Windows ('locale -a' shell-out doesn't work there)
2010-07-12 09:56:32 -07:00
923d9ef71c
- Fix bugs with block and friendship API methods
...
- Friendship API methods now use a Profile instead of User for target
2010-06-28 16:54:39 -07:00
c9863bb864
Update version and code name: 0.9.3 Half a World Away
2010-06-28 15:08:01 -04:00
b2ad8ec571
Fix for PHP notice when given an integer degrees in decimalDegreesToDMS(); using math instead of string manipulation to split integer portion from decimal remainder.
2010-06-28 14:41:33 -04:00
fdd9aa58e3
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-28 13:41:04 -04:00
53f14ddde6
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-28 13:39:52 -04:00
9c7b66984c
Enhanced upload file type detection. If given an original filename, we'll attempt to detect type from the extension if we were unable to make a definitive match from content. Generic octet-stream, zip, and MS Office type are explicitly singled out for re-checks, which fixes OpenOffice and MS Office documents to come up with the proper types when misdetected.
...
File extensions can also be added to the upload type whitelist; they'll be normalized to types for the actual comparison, so only known extensions will work.
2010-06-28 08:59:47 -07:00
fa282823d9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 15:10:47 -04:00
c6b1e25d17
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-26 15:09:30 -04:00
ef7e85c0ab
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-26 15:09:08 -04:00
f0c5e7eca3
Fix for bug #2382 : releasing claim on failed queue item works again with DB-based queues.
...
Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
2010-06-26 15:07:32 -04:00
00e129b013
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 10:18:03 -04:00
696e4ba393
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
dad0b06a38
Throw an error if queueing is disable when using an IM plugin
2010-06-22 22:01:13 -04:00
1eec7f779f
- Add profile_info tag to Atom author
...
- Normalize xmlns:statusnet links in the API
2010-06-22 16:28:06 -07:00
87125a1395
Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message .
...
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
a6ce4eef0d
Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty
2010-06-16 18:27:51 -07:00
d3d499879c
- More useful group info from api/statusnet/group/show
...
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07:00
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
4ee2c12507
Use presence of IM plugins to decide if "IM" menu option should be shown in Connect
2010-06-15 17:04:15 -04:00
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07:00
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -07:00
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
ec15546476
Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json').
...
Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11 11:52:06 -07:00
b1a68e15b7
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
e121d472e7
Revert "added notice.location to group by"
...
This reverts commit 48dc899acb
2010-06-09 16:30:50 +12:00
Brion Vibber
Zach Copley
Siebrand Mazeland
Evan Prodromou
Craig Andrews
Brenda Wallace
Brion Vibber
James Walker