5503492f42
Fix `msgid' and `msgstr' entries do not both end with '\n'
2010-10-18 22:15:54 +02:00
3c10602561
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-18 22:11:33 +02:00
e6df1b19df
Localisation updates from http://translatewiki.net
2010-10-18 22:03:29 +02:00
aa80d8fee3
Clean up edge cases in OStatus FeedDiscoveryTest
2010-10-18 12:45:55 -07:00
a7d818bcdb
Remove superfluous whitespace
2010-10-18 21:44:51 +02:00
067d37f864
Update URLDetectionTest.php for rel="nofollow external". There are still some broken tests due to bad quote splitting, which is unrelated.
2010-10-18 12:26:01 -07:00
d67a9b437c
Avoid notice in DirectionDetectorPlugin when dealing with empty string.
2010-10-18 12:23:01 -07:00
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
edf8990aa9
fix notice on non-https views
2010-10-18 11:12:26 -07:00
671712f0f6
document API and nofollow config options
2010-10-18 11:41:33 -04: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
505ac6eba0
* add plural support where missing
...
* update translator documentation.
2010-10-16 14:38:12 +02:00
31415b5853
Update translator documentation.
2010-10-16 14:31:41 +02:00
77191f455a
Change incorrect use of e.g. to i.e.
...
Spotted by The Evil IP address.
2010-10-16 14:20:30 +02:00
1d6d0cbcbd
Use common case instead of WARNING in all caps.
...
Spotted by The Evil IP address.
2010-10-16 14:15:02 +02:00
06a8de060d
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-15 13:46:44 -04:00
9b9ba29791
add SSL servers and paths to pathadminpanel.php
2010-10-15 13:46:21 -04:00
793ec16ed4
Fix ticket #2829 : we have more subdirs to pull than just avatars now; updated the upgrade directions.
2010-10-14 16:57:04 -07:00
a2090ecc97
Merge branch '2828' into 0.9.x
2010-10-14 16:52:01 -07:00
56403c4beb
Fix for ticket #2828 , part II: apostrophe in site name set in installer created a broken config.php.
...
The previous commit fixed the base installer to properly quote its strings when creating config.php... but you'd actually end up with double-escaping if you had magic_quotes_gpc on. Magic quotes are evil and lame, but we gotta deal with em. :P Updated the web installer code to check for magic quotes, and to grab its variables consistently through the same interface.
2010-10-14 16:47:56 -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
fc6711327b
let users set their SSL logo through the admin panel
2010-10-14 15:06:11 -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
ecb582e419
accept profile URL as a LRDD identifier
2010-10-14 11:07:37 -04:00
23ac961624
Show Webfinger, URI and profile page as subject and aliases
2010-10-14 11:06:57 -04:00
97a7fb246c
correctly use sslserver if it is set
2010-10-14 01:35:11 -04:00
7fb765b2cb
document sslserver and sslpath configuration options
2010-10-14 01:23:12 -04:00
aafd95dc0c
Design::url() will use HTTPS if page is HTTPS
2010-10-14 01:18:19 -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
76038fe20c
better deletion of related objects in User_group::delete()
2010-10-13 22:44:06 -04:00
ddb60a8191
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-13 15:18:32 -04:00
6c77d86b7f
Merge branch 'master' into 0.9.x
2010-10-13 12:04:20 -07: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
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
2291d68e70
Default to ssl in oauth tests examples config
2010-10-12 17:54:54 -07:00
04f3f57e2e
Merge branch 'oauth-1.0a' into 0.9.x
2010-10-12 17:52:04 -07:00
112b6c4079
Improve cache-friendliness of user_group->delete().
...
Doesn't clear all possible cached entries, but this should get the ones that matter most: lookups by id, nickname, and alias. This should ensure that if a group name gets reused as a new group or alias, it should work properly.
There are some user-visible areas that aren't clear such as the 'top groups' lists on the GroupsAction sidebar; if a deleted group appears in those lists it'll go away within an hour when the cached query expires.
2010-10-12 16:29:13 -07:00
5270e93131
Spelling - OAuth not Oath
2010-10-12 16:20:09 -07:00
d8e06e66e9
Print a proper error message
2010-10-12 16:19:53 -07:00
3579ccac8e
Cascading deletion for user_group; doesn't yet work properly with caching.
2010-10-12 16:13:07 -07:00
Siebrand Mazeland
Brion Vibber
Evan Prodromou
Zach Copley