Brion Vibber
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07: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
Brion Vibber
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
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
Brion Vibber
edf8990aa9
fix notice on non-https views
2010-10-18 11:12:26 -07:00
Evan Prodromou
671712f0f6
document API and nofollow config options
2010-10-18 11:41:33 -04:00
Evan Prodromou
47ac8458ca
default for nofollow external is sometimes
2010-10-18 11:41:18 -04:00
Evan Prodromou
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
Siebrand Mazeland
505ac6eba0
* add plural support where missing
...
* update translator documentation.
2010-10-16 14:38:12 +02:00
Siebrand Mazeland
31415b5853
Update translator documentation.
2010-10-16 14:31:41 +02: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
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
e0cb6d6f7f
fix notice on non-https views
2010-10-15 15:03:54 -07:00
Brion Vibber
fa50ab2a94
fix notice on non-https views
2010-10-15 15:01:55 -07:00
Brion Vibber
1a2170914e
woops wrong path
2010-10-15 15:01:43 -07:00
Brion Vibber
3dd4157f26
tweak copyright headers on installer
2010-10-15 14:49:05 -07:00
Brion Vibber
90c35dc541
Cleanup on making the schema work for installer (not quite there yet)
2010-10-15 13:47:38 -07:00
Brion Vibber
77300f94a3
fix typo on params on Schema->createTable()
2010-10-15 13:34:54 -07:00
Brion Vibber
dcf0acd503
Make StatusNet::initDefaults() public so we can call it from the installer.
2010-10-15 13:34:35 -07:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
Brion Vibber
a7d98435f6
Tweak DB query logging to also log queries that fail; the exceptions we get are often not very descriptive like "No such table" without saying which table. :)
2010-10-15 11:26:06 -07:00
Evan Prodromou
06a8de060d
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-15 13:46:44 -04:00
Evan Prodromou
9b9ba29791
add SSL servers and paths to pathadminpanel.php
2010-10-15 13:46:21 -04:00
Brion Vibber
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
Brion Vibber
a2090ecc97
Merge branch '2828' into 0.9.x
2010-10-14 16:52:01 -07:00
Brion Vibber
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
Brion Vibber
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
Craig Andrews
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
Evan Prodromou
fc6711327b
let users set their SSL logo through the admin panel
2010-10-14 15:06:11 -04:00
Evan Prodromou
1a4dc03bfe
document and default for site|ssllogo
2010-10-14 14:56:38 -04:00
Evan Prodromou
8f3b18f27f
fix copy-and-paste error in javascript url creation
2010-10-14 14:53:20 -04:00
Evan Prodromou
72454db118
make the logo be compatible with HTTPS pages, if possible
2010-10-14 14:22:49 -04:00
Evan Prodromou
b31c49c5d4
Make HTTPS urls in File::url() if necessary
2010-10-14 14:22: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
Evan Prodromou
97a7fb246c
correctly use sslserver if it is set
2010-10-14 01:35:11 -04:00
Evan Prodromou
7fb765b2cb
document sslserver and sslpath configuration options
2010-10-14 01:23:12 -04:00
Evan Prodromou
aafd95dc0c
Design::url() will use HTTPS if page is HTTPS
2010-10-14 01:18:19 -04:00
Evan Prodromou
7436e5d13e
use HTTPS for scripts and stylesheets if the current page is HTTPS
2010-10-14 01:09:02 -04:00
Evan Prodromou
ac63f8baae
show HTTPS urls for JavaScript if HTTPS used for page
2010-10-14 01:00:13 -04:00
Evan Prodromou
74c5aa8f9a
consolidate some theme path code between ssl and non-ssl
2010-10-14 00:59:53 -04:00
Evan Prodromou
ca0323d01b
use HTTPS for favicon.ico if page is HTTPS
2010-10-14 00:50:26 -04:00
Evan Prodromou
d91f894ccb
try to show HTTPS-encrypted theme files for HTTPS-encrypted pages
2010-10-14 00:46:32 -04:00
Evan Prodromou
40c64388e6
try and show an SSL image for the creative commons image
2010-10-14 00:31:13 -04:00
