45a6ecf26d
Merge branch 'master' into testing
2010-02-27 15:05:34 -05:00
55f27feb78
Plugin to restrict too many registrations from one IP
...
We throttle registrations by IP. We record IP address of each
registration, and if too many registrations have been done by the same
IP address in the time interval, we reject the registration.
2010-02-27 15:05:08 -05:00
babca69f67
add bugfix to version number.
2010-02-27 11:04:24 -05:00
31ecc86198
Fixes entity_tags alignment
2010-02-27 16:59:33 +01:00
94b61bca69
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 18:28:43 -05:00
2344db1ae5
Revert "change function name"
...
This reverts commit 21edb98a32
2010-02-26 18:28:33 -05:00
831eb0d2b6
renaming sha256 to prevent conflict
2010-02-26 18:27:13 -05:00
21edb98a32
change function name
2010-02-26 18:26:52 -05:00
59e34122b7
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
better return check in Magicsig::staticGet()
blow cache on known replies
2010-02-26 15:10:45 -08:00
ee7603b09f
better return check in Magicsig::staticGet()
2010-02-26 17:53:27 -05:00
a5cfda8505
blow cache on known replies
2010-02-26 17:47:39 -05:00
d3fc8e2219
Pull conversation URL from Conversation instead of assuming it's local
2010-02-26 14:47:38 -08:00
dced92d6fd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 17:29:04 -05:00
4b696cf51f
add a flag to impede adding sessions to URLs (for permanent stuff)
2010-02-26 17:28:44 -05:00
1cf08c7ad7
MagicEnvelope::parse shouldn't be called statically
2010-02-26 17:09:50 -05:00
6ee7660a58
should be sequenceKey (singular)
2010-02-26 16:51:50 -05:00
0ecf435dc5
adding sequenceKeys() to magicsig
2010-02-26 16:50:00 -05:00
c82cee1876
removing some extraneous debug logging
2010-02-26 16:26:04 -05:00
b0acaeafe3
Check for conversation with unique conversation ID
2010-02-26 13:06:06 -08:00
e4c462570f
move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF
2010-02-26 15:39:58 -05:00
f23a877cd8
Discovery::lookup now throws an exception
2010-02-26 15:39:58 -05:00
88ae7f53bb
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-26 12:33:13 -08:00
c95daacfdb
Updated ShowGroup to Resolve Aliases Again.
...
The way we find groups changed with this new Local_group table.
I had to update this too.
2010-02-26 12:30:23 -08:00
223ebc765c
move signing to take a local actor profile and use local keys
2010-02-26 14:22:49 -05:00
3a7eef1074
only put public keys in XRD
2010-02-26 14:22:49 -05:00
bbb0a7d5bc
updating to use latest salmon NS definitions
2010-02-26 14:22:49 -05:00
0060163a76
Temp fix for mismatched newlines in Telugu; gettext sometimes refuses to complete when such mismatches are present. (Needs to be fixed upstream in TranslateWiki separately so it doesn't revert.)
2010-02-26 09:59:36 -08:00
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -05:00
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
b331e971b0
Merge branch 'master' into testing
2010-02-26 09:35:08 -08:00
c188ae15d9
Blacklist user nickname and password on delete
2010-02-26 12:29:28 -05:00
ea044722e0
'on' is what checkboxes use for boolean true
2010-02-26 12:28:58 -05:00
200a32b922
don't choke on dupelimit in createsim.php
2010-02-26 12:19:33 -05:00
d9d1a77bb0
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 11:40:12 -05:00
6ae39da198
Fixed object name
2010-02-26 11:35:55 +01:00
ab8bb4d79e
more cleanup
2010-02-26 04:07:58 -05:00
d1256b547f
bad merge.. cleaning up missing webfinger bits
2010-02-26 03:43:35 -05:00
22062b665e
remove webfinger.php
2010-02-26 03:28:29 -05:00
85b5b4b40a
Merge remote branch 'statusnet/testing' into testing
2010-02-26 03:27:40 -05:00
84d0c865c4
salmon actually fetching remote keypairs
2010-02-26 03:25:51 -05:00
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
eabae96fb4
Get ApiAction autoloading properly
2010-02-25 22:08:17 -08:00
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
3daf17d935
Get ApiAction autoloading properly
2010-02-25 22:02:40 -08:00
3aee8e0448
Fix a few keys that got dropped from statusnet.ini by mistake
2010-02-25 21:46:53 -08:00
b573c5e260
Fix for group timeline feeds by name
2010-02-25 21:27:59 -08:00
08c17bfcaa
try/catch on omb profile pings
2010-02-25 21:06:53 -08:00
da4b21d3a9
try/catch on omb profile pings
2010-02-25 21:06:16 -08:00
7c8031dc4b
Merge remote branch 'statusnet/testing' into testing
...
Conflicts:
plugins/OStatus/lib/webfinger.php
2010-02-25 23:49:45 -05:00
855692141d
use a real keypair from discovery
2010-02-25 23:38:25 -05:00
Evan Prodromou
Sarven Capadisli
James Walker
Zach Copley
Brion Vibber
Christopher Vollick
Michele