Evan Prodromou
330041e8bf
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-07-28 13:59:40 -04:00
Evan Prodromou
d155936d98
Merge branch '1.1.x'
2012-07-28 13:59:03 -04:00
Mikael Nordfeldth
19c3cd541d
Issue 3401, ostatus group subscription lands on blank page
2012-07-28 13:58:26 -04:00
Evan Prodromou
f04452c70a
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-07-28 13:55:10 -04:00
Evan Prodromou
3ad77e8bb2
Squashed commit of the following:
...
commit c2e8966fe76a30ce976973d6d4856cb6bff1cfc9
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:20:29 2012 -0400
Do it in ascending date order
commit aff18666662e7ba9f23b2d4c30d49347a761cd0a
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:17:30 2012 -0400
smaller year
commit 73c92c081c68cee5019adf1b9e813c7830dd8f87
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:16:39 2012 -0400
Smaller role footprint
commit a602733dd6f82415706077218f5735b655e47f70
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:14:23 2012 -0400
Add the right to view the log
commit a5e6cc9791e6ed1ca268b19b6c557ec78bc38e2d
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:10:15 2012 -0400
Change column name from 'grant' to 'is_grant' since 'grant' is a SQL keyword
commit 38fbba009cd7ae379583acdc48480829c40c829d
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:05:44 2012 -0400
ModLog::getSchema() -> ModLog::schemaDef()
commit 970e05d52a4a82630df6962929079c778c118a8b
Author: Evan Prodromou <evan@status.net>
Date: Tue Jul 10 12:04:08 2012 -0400
First pass at ModLog plugin
2012-07-10 12:25:40 -04:00
Evan Prodromou
ec3f9b199f
Squashed commit of the following:
...
commit 90620124a20d8c9da19b26920b02b521766c42e4
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 16:50:05 2012 -0400
Add a checkbox to hide OpenID links
commit 47a4a5824208868bd5f4f163456f8e08380e5f36
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 16:35:15 2012 -0400
Don't show the profile links if the hide_profile_link flag is set
commit eafd4b8ba1f7c06c92e5279b1a703c5534aa7255
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 16:30:23 2012 -0400
class for user_openid_prefs table
commit 60e3e3825b20745c08b4d30dbbcac2d7ce604a2f
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 16:29:15 2012 -0400
add User_openid_prefs table and class
2012-07-09 16:54:47 -04:00
Evan Prodromou
51687cd4db
Fix formatting of header
2012-07-09 15:59:10 -04:00
Evan Prodromou
16a091a430
Remove "@" from hover text; most people don't use "@" on Facebook
2012-07-09 13:58:16 -04:00
Evan Prodromou
18ebca5b8f
Better cache key, httpclient reference in FacebookBridgePlugin
2012-07-09 13:37:33 -04:00
Evan Prodromou
206c090688
Squashed commit of the following:
...
commit 7ef19ab918cc9805abb8d01e8220ae4ed63155d7
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 12:53:29 2012 -0400
Show link to facebook account on profile block
If you've logged in with Facebook, show a link to that account on the profile block.
commit b56967479c009d702150791944dbd80746ee3ba1
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 12:28:34 2012 -0400
Add profile link from profile block to Twitter account
Add a profile link to Twitter for accounts that are linked via Twitter login.
commit 181e441fd03c6034e737f6a3dae115557aa3e1aa
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 11:57:56 2012 -0400
OpenID shows other account links
commit ef7357883dad9e34af2746e1c6a41ea826d7c992
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 11:53:12 2012 -0400
Add a profile link for OpenIDs
OpenID plugin now adds a profile link for each OpenID on the account.
commit 093d26b95bc453686d24c42f5a8f4739cb338fd2
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 11:15:18 2012 -0400
Better array access
commit 49d47257efdcae2101b589a1f825872bdd70667c
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 10:57:16 2012 -0400
Show list of other accounts in profile block
We add a group of "rel-me" links to other user accounts on the Web.
This is mostly useful for when you've used OpenID, Twitter, or
Facebook login to associate a remote account.
There's an extension to the profileblock recipe to show the links as
little icons; there's a new hook in accountprofileblock to get such
links from plugins.
There's a modification to the base theme to show the icons correctly
(I think).
2012-07-09 12:56:09 -04:00
Evan Prodromou
b4dbd23ed2
Merge branch '1.1.x'
2012-07-09 09:46:45 -04:00
Evan Prodromou
9034148e0d
Squashed commit of the following:
...
commit f4503f30226fee59160600b5c9b81afc6b610a9d
Merge: 75f3b4e f10e48c
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:45:10 2012 -0400
Merge commit 'refs/merge-requests/194' of git://gitorious.org/statusnet/mainline into merge-requests/194
commit f10e48c361d91ab02efc5577254e1dad3b1dcebe
Author: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu Jul 5 14:28:30 2012 +0200
multiGet returns a correct Notice object for the fetchAll in NoticeList
2012-07-09 09:46:27 -04:00
Evan Prodromou
4b7a91bb81
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
adaf175
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:41:05 2012 -0400
Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196
commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:33:06 2012 -0500
fix for XMPP high CPU usage - issue no 3232
commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:30:34 2012 -0500
fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:40 -04:00
Evan Prodromou
78a8eb5b6e
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
adaf175
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:41:05 2012 -0400
Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196
commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:33:06 2012 -0500
fix for XMPP high CPU usage - issue no 3232
commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:30:34 2012 -0500
fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:05 -04:00
Evan Prodromou
dad72cce28
Merge remote-tracking branch 'origin'
2012-07-09 09:33:42 -04:00
Evan Prodromou
c7ad7bce9f
newer sitestream host
2012-07-06 11:11:53 -04:00
Evan Prodromou
0c6ca3ec41
Merge branch '1.1.x'
2012-07-06 10:47:00 -04:00
Evan Prodromou
8cd1bdc686
Remove Jabber stuff from Twitter daemon
2012-07-06 10:46:48 -04:00
Evan Prodromou
d5564fb8d8
Add a trace, too
2012-07-04 15:14:35 -04:00
Evan Prodromou
7e60bb04e5
Add an exception on remote group join
2012-07-04 15:12:08 -04:00
Evan Prodromou
3ffe2e3f03
Correct sprintf() information
2012-07-03 17:33:27 -04:00
Evan Prodromou
88ce08ca82
Merge branch '1.1.x'
2012-07-03 15:38:11 -04:00
Siebrand Mazeland
51b28eda19
Localisation updates from http://translatewiki.net .
2012-06-30 11:10:38 +00:00
Siebrand Mazeland
f2d66082b4
Localisation updates from http://translatewiki.net .
2012-06-24 18:26:18 +00:00
Siebrand Mazeland
707076fca9
Localisation updates from http://translatewiki.net .
2012-06-17 23:26:20 +00:00
Evan Prodromou
dc4a42e600
Log channel info
2012-06-17 10:15:42 -04:00
Evan Prodromou
ec264fcd90
Add some delivery logging
2012-06-17 10:10:52 -04:00
Evan Prodromou
8b98c93e90
Fix end-of-line error
2012-06-17 10:05:57 -04:00
Evan Prodromou
97099e08c5
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-06-17 09:53:45 -04:00
Evan Prodromou
f5af67ce68
Skip on already-exists error
2012-06-17 09:52:35 -04:00
Siebrand Mazeland
c658ede37c
Localisation updates from http://translatewiki.net .
2012-06-10 23:42:52 +00:00
Siebrand Mazeland
bc733a200f
Localisation updates from http://translatewiki.net .
2012-06-04 15:02:34 +00:00
Siebrand Mazeland
f059977c57
Localisation updates from http://translatewiki.net .
2012-05-26 21:15:30 +00:00
Mikael Nordfeldth
fcb1b115fc
MIME type for jpeg is with an e
2012-05-24 23:24:53 +02:00
Mikael Nordfeldth
bd8178592c
adding the odd but reported Twitter avatar .jpeg file extension
2012-05-24 23:09:56 +02:00
Mikael Nordfeldth
b2a91944bb
retaining compatibility with previous TwitterBridge getMediatype
2012-05-24 23:08:40 +02:00
Mikael Nordfeldth
4c853f8117
Fixes issue #3612 with Twitter avatars that lack extension
2012-05-24 14:31:42 +02:00
Siebrand Mazeland
cd77348852
Localisation updates from http://translatewiki.net .
2012-05-20 11:10:38 +00:00
Evan Prodromou
2c70680b24
Chance to train unknown
2012-05-16 12:26:29 -04:00
Siebrand Mazeland
2e4e2f693d
Localisation updates from http://translatewiki.net .
2012-05-12 18:47:41 +00:00
Siebrand Mazeland
6f557d3654
Localisation updates from http://translatewiki.net .
2012-05-06 17:08:47 +00:00
Evan Prodromou
0fec1872cd
Whoops! Append didn't work
2012-05-04 22:20:47 -04:00
Evan Prodromou
a504d2aee2
Let DB_DataObject find Spam_score
2012-05-04 22:16:46 -04:00
Evan Prodromou
961607bc5d
Ignore non-atom updates links in Webfinger
2012-05-04 12:01:13 -04:00
Evan Prodromou
c5ae53166c
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-05-04 11:39:55 -04:00
Siebrand Mazeland
eafe507068
Localisation updates from http://translatewiki.net .
2012-05-03 22:13:22 +00:00
Siebrand Mazeland
c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
Evan Prodromou
ab053fe2ca
Don't always make spam_score writeable
2012-04-26 11:59:54 -04:00
Evan Prodromou
ffc2c72bc1
fix a problem with the facebookbridge translation in eu
2012-04-23 21:05:03 -04:00
Siebrand Mazeland
3898500ff9
Localisation updates from http://translatewiki.net .
2012-04-21 10:21:38 +00:00
Evan Prodromou
558e33436c
change script path for new position in plugins/ActivitySpam
2012-04-17 11:57:45 -04:00
Evan Prodromou
7a9777df05
Merge ActivitySpam plugin
2012-04-17 09:02:48 -04:00
Evan Prodromou
20dc5addb7
Fix FacebookBridge es translation
2012-04-16 16:04:31 -04:00
Evan Prodromou
36d724cf03
Merge branch '1.0.x'
2012-04-16 15:49:09 -04:00
Siebrand Mazeland
b2c5b9de52
Localisation updates from http://translatewiki.net .
2012-04-15 12:11:05 +00:00
Siebrand Mazeland
71a9644b35
Localisation updates from http://translatewiki.net .
2012-04-09 01:38:31 +02:00
Evan Prodromou
b2639b723f
add created timestamp
2012-04-02 22:32:47 -04:00
Evan Prodromou
e06bb8ead5
correctly update sites
2012-04-02 22:08:14 -04:00
Evan Prodromou
04ad0838be
Add spam-training, spam-reviewing rights
...
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
2012-03-25 13:18:16 -04:00
Siebrand Mazeland
c0b5c16ded
Localisation updates from http://translatewiki.net .
2012-03-11 22:12:34 +01:00
Siebrand Mazeland
3b3671b228
Localisation updates from http://translatewiki.net .
2012-03-11 22:12:10 +01:00
Siebrand Mazeland
855fbfa782
Fix accidental revert by Evan in b4da5f3785
.
2012-03-11 21:46:29 +01:00
Evan Prodromou
b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Siebrand Mazeland
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
Siebrand Mazeland
be71f1e4e7
Fix grammar.
2012-02-27 15:56:35 +01:00
Evan Prodromou
aa14a14f86
using wrong rules for facebook replies
2012-02-20 11:29:49 -05:00
Evan Prodromou
183ffce78f
check reply_to flag before sending replies to Facebook
2012-02-20 10:58:56 -05:00
Evan Prodromou
5b6ecef24b
script to gc all feeds
2012-01-27 16:12:54 -05:00
Evan Prodromou
e4085087f1
non-existent poco
2012-01-27 15:32:13 -05:00
Evan Prodromou
d28f726c5c
weird error with SubMirror
2012-01-27 15:27:46 -05:00
Evan Prodromou
d625364354
LOG_ERROR -> LOG_ERR for SubMirror
2012-01-27 15:01:51 -05:00
Evan Prodromou
108d5d8d17
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-01-26 11:04:54 -05:00
Evan Prodromou
f21f09f8b8
Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline into merge-requests/2227
2012-01-26 11:03:04 -05:00
Evan Prodromou
259a262df4
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-01-21 21:12:53 -05:00
Evan Prodromou
b475c871a4
add displayName and targetUrl to activity JSON
2012-01-21 21:12:20 -05:00
Siebrand Mazeland
cebb565f18
Localisation updates from http://translatewiki.net .
2012-01-20 20:07:45 +01:00
Evan Prodromou
e3f06ee220
Use X-Client header for IP for load-balancers
2012-01-10 10:51:36 -05:00
Evan Prodromou
9092eb5535
throw exception on sphinx search error
2011-12-30 23:09:17 -08:00
Siebrand Mazeland
31305cb743
Localisation updates from http://translatewiki.net .
2011-12-28 14:00:49 +01:00
Siebrand Mazeland
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
Jean Baptiste Favre
a7507e3685
Fix for #3463 . Make InfiniteScroll plugin use config['plugins']['server'] if defined to build ajax-loader.gif URL
2011-12-18 16:19:32 +01:00
Jean Baptiste Favre
8658d9618a
Makes ClientSideShorten loading shorten.js from config['plugins']['server'] if setted. Fix #3528
2011-12-18 15:09:53 +01:00
Jean Baptiste Favre
184290b5cf
Add my name to TwitterBridgePlugin onPluginVersion function
2011-12-18 12:17:28 +01:00
Jean Baptiste Favre
3e0a02f52d
Enhance is_twitter_bound function from file plugins/TwitterBridge/twitter.php to deal with new-style replies from Web UI not using at-mention replies anymore, which caused all replies to be sent to Twitter. Definitely fix #3386
2011-12-18 12:13:42 +01:00
Jean Baptiste Favre
f57a35a916
Fix missing variable in InfiniteScrollPlugin class. Fix issue #3525
2011-12-13 22:09:08 +01:00
Jean Baptiste Favre
ac5e29de5a
Fix precedence issue causing all replies to be sent to Twitter. Fix #3386
2011-12-13 20:30:03 +01:00
Siebrand Mazeland
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
Siebrand Mazeland
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
Evan Prodromou
b5e1cf13e6
Merge branch '1.0.x'
2011-11-07 12:36:52 -05:00
Siebrand Mazeland
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
Evan Prodromou
a4ec8bb047
More free email domains
2011-10-25 10:00:19 -04:00
Evan Prodromou
ec20544baf
More free or consumer email domains
2011-10-25 09:42:02 -04:00
Evan Prodromou
053e99733f
add rel=nofollow to bookmark links if needed
2011-10-20 11:47:44 -04:00
Evan Prodromou
e64ae1f03d
Don't start <p> element until we've checked for attachments
2011-10-20 10:57:58 -04:00
Evan Prodromou
d27b7627a5
more robust handling of bad data in offline backup queue handler
2011-10-12 17:03:56 -04:00
Siebrand Mazeland
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
Evan Prodromou
70827f3379
write all activity files to the feed file
2011-10-07 14:37:09 -04:00
Evan Prodromou
7075214589
dump out activities to directory
2011-10-07 13:56:47 -04:00
Evan Prodromou
7f4b23b8ed
Use string output
2011-10-07 10:30:22 -04:00
Evan Prodromou
0d35673d5a
add version for OfflineBackup
2011-10-07 10:01:44 -04:00
Evan Prodromou
737e23544a
send backup files
2011-10-07 09:36:52 -04:00
Evan Prodromou
d92acda02a
start doing some writing
2011-10-06 17:31:50 -04:00
Evan Prodromou
d37bc805c6
first pass, some files ready
2011-10-05 12:05:05 -04:00
Zach Copley
7dcb27672f
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 19:52:16 +00:00
Zach Copley
c137d69aee
Switch from oohembed to noembed for default oembed provider
2011-09-30 19:51:23 +00:00
Evan Prodromou
1094e7c2c6
Update openid docs
2011-09-30 14:52:51 -04:00
Evan Prodromou
4af466f1a6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 14:25:06 -04:00
Evan Prodromou
82badb19c7
Move docs menu to site primary menu
2011-09-30 14:24:27 -04:00
Zach Copley
e7ef9e2117
Remove gettext wrapper from log msg
2011-09-30 18:20:22 +00:00
Zach Copley
1d2a3be88e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 18:15:38 +00:00
Zach Copley
fd62f6b934
Don't throw exception if bookmark has no attachments; log error and render as normal notice instead.
2011-09-30 18:13:25 +00:00
Evan Prodromou
e3c010a870
try to check whether file exists over and over and over
2011-09-30 13:03:42 -04:00
Evan Prodromou
4e5af7513c
50px more for bookmarklet popup
2011-09-30 10:15:40 -04:00
Evan Prodromou
2e8d92dbe9
use the 'top' action for bookmarklet popup
2011-09-30 10:10:15 -04:00
Evan Prodromou
3aad58c37f
Only show some profiles in events
2011-09-30 09:40:15 -04:00
Zach Copley
d438a55434
Fix navigation for SubMirrorPlugin
2011-09-29 20:11:51 +00:00
Samantha Doherty
d51a93ddb9
Quick style for event attendee avatar lists.
2011-09-29 16:00:10 -04:00
Evan Prodromou
699a90f11c
Show Event attendees in mini-list
2011-09-29 15:12:30 -04:00
Evan Prodromou
797e187acb
Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline into merge-requests/174
2011-09-28 16:14:42 -04:00
Scott Sweeny
94b524d6dc
plugins/MobileProfile/MobileProfilePlugin.php: add 'maemo' to recognized devices
2011-09-27 23:54:42 -04:00
Zach Copley
8ca9f33f45
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 16:59:43 +00:00
Zach Copley
cd30c94096
Move check for valid access token to the right place
2011-09-27 16:59:10 +00:00
Evan Prodromou
23e02ea76a
Merge branch '1.0.x' into testing
2011-09-27 11:45:24 -04:00
Evan Prodromou
9f954eddc5
remove unsupported hcard action
2011-09-27 11:43:41 -04:00
Zach Copley
ec53e68cf2
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 04:33:00 +00:00
Zach Copley
000e5c0c01
Do a better job of saving the original avatar from Facebook
2011-09-27 04:31:41 +00:00
Zach Copley
3b28f226c7
Facebook bridge back in business with new JS-SDK and OAuth 2.0 flow.
...
Might be better to rewrite the login mechanism to use server side flow
now that Facebook provides it.
2011-09-27 04:09:47 +00:00
Evan Prodromou
eb711321c3
Merge branch '1.0.x' into testing
2011-09-26 14:10:43 -04:00
Samantha Doherty
b0ee583270
Tiny layout fix for QnA.
2011-09-26 08:26:38 -04:00
Zach Copley
634fb64c11
Facebook bridge mostly working again with new OAuth 2.0 flow
2011-09-26 05:32:19 +00:00
Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Zach Copley
118e84be19
Update to latest Facebook PHP sdk
2011-09-22 15:47:55 -07:00
Evan Prodromou
59043dca7f
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
...
Conflicts:
classes/Avatar.php
I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou
1014e295ee
bad sprintf format for new follow activity notices
2011-09-21 10:18:16 -04:00
Evan Prodromou
838c3988ee
Change defaults for ActivityPlugin to only log joins and follows
2011-09-21 10:15:34 -04:00
Zach Copley
58b9f83a02
Allow repeats to flow through the Twitter bridge
2011-09-21 05:23:47 +00:00
Zach Copley
c9cbc31481
Don't send notices from the ActivityPlugin to Twitter
2011-09-21 02:31:51 +00:00
Evan Prodromou
ac1ea3e8cf
Remove template plugin
...
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Evan Prodromou
0ee660af23
fix problem with using wrong arg to EndLeaveGroup event
2011-09-18 19:28:17 -04:00
Evan Prodromou
822cb1482a
right URLs for search subs
2011-09-18 19:20:28 -04:00
Evan Prodromou
e2914189f3
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-18 17:33:38 -04:00
Evan Prodromou
bba39c4aaf
reorder routes for ostatus for better matches
2011-09-18 17:32:59 -04:00
Evan Prodromou
52ed4678f3
correct link for searchsubs
2011-09-18 17:32:13 -04:00
Zach Copley
116840a80e
Reorder directory router connections / fix regex
2011-09-18 13:35:09 -07:00
Evan Prodromou
dbb7324b25
test for missing profile in ostatus queue handler
2011-09-18 14:36:49 -04:00
Evan Prodromou
2f1953ca25
Correct args for join event
2011-09-18 14:06:35 -04:00
Evan Prodromou
75bdc37b61
Correct args for join event
2011-09-18 14:06:27 -04:00
Evan Prodromou
e43ea4c9f5
fix RealtimePlugin root hack hack
2011-09-18 13:03:12 -04:00
Evan Prodromou
06f19d523a
inverted if() in RealtimePlugin check for tag
2011-09-18 12:52:00 -04:00
Evan Prodromou
915dd9c9b5
Copy-and-paste error in OStatus button output
2011-09-18 12:44:16 -04:00
Evan Prodromou
01ea6a18f9
make activity plugin use its own notice source
2011-09-18 12:40:17 -04:00
Evan Prodromou
3d4ea0a71f
Correct the routes for notice and user sitemaps
2011-09-18 12:14:43 -04:00
Evan Prodromou
7c1d73ed3d
Sitemap plugin no longer forces an index on user.created
2011-09-18 12:07:59 -04:00
Zach Copley
670288e68f
Merge branch 'twitter-bridge-fixes'
...
* twitter-bridge-fixes:
Make sure the session token gets output no matter what (whoops)
Move submit (connect) button to the very bottom
Move license checkbox to the end of the form
Don't allow Twitter registration if site is invite only
2011-09-17 16:33:28 -07:00
Zach Copley
d4ed6db1d8
Make sure the session token gets output no matter what (whoops)
2011-09-17 15:50:13 -07:00
Zach Copley
2df2d4fd1d
Move submit (connect) button to the very bottom
2011-09-17 15:45:55 -07:00
Zach Copley
be95dcf008
Move license checkbox to the end of the form
2011-09-17 15:43:21 -07:00
Evan Prodromou
1040f1346c
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 18:27:37 -04:00
Evan Prodromou
5c0e8d2a2f
fix link for mobile profile when in singleuser mode
2011-09-17 18:20:08 -04:00
Zach Copley
6c43967e8c
Don't allow Twitter registration if site is invite only
2011-09-17 14:47:35 -07:00
Zach Copley
985f52ce60
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
problem with remote subscription on groups in OStatus
show correct favorites link
2011-09-17 14:39:26 -07:00
Zach Copley
4467615021
Fix reference to constant
2011-09-17 14:38:47 -07:00
Evan Prodromou
f52d33753e
problem with remote subscription on groups in OStatus
2011-09-17 17:28:01 -04:00
Zach Copley
b34812152d
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:36:05 -07:00
Zach Copley
baa17381c0
Change time format to work with older PHP (before 5.3)
2011-09-17 13:29:45 -07:00
Evan Prodromou
467b840c44
move OMB-specific remote login button to OMB Plugin
2011-09-17 15:08:38 -04:00
Evan Prodromou
9f6adb3f52
Merge branch '1.0.x' into testing
2011-09-15 17:06:27 -04:00
Evan Prodromou
6e480d2458
Upgrade 0.9.x bookmarks to 1.0.x
2011-09-15 17:06:05 -04:00
Evan Prodromou
0b1d8762c6
include q as param, not arg for search sub menu
2011-09-15 11:00:27 -04:00
Evan Prodromou
fa18e6365e
add default groupdirectory route
2011-09-14 12:18:22 -04:00
Siebrand Mazeland
16c24b66bb
Remove two incorrect strings for now.
2011-09-11 16:56:33 +02:00
Siebrand Mazeland
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
Evan Prodromou
5eba1030ae
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-09-08 08:59:16 -04:00
Zach Copley
449451b8e7
* Validate event URL
...
* Remove more debugging statements
2011-09-08 01:14:24 -07:00
Zach Copley
a910d28132
Remove debugging statement
2011-09-08 00:49:58 -07:00
Zach Copley
b991ded816
Re-do the logic for the event micro-app's dropdowns (way trickier than it seems at first blush).
2011-09-08 00:45:56 -07:00
Evan Prodromou
c5d332f40a
move yet-another-rediscover-script to OStatus plugin
2011-09-07 16:56:38 -04:00
Jean Baptiste Favre
e25400b4f2
Fix BitlyUrl plugin.
...
Since Bit.ly changed its API from v2 to v3, BitlyURL plugin doesn't work anymore.
This fix API version issue and also imporve a little plugin performance in removing useless code.
2011-09-03 22:41:46 +02:00
Zach Copley
5f441842be
Fix warning / send current user in to Notice::asActivity
2011-08-31 13:10:12 -07:00
Siebrand Mazeland
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
Siebrand Mazeland
c9139cc6e0
Add translator documentation.
...
Update punctuation for a few messages.
Leading tabs to spaces.
2011-08-30 11:37:20 +02:00
Siebrand Mazeland
6ae673fd3f
Add i18n file.
2011-08-30 11:23:42 +02:00
Siebrand Mazeland
3e60d4cb3f
Number parameters in messages that have multiple parameters
...
Trim trailing whitespace
Leading tabs to spaces
Remove superfluous whitespace
2011-08-30 10:56:00 +02:00
Evan Prodromou
2522f888c7
Static -> static
2011-08-27 17:42:31 -04:00
Jordan Conway
9bf815be0d
fixed typo http://status.net/open-source/issues/3289
2011-08-27 12:11:00 -07:00
Evan Prodromou
ebaf5a972e
add a return to the error path for new events
2011-08-27 14:56:02 -04:00
Evan Prodromou
6132bddabc
don't use fetchAll() when you've done a query()
2011-08-27 13:14:31 -04:00
Evan Prodromou
f81c1f7554
use an array of profiles rather than a looping cursor for profile lists
2011-08-27 12:53:15 -04:00
Evan Prodromou
01fd24ce6a
Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch()
2011-08-27 12:06:34 -04:00
Evan Prodromou
817e1507ed
Catch missing profile in realtime server
2011-08-27 10:58:11 -04:00
Samantha Doherty
41f06d96d4
Quick fix to make custom site logos work better.
2011-08-26 15:35:00 -04:00
Samantha Doherty
37bb0e6d20
Style cleanup for ostatus forms.
2011-08-26 12:51:55 -04:00
Evan Prodromou
c0bae505d9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 18:03:30 -04:00
Samantha Doherty
2dd13b071c
Update DirectionDetector style for 1.0 and move to base stylesheet.
2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a
Style for Activity notices.
2011-08-25 16:24:54 -04:00
Evan Prodromou
654fdf2fa4
Don't try to read the URLs in system notices
2011-08-25 12:59:40 -04:00
Evan Prodromou
1593c97bc1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 12:34:32 -04:00
Samantha Doherty
c54b3311fd
Style cleanup for QnA.
2011-08-25 12:25:10 -04:00
Samantha Doherty
85aba15830
Style cleanup for Mobile Profile.
2011-08-25 12:24:09 -04:00
Evan Prodromou
3b4d3c6ac3
actions are directed to affected group or person
2011-08-25 12:18:51 -04:00