Mikael Nordfeldth
0bbcfa7bdf
IMPORTANT - fixed HubSub to properly fetch primary keys
...
In commit e95f77d34c
HubSub lost the
'staticGet' function in a consolidation into the Managed_DataObject class.
This was done carelessly by me as HubSub::staticGet was actually taking
two arguments, none of which was a key and merging them in HubSub::hashkey()
(staticGet was renamed getKV 2a4dc77a63
).
NOTE: This complements commit 7e4718a4eb
which
fixed a similar issue for the Magicsig class.
2013-08-21 11:25:08 +02:00
Mikael Nordfeldth
66997f2bec
OStatus classes now has modern schemaDef
2013-08-21 11:01:31 +02:00
Mikael Nordfeldth
3a7261f70a
IMPORTANT: Making prev. Memcached_DataObject working again with schemaDef
...
Lots of the Memcached_DataObject classes stopped working when upgraded to
Managed_DataObject because they lacked schemaDef().
I have _hopefully_ made it so that all the references to the table uses
each class' schemaDef, rather than the more manual ColumnDef stuff. Not
all plugins have been tested thoroughly yet.
NOTE: This is applied with getKV calls instead of staticGet, as it was
important for PHP Strict Standards compliance to avoid calling the non-
static functions statically. (unfortunately DB and DB_DataObject still do
this within themselves...)
2013-08-21 09:48:42 +02:00
Mikael Nordfeldth
6f4c572389
Unnecessary UTF-8 declaration for database
2013-08-20 09:43:23 +02:00
Mikael Nordfeldth
e40044e2fa
Further static declarations of functions
...
Validate could probably be replaced with filter_var if desired (PHP>=5.2.0)
2013-08-19 14:26:44 +02:00
Mikael Nordfeldth
d5f82bb051
Class wasn't used anywhere, and file contained wrong class
2013-08-19 14:09:57 +02:00
Mikael Nordfeldth
7e4718a4eb
IMPORTANT - fixed Magicsig to properly overload getKV (prev. staticGet)
...
In commit e95f77d34c
Magicsig lost the 'staticGet' function (later renamed to getKV in 2a4dc77a63
), which was important to properly initialize the Magicsig object (fromString)
2013-08-18 19:07:18 +02:00
Mikael Nordfeldth
861e838add
pkeyGet is now static and more similar to getKV
...
Memcached_DataObject now defines
* pkeyGetClass to avoid collision with Managed_DataObject pkeyGet
* getClassKV to avoid collision with Managed_DataObject getKV
2013-08-18 15:42:51 +02:00
Mikael Nordfeldth
1710a619a8
Magicsig class now Managed_DataObject with nicer schemaDef
2013-08-18 15:31:18 +02:00
Mikael Nordfeldth
ade2bdc31b
Bookmark class now has schemaDef (for Managed_DataObject)
2013-08-18 15:03:06 +02:00
Mikael Nordfeldth
2a4dc77a63
The overloaded DB_DataObject function staticGet is now called getKV
...
I used this hacky sed-command (run it from your GNU Social root, or change the first grep's path to where it actually lies) to do a rough fix on all ::staticGet calls and rename them to ::getKV
sed -i -s -e '/DataObject::staticGet/I!s/::staticGet/::getKV/Ig' $(grep -R ::staticGet `pwd`/* | grep -v -e '^extlib' | grep -v DataObject:: |grep -v "function staticGet"|cut -d: -f1 |sort |uniq)
If you're applying this, remember to change the Managed_DataObject and Memcached_DataObject function definitions of staticGet to getKV!
This might of course take some getting used to, or modification fo StatusNet plugins, but the result is that all the static calls (to staticGet) are now properly made without breaking PHP Strict Standards. Standards are there to be followed (and they caused some very bad confusion when used with get_called_class)
Reasonably any plugin or code that tests for the definition of 'GNUSOCIAL' or similar will take this change into consideration.
2013-08-18 13:13:56 +02:00
Mikael Nordfeldth
e95f77d34c
Updating all Memcached_DataObject extended classes to Managed_DataObject
...
In some brief tests, this causes no problems.
In this state however, you would need to modify DB_DataObject to have a static declaration of staticget (and probably pkeyGet). The next commit will change the staticGet overload to a unique function name (like getKV for getKeyValue), which means we can properly call the function by PHP Strict Standards.
2013-08-18 12:32:32 +02:00
Mikael Nordfeldth
c36608b233
Some statically called functions in plugins now declared statically
2013-08-18 11:18:45 +02:00
Mikael Nordfeldth
6c4c4319ef
Plugins with classes that extend Managed_DataObject get better code reuse
...
The switch to having a function in Managed_DataObject is now being applied
to plugins which can use this as well.
There are some plugins that still use Memcached_DataObject, but these will
be taken care of later.
2013-08-12 20:00:01 +02:00
Mikael Nordfeldth
f11d157b8b
visual presentation of group's homepage href was its local stream url
2013-08-12 13:04:44 +02:00
Mikael Nordfeldth
e47d9ad50d
Added author name to modified file
2013-08-12 12:57:47 +02:00
Mikael Nordfeldth
7eecd93473
_m function for translation seems to be what we use
2013-08-12 12:56:44 +02:00
Mikael Nordfeldth
2e8b729503
Issue 3636 request clarity for users without validated emails on instances with RequireValidatedEmail active
2013-08-12 12:56:40 +02:00
Mikael Nordfeldth
1095f7a935
new plugin to check, store and migrate password hashes to crypt()
2013-08-12 12:54:51 +02:00
Mikael Nordfeldth
3ad3535cd8
Merge commit 'refs/merge-requests/230' of git://gitorious.org/statusnet/mainline into merge-requests/230
2013-08-12 12:37:46 +02:00
Mikael Nordfeldth
f79aec36fe
Merge remote-tracking branch 'statusnet/master'
...
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.
Conflicts:
doc-src/about
doc-src/faq
plugins/OpenID/doc-src/openid
2013-08-12 12:23:17 +02:00
Evan Prodromou
3fc1d245a1
Merge 1.1.x into master
2013-07-16 10:57:06 -07:00
Jean Baptiste Favre
f1a3d5a386
PHP 5.4 Fix GetValidDaemons function definition for Xmpp & TwitterBridge plugins
2013-06-19 13:25:28 +02:00
Jean Baptiste Favre
c23efdbdb0
PHP 5.4 compatibility: remove call-time pass by reference
2013-06-19 11:16:05 +02:00
Jean Baptiste Favre
707dd44f6b
Merge commit 'merge-requests/192' into statusnet_1.1.x
2013-06-15 20:11:24 +02:00
Jean Baptiste Favre
1b39f89b96
Add configuration check. Need 'server', 'port', 'user' and 'password' to be defined (not valid, just defined).
2013-06-15 18:59:17 +02:00
Jean Baptiste Favre
b8a69d023b
Add basic support for GetValidDaemon event. Shall be extended with configuration check.
2013-06-15 18:59:16 +02:00
Jean Baptiste Favre
93c8969a27
Remove alone 'groups' link on the left side. Useless I guess.
2013-06-15 18:41:04 +02:00
Jean Baptiste Favre
5a0f17933b
Display notices for remote profile. Would like to hide avatar like in local profile but did not found how to do it.
2013-06-15 18:41:04 +02:00
Jean Baptiste Favre
d48076253b
Fix error 'No matches for action subscriptions with arguments nickname...' when displaying remote profile.
2013-06-15 18:41:04 +02:00
Jean Baptiste Favre
d36f443666
Bookmark plugin enhancement: display Bookmark's list. Integration of @chimo's work ( http://http://sn.chromic.org/ ) from https://github.com/chimo/BookmarkList into official plugin.
2013-06-15 18:31:05 +02:00
Jean Baptiste Favre
246e840dd3
Fix INSTALLDIR constant definition.
2013-06-15 15:20:19 +02:00
Jean Baptiste Favre
dfafab6c4f
Fix for #3463 . Make InfiniteScroll plugin use config['plugins']['server'] if defined to build ajax-loader.gif URL
2013-06-15 13:13:15 +02:00
Jean Baptiste Favre
b05130bfb8
Fix missing variable in InfiniteScrollPlugin class. Fix issue #3525
2013-06-15 13:12:19 +02:00
Jean Baptiste Favre
d211348dae
Makes ClientSideShorten loading shorten.js from config['plugins']['server'] if setted. Fix #3528
2013-06-15 12:34:25 +02:00
Jean Baptiste Favre
80da81ba14
Get rid of t.co links for notice's text version. Usefull for client using API. Complements merge-request #205 by @mmn
2013-06-15 11:30:17 +02:00
Jean Baptiste Favre
108aa5c467
Replace t.co links with expanded one provided by Twitter. Can still be a shortened one & will be done only for HTML view, but still a start. Backport of merge_requests/205.
2013-06-15 11:29:09 +02:00
Jean Baptiste Favre
f18b516c7a
Get rid of t.co links for notice's text version. Usefull for client using API. Complements merge-request #205 by @mmn
2013-06-14 23:28:44 +02:00
Jean Baptiste Favre
f726c6b23f
Makes TwitterBridge plugin use Twitter API 1.1 instead of API 1 which is deprecated and will be switched off soon
2013-02-18 23:22:45 +01:00
Jean Baptiste Favre
a10a34a3cf
Make TwitterBridge plugin use Queueing system
2013-02-18 23:22:08 +01:00
Jean Baptiste Favre
dd97468c72
Add Twitter mention import support
2013-02-18 23:16:06 +01:00
Evan Prodromou
0c694e16a5
Check that it's spam!
2013-02-13 10:55:32 -05:00
Evan Prodromou
cc98a0b76f
show percentage in output
2013-02-13 10:04:43 -05:00
Evan Prodromou
bcba3e68a3
Updates to silencespammer from production
2013-02-13 10:01:09 -05:00
Evan Prodromou
0362ba7e32
Script to silence spammers
2013-02-13 09:50:53 -05:00
Evan Prodromou
35499a9952
Add a flag to not deliver poll responses to home timeline
...
Some people really hate getting poll responses in their home timeline,
so there's now a flag to disable that.
2012-11-06 10:25:39 -05:00
Jean Baptiste Favre
ae3eaee6cd
Merge commit 'refs/merge-requests/182' of gitorious.org:statusnet/mainline into 1.1.x
2012-09-19 09:58:14 +02:00
Jean Baptiste Favre
c11bc8a9ba
Merge commit 'refs/merge-requests/181' of git://gitorious.org/statusnet/mainline into statusnet_1.1.x
2012-09-19 09:39:47 +02:00
Jean Baptiste Favre
0b53b6768e
Merge remote-tracking branch 'statusnet/180' into statusnet_1.1.x
2012-09-19 00:07:29 +02:00
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