Brion Vibber
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
Brion Vibber
53d45d7ffb
Merge branch '0.9.x'
2010-10-18 15:21:02 -07:00
Brion Vibber
39cfdf0d8b
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-18 14:50:31 -07:00
Brion Vibber
e8da3618c2
Bump version/string: 0.9.6 "Man on the Moon"
2010-10-18 14:49:02 -07:00
Brion Vibber
d26b7a12ca
Bump README to 0.9.6
2010-10-18 14:48:11 -07:00
Evan Prodromou
13571b32ea
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-18 17:38:51 -04:00
Siebrand Mazeland
7ed485ea49
Localisation updates from http://translatewiki.net
2010-10-18 23:09:13 +02:00
Siebrand Mazeland
24b94ebb2c
* fix bugs in parameter numbering for two messages
...
* add translator documentation
2010-10-18 22:47:50 +02: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
5503492f42
Fix msgid' and msgstr' entries do not both end with '\n'
2010-10-18 22:15:54 +02: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
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
Evan Prodromou
0e443c524f
When nofollow|external=sometimes, do follow on favorites page
2010-10-18 11:28:31 -04:00
Evan Prodromou
5329c5001c
When nofollow|external=sometimes, do follow on notice page
2010-10-18 11:28:22 -04:00
Evan Prodromou
f550fefebf
When nofollow|external=sometimes, do follow on profile page
2010-10-18 11:28:15 -04:00
Evan Prodromou
f713b9f0fd
superclass for noticelistitems that strip rel=nofollow when nofollow|external=sometimes
2010-10-18 11:21:00 -04:00
Evan Prodromou
90a53f6cde
add rel='nofollow' to external links
2010-10-18 11:05:03 -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
9a35e48ee2
Fix for ticket #2837 : white screen when hitting 'make admin' button on group members list.
...
RedirectingAction->returnToArgs() has been renamed to returnToPrevious() to avoid confusion with the existing Action->returnToArgs which gives the arguments that would be used to pass to one of those. :)
Switching to the correct function call gets it working.
Thanks to Siebrand for catching it when I could debug it live!
2010-10-15 15:33:54 -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
