Commit Graph

9348 Commits

Author SHA1 Message Date
Brion Vibber
e2d3ebb9f4 Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2010-03-29 15:15:41 -07:00
Evan Prodromou
e3a46d2b83 Merge branch '0.9.x' into 1.0.x 2010-03-26 09:18:07 -04:00
Evan Prodromou
36a8e8e8a3 Merge branch 'testing' into 0.9.x 2010-03-26 09:17:47 -04:00
Evan Prodromou
9c63ae6e44 add whitelist and blacklist for openid URLs 2010-03-25 16:58:05 -04:00
Evan Prodromou
5b23b7e736 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-25 16:35:35 -04:00
Evan Prodromou
7f6fdb528c remove debugging calls 2010-03-25 16:35:22 -04:00
Brion Vibber
040b4b74ef Merge commit 'origin'; branch '0.9.x' into 1.0.x 2010-03-25 13:05:02 -07:00
Brion Vibber
29a25848de Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-25 13:04:09 -07:00
Brion Vibber
cd9017408e And clarify a little more 2010-03-25 12:48:31 -07:00
Brion Vibber
38fac1d463 Clarify RewriteBase comment in htaccess.sample 2010-03-25 12:21:02 -07:00
Brion Vibber
800b335906 Merge commit 'origin/master' into testing
Conflicts:
	classes/Notice.php
2010-03-25 11:43:26 -07:00
Evan Prodromou
697222575d Merge branch 'blacklisttable' into testing 2010-03-25 13:51:52 -04:00
Evan Prodromou
920acf8d96 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-25 13:50:49 -04:00
Evan Prodromou
6e644f77a4 Store blacklist patterns in their own tables
We were bumping into limits on the config format in the Blacklist
plugin. So, added new tables for nickname and homepage blacklists, and
changed the plugin to use those instead of config file (actually,
still uses config file in addition, for compatibility).
2010-03-25 13:49:12 -04:00
Sarven Capadisli
7f1b852c97 If indenting is disabled on the output, this fixes the entity_tags crop 2010-03-25 17:47:04 +01:00
Sarven Capadisli
518551bf70 Fix for processing indicator for aside 2010-03-25 17:33:59 +01:00
Sarven Capadisli
1089c0e23c Updated biz theme to use realtime icons from core 2010-03-25 15:08:00 +01:00
Sarven Capadisli
5330e9d861 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-24 23:33:00 +01:00
Sarven Capadisli
97e83112d2 A lot of updates to keep the themes current (at least in functionality) 2010-03-24 23:31:30 +01:00
Sarven Capadisli
2c50d4aa44 location -> label class for cloudy 2010-03-24 22:40:59 +01:00
Brion Vibber
abf2ce873b Avoid notice when reporting DB errors for objects that don't have an 'id' field 2010-03-24 14:18:25 -07:00
Brion Vibber
64b5ea2e62 Use InnoDB and UTF-8 options when creating user_im_prefs table, to match others 2010-03-24 14:18:06 -07:00
Brion Vibber
c3ceaa893f Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2010-03-24 14:11:01 -07:00
Brion Vibber
ecb009bcf5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-24 13:57:20 -07:00
Brion Vibber
fd608c0de0 Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml 2010-03-24 13:38:06 -07:00
Brion Vibber
a954fd65ba Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml 2010-03-24 13:36:57 -07:00
Sarven Capadisli
9fe12be41e Using unique @for, @id pair for jabber and sms options in subscriptions 2010-03-24 21:34:53 +01:00
Sarven Capadisli
09ff213d1c Using hCard label instead of location. Matches userprofile. 2010-03-24 20:58:13 +01:00
Sarven Capadisli
e7ae36b52a Updated tag list output in subscriptions list. Matches userprofile. 2010-03-24 20:50:07 +01:00
James Walker
9e0b9857f4 Make sure we're requiring the library 2010-03-24 15:26:03 -04:00
James Walker
cfca789b34 Updated Math_Biginteger from upstream - removing safe* workarounds 2010-03-24 15:18:41 -04:00
James Walker
c4273f0ef3 Check for 0.9.0 bad keys from old Crypt_RSA library 2010-03-24 15:15:20 -04:00
James Walker
10410907a0 A bit safer checking in the keypair parsing 2010-03-24 14:27:35 -04:00
Sarven Capadisli
5808f86584 Removed print stylesheet 2010-03-24 15:13:38 +01:00
Sarven Capadisli
647b3a1f6b Moved print inside base stylesheet using media rules. One less HTTP GET. 2010-03-24 14:50:12 +01:00
Zach Copley
7b1b6045e6 Look for the first object in the Activity 2010-03-24 00:00:55 -07:00
Julien C
a3da5b24c9 Misc small fixes, plus a new hook in tag.php 2010-03-23 23:02:17 -04:00
Craig Andrews
abe4be5438 Use $param instead of hardcoded 'attach' name. 2010-03-23 22:42:30 -04:00
Craig Andrews
1f73156dae Move the bundled Net/LDAP2 library to the LdapCommon directory 2010-03-23 21:57:47 -04:00
Brion Vibber
fcf86b4fdf Improve legibility of OStatus remote tests output 2010-03-23 18:56:40 -07:00
Craig Andrews
6b538cd9b3 Fix some regressions caused by refactor of LDAP plugin 2010-03-23 21:50:31 -04:00
Brion Vibber
9380eed794 add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases 2010-03-23 18:44:54 -07:00
Nick Holliday
d9dcdf5b49 Converts Spotify URI/HTTP Links to pretty ones. 2010-03-23 21:31:58 -04:00
Brion Vibber
5e76e0c8ac fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them. 2010-03-23 17:28:43 -07:00
Brion Vibber
13d59e0c76 fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them. 2010-03-23 17:24:01 -07:00
Brion Vibber
2ae61307bb Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-23 14:20:14 -07:00
Brion Vibber
df8c9090c0 Add basic subscribe/unsubscribe test to OStatus test cases 2010-03-23 14:19:12 -07:00
Brion Vibber
5f32cf32cd Don't spew XML parse warnings to output when checking a remote XRD page 2010-03-23 14:18:45 -07:00
Siebrand Mazeland
80ed391328 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-23 21:15:20 +01:00
Brion Vibber
7dc24b4ca7 FOAF was missing OStatus remote subscriptions, now fixed. 2010-03-23 13:10:23 -07:00