Evan Prodromou
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
Evan Prodromou
659e8b26ac
add admin panel for Adsense
2010-07-28 17:50:36 -04:00
Siebrand Mazeland
81d562d4b7
Update po files
2010-07-28 22:40:22 +02:00
Siebrand Mazeland
cb09b5c62a
Update pot
2010-07-28 22:38:48 +02:00
Siebrand Mazeland
e694da24a9
Number parameters
2010-07-28 22:17:54 +02:00
Siebrand Mazeland
97728791a1
Localisation updates from http://translatewiki.net
2010-07-28 22:13:37 +02:00
Brion Vibber
ab2c3686b7
Merge branch 'testing' into 0.9.x
2010-07-28 11:59:42 -07:00
Brion Vibber
189d341733
Merge branch 'master' into testing
2010-07-28 11:56:55 -07:00
James Walker
5688c635a6
backwards compatibility for old tags format in hasTag
2010-07-28 12:13:53 -04:00
James Walker
5daa5bc2af
try/catch just in case..
2010-07-28 12:04:37 -04:00
James Walker
29b8a6a18f
don't try to save empty tags
2010-07-28 11:57:54 -04:00
James Walker
4853b1e2a0
SQL script to update status_network table
2010-07-28 11:50:04 -04:00
James Walker
dd7647aa95
script to normalize status_network tags
2010-07-28 11:49:09 -04:00
James Walker
a6b1feb08c
leaving tags column in (for now)
2010-07-28 11:43:47 -04:00
James Walker
772018810b
Merge branch 'master' into testing
2010-07-27 12:18:40 -04:00
Evan Prodromou
db90bcb329
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-07-26 10:32:30 -04:00
Evan Prodromou
dbb5e9e191
accept mailto: URIs as OStatus identifiers
2010-07-22 16:00:26 -07:00
Brion Vibber
3040a5ff85
Quick fix for IE7 via sammy: remove redundant media specifiers from base style @import in main themes.
...
The <link>s already specify screen/etc media, so all it was doing was breaking. There are still some issues, but most things seem to work-ish as long as Realtime plugins are off.
2010-07-22 05:22:09 +00:00
Zach Copley
25e963769c
Revert "Revert "Change the cache window on notices from 61 to 200, the max number""
...
This reverts commit a65b3f171c
2010-07-21 12:29:47 -07:00
James Walker
7065450f03
normalizing tags for status_network
2010-07-20 17:34:58 -07:00
Eric Helgeson
9b899eea75
Make some messages gender neutral.
2010-07-19 21:09:09 -05:00
Zach Copley
a65b3f171c
Revert "Change the cache window on notices from 61 to 200, the max number"
...
This reverts commit d51820adc5
2010-07-19 17:38:11 -07:00
Brion Vibber
f0620a74c8
Provisional OAuth, OpenID token check timing attack patches
2010-07-19 16:47:49 -07:00
Zach Copley
d51820adc5
Change the cache window on notices from 61 to 200, the max number
...
of notices available at one time through the API. Note: this will
require a memcache restart.
2010-07-19 13:47:42 -07:00
Zach Copley
65862d8f7f
Suppress HTTP error headers for JSONP API output
2010-07-16 14:40:22 -07:00
Evan Prodromou
d73feb82d8
cache sitemap notice and user counts for 4h
2010-07-14 10:38:34 -04:00
Evan Prodromou
453a06fff4
Exceptions are caught and continued on JSON, XML, Atom and RSS output in API
2010-07-13 11:11:29 -04:00
Evan Prodromou
1044f27e47
handle missing profile for notices better in Rss10Action
2010-07-13 10:59:15 -04:00
Evan Prodromou
d706a3e21b
handle missing profile for notices better in NoticeList
2010-07-13 10:59:01 -04:00
Evan Prodromou
6968c96b44
log exceptions in atom feeds, but don't let them kill the output
2010-07-13 10:53:47 -04:00
Evan Prodromou
dfd65a4290
push exception on missing profile down to Notice::getProfile()
2010-07-13 10:51:25 -04:00
Evan Prodromou
ab149755b6
handle notices without profiles better in RSS output
2010-07-13 10:42:06 -04:00
Brion Vibber
1339f1f908
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:24:43 -07:00
Brion Vibber
d645b342ac
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:22:36 -07:00
Brion Vibber
cd29d3d646
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-07-12 14:21:57 -07:00
Brion Vibber
1b3b7f9a42
Ticket 2427: fix regression in plugin i18n
2010-07-12 10:27:23 -07:00
Brion Vibber
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
Evan Prodromou
bb2f5defd5
remove debugging statement and add a bit of output to updatecounts
2010-07-10 09:58:27 -04:00
Evan Prodromou
d53d0f7908
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-07-10 09:51:49 -04:00
Evan Prodromou
869ebb7dc7
script to fill counts table from command line
2010-07-09 17:50:14 -04:00
Zach Copley
4c5098cd32
Handle the case where a screen name has shifted from one Twitter ID to another
2010-07-08 21:17:11 +00:00
Evan Prodromou
7746611f20
create an index on user.created so sitemap generation is faster
2010-07-05 14:12:14 -04:00
Siebrand Mazeland
43dd6cca63
Localisation updates from http://translatewiki.net
2010-07-01 18:57:55 +02:00
Brion Vibber
c5e89527d9
Updated OMB_Yadis_XRDS for compatibility with php-openid 2.2.2: Auth_Yadis_XRDS::parseXRDS() is now declared static, and PHP 5.3 demands it say so on the subclass too.
...
Compat fix branch for upstream: 6589dc073f
2010-06-29 15:03:50 -04:00
Brion Vibber
15b1d130d2
Update to last upstream version of libomb: coding style updates, static call fix, improved handling of invalid XRD URIs.
2010-06-29 14:39:57 -04:00
Brion Vibber
c038164c0f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-29 08:53:05 -07:00
Brion Vibber
452123916d
Updates to README w/ summary changelist
2010-06-29 11:23:35 -04:00
Brion Vibber
21f253c584
Fix regression in OStatus remote group subscribe -- a bug was previously masked silently (call to nonexistent getProfileUrl() method on User_group -- now replaced with homeUrl() which does the thing we wanted here)
2010-06-29 10:31:30 -04:00
Brion Vibber
2d920e05d5
Update the (formerly) Janrain OpenID library to 2.2.2 -- bug fixes including PHP 5.3 compatibility fix.
...
Upstream release was tagged at: a287b2d85e
2010-06-29 10:24:48 -04:00
Zach Copley
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
