Commit Graph

9102 Commits

Author SHA1 Message Date
Siebrand Mazeland
78ea4c711e Add context for Send button on invite.php 2010-03-01 15:49:53 +01:00
Siebrand Mazeland
87c17bc0f0 Also extract _m() used in core.
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 15:47:43 +01:00
Siebrand Mazeland
698e44dc63 Update pot file.
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 15:19:45 +01:00
Siebrand Mazeland
6ea9eb33d2 Update pot file 2010-03-01 15:09:44 +01:00
Evan Prodromou
f00e8bbf47 Merge branch 'testing' into 0.9.x 2010-02-27 17:07:57 -05:00
Evan Prodromou
04c4facba9 fix call of common_find_mentions() in Notice::saveReplies() 2010-02-27 16:30:38 -05:00
Evan Prodromou
4d9daf2149 Use notice for context when deciding who @nickname refers to
In a federated system, "@nickname" is insufficient to uniquely
identify a user. However, it's a very convenient idiom. We need to
guess from context who 'nickname' refers to.

Previously, we were using the sender's profile (or what we knew about
them) as the only context. So, we assumed that they'd be mentioning to
someone they followed, or someone who followed them, or someone on
their own server.

Now, we include the notice information for context. We check to see if
the notice is a reply to another notice, and if the author of the
original notice has the nickname 'nickname', then the mention is
probably for them. Alternately, if the original notice mentions someone
with nickname 'nickname', then this notice is probably referring to
_them_.

Doing this kind of context sleuthing means we have to render the
content very late in the notice-saving process.
2010-02-27 16:06:46 -05:00
Evan Prodromou
45a6ecf26d Merge branch 'master' into testing 2010-02-27 15:05:34 -05:00
Evan Prodromou
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
Siebrand Mazeland
b701f5648d uri -> URI in interface text 2010-02-27 18:51:49 +01:00
Siebrand Mazeland
bafd7b3399 Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-02-27 18:36:44 +01:00
Evan Prodromou
babca69f67 add bugfix to version number. 2010-02-27 11:04:24 -05:00
Sarven Capadisli
31ecc86198 Fixes entity_tags alignment 2010-02-27 16:59:33 +01:00
Zach Copley
dbb9957eea Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-27 00:23:34 +00:00
Evan Prodromou
94b61bca69 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 18:28:43 -05:00
Evan Prodromou
2344db1ae5 Revert "change function name"
This reverts commit 21edb98a32.
2010-02-26 18:28:33 -05:00
James Walker
831eb0d2b6 renaming sha256 to prevent conflict 2010-02-26 18:27:13 -05:00
Evan Prodromou
21edb98a32 change function name 2010-02-26 18:26:52 -05:00
Zach Copley
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
Zach Copley
cd831dbc4c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 22:54:03 +00:00
James Walker
ee7603b09f better return check in Magicsig::staticGet() 2010-02-26 17:53:27 -05:00
Zach Copley
dccc995446 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 22:52:49 +00:00
Evan Prodromou
a5cfda8505 blow cache on known replies 2010-02-26 17:47:39 -05:00
Zach Copley
d3fc8e2219 Pull conversation URL from Conversation instead of assuming it's local 2010-02-26 14:47:38 -08:00
Evan Prodromou
dced92d6fd Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 17:29:04 -05:00
Evan Prodromou
4b696cf51f add a flag to impede adding sessions to URLs (for permanent stuff) 2010-02-26 17:28:44 -05:00
James Walker
1cf08c7ad7 MagicEnvelope::parse shouldn't be called statically 2010-02-26 17:09:50 -05:00
James Walker
6ee7660a58 should be sequenceKey (singular) 2010-02-26 16:51:50 -05:00
James Walker
0ecf435dc5 adding sequenceKeys() to magicsig 2010-02-26 16:50:00 -05:00
Zach Copley
1883da6418 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 21:34:39 +00:00
Craig Andrews
a796a7cdc6 nicknamize the requested nickname during autoregistration 2010-02-26 16:31:38 -05:00
James Walker
c82cee1876 removing some extraneous debug logging 2010-02-26 16:26:04 -05:00
Zach Copley
b0acaeafe3 Check for conversation with unique conversation ID 2010-02-26 13:06:06 -08:00
Craig Andrews
74bcc6929d Show messaging on the login and registration forms informing users that they may use their LDAP credentials 2010-02-26 15:51:25 -05:00
Craig Andrews
410cd52434 bail out if the requested nickname is illegal 2010-02-26 15:51:25 -05:00
James Walker
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
James Walker
f23a877cd8 Discovery::lookup now throws an exception 2010-02-26 15:39:58 -05:00
Brion Vibber
9b366547d7 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-26 12:33:50 -08:00
Brion Vibber
517fd54b65 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-02-26 12:33:36 -08:00
Brion Vibber
88ae7f53bb Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-02-26 12:33:13 -08:00
Christopher Vollick
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
James Walker
223ebc765c move signing to take a local actor profile and use local keys 2010-02-26 14:22:49 -05:00
James Walker
3a7eef1074 only put public keys in XRD 2010-02-26 14:22:49 -05:00
James Walker
bbb0a7d5bc updating to use latest salmon NS definitions 2010-02-26 14:22:49 -05:00
Brion Vibber
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
Evan Prodromou
fc576562a3 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-02-26 12:40:59 -05:00
Evan Prodromou
6781f95c73 Merge branch 'blacklistplus' into testing
Conflicts:
	EVENTS.txt
2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635 Merge branch 'testing' into 0.9.x 2010-02-26 09:35:28 -08:00
Brion Vibber
b331e971b0 Merge branch 'master' into testing 2010-02-26 09:35:08 -08:00
Evan Prodromou
c188ae15d9 Blacklist user nickname and password on delete 2010-02-26 12:29:28 -05:00