Evan Prodromou
e10621a52a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-07-28 17:51:07 -04:00
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
Luke Fitzgerald
9b9a36e492
Introduce error checking when calling handleEvents
2010-07-28 11:56:15 -07:00
Luke Fitzgerald
2fe1b12804
Merge in Phergie changes
2010-07-28 10:42:01 -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
Luke Fitzgerald
dd882be803
Merge in Phergie fixes and remove some whitespace
2010-07-27 09:14:07 -07:00
Luke Fitzgerald
3c1d7d81cf
Remove some testing/debugging code
2010-07-26 12:25:23 -07:00
Luke Fitzgerald
e911480587
Add timeout method to force call of idle to send ping
2010-07-26 11:21:11 -07:00
Luke Fitzgerald
82f44c5fa0
Fix typo
2010-07-26 11:14:18 -07:00
Luke Fitzgerald
742b302739
More Irc plugin work
2010-07-26 11:13:00 -07:00
Evan Prodromou
db90bcb329
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-07-26 10:32:30 -04:00
Luke Fitzgerald
950685a466
Merged in Phergie changes
2010-07-25 16:04:12 -07:00
Luke Fitzgerald
2645133c43
Use non-statusnet class
2010-07-24 20:04:00 -07:00
Luke Fitzgerald
3b9d720df5
Change ircmanager to not use unnecessary class
2010-07-24 20:03:16 -07:00
Luke Fitzgerald
c0214ac0a4
Merged in Phergie change (Allow sec/usec = 0)
2010-07-24 11:26:20 -07:00
Luke Fitzgerald
75373e4a7a
Remove old comment
2010-07-24 10:07:02 -07:00
Luke Fitzgerald
007d9ec8ce
Updated commenting
2010-07-24 10:01:37 -07:00
Luke Fitzgerald
9f0eea69ff
Handle the case where confirmation is cancelled
2010-07-24 07:54:09 -07:00
Luke Fitzgerald
be0fb03560
Cosmetic: Rearrange code
2010-07-23 14:13:37 -07:00
Luke Fitzgerald
4dcf2a1f51
Another comment
2010-07-23 13:57:39 -07:00
Luke Fitzgerald
13c63d554d
Added some missing comments
2010-07-23 13:40:11 -07:00
Luke Fitzgerald
f1f78b3142
Remove Phergie diff file
2010-07-23 13:34:39 -07:00
Luke Fitzgerald
c4640c50d3
Lots more work - Implemented nickname checking
2010-07-23 13:33:41 -07: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
Luke Fitzgerald
f818182a37
Update classname in ircmanager too!
2010-07-21 07:39:28 -07:00
Luke Fitzgerald
3cb51e182b
Rename Phergie_Plugin_Statusnet_Callback to Phergie_Plugin_StatusnetCallback
2010-07-21 07:39:19 -07:00
Luke Fitzgerald
2e9da023c0
Rename Phergie_ExtendedBot to Phergie_StatusnetBot
2010-07-21 07:33:43 -07:00
Luke Fitzgerald
af5ecb88b1
Corrected UTF8 to UTF-8
2010-07-21 05:21:37 -07:00
James Walker
7065450f03
normalizing tags for status_network
2010-07-20 17:34:58 -07:00
Luke Fitzgerald
a34e55e1a3
Change default encoding to UTF-8
2010-07-20 11:32:09 -07:00
Luke Fitzgerald
efdf9b6d4e
Code now functional - lots of error checking and extras missing still though
2010-07-20 11:16:59 -07:00
Luke Fitzgerald
1e5198645c
Weaken send scope to protected
2010-07-20 06:26:51 -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