1795267df9
Latest phpseclib stuff and moved into its own dir.
...
Source: https://github.com/phpseclib/phpseclib/
Commit: 77447a3fc7869773007fa3beeb8d6f8de842ec2a
There were bugs.
2013-10-05 00:22:14 +02:00
cd6fa512ac
Twitter Import + avatar fixes (cleaning up + fixing)
...
...there was also a typo in OstatussubAction ($avatarUrl not defined)
2013-10-03 15:28:51 +02:00
b0dfc70a54
Properly unlink all old avatars when deleting/uploading a new
...
We're also now using $config['image']['jpegquality'] to determine the
quality setting for resized images.
To set Avatar max size, adjust $config['avatar']['maxsize']
The getAvatar call now throws exceptions too. Related changes applied.
Now let's move Profile->avatarUrl to the Avatar class!
2013-10-01 17:00:10 +02:00
a7e748479c
Fixed regression in OStatus sub from WebFinger/XML_XRD update
...
XML_XRD::getAll requires arguments (at least relation). If one really
want all links, just get the 'links' array. It's public!
Also, not all XML_XRD_Element_Link were migrated from the previous
array style.
2013-09-30 23:33:28 +02:00
a0e107f17f
Implemented WebFinger and replaced our XRD with PEAR XML_XRD
...
New plugins:
* LRDD
LRDD implements client-side RFC6415 and RFC7033 resource descriptor
discovery procedures. I.e. LRDD, host-meta and WebFinger stuff.
OStatus and OpenID now depend on the LRDD plugin (XML_XRD).
* WebFinger
This plugin implements the server-side of RFC6415 and RFC7033. Note:
WebFinger technically doesn't handle XRD, but we serve both that and
JRD (JSON Resource Descriptor), depending on Accept header and one
ugly hack to check for old StatusNet installations.
WebFinger depends on LRDD.
We might make this even prettier by using Net_WebFinger, but it is not
currently RFC7033 compliant (no /.well-known/webfinger resource GETs).
Disabling the WebFinger plugin would effectively render your site non-
federated (which might be desired on a private site).
Disabling the LRDD plugin would make your site unable to do modern web
URI lookups (making life just a little bit harder).
2013-09-30 22:04:52 +02:00
44f7ad612a
Correctly distribute notices from remote posters through local groups to remote group-members via OStatus.
...
Allow the OStatus queue-handler to handle all posts,
and give it the smarts required to make correct decisions
about whether it should or shouldn't relay notices
over OStatus.
cf. http://status.net/open-source/issues/3540
Conflicts (staticGet => getKV):
plugins/OStatus/lib/ostatusqueuehandler.php
2013-09-29 23:19:11 +02:00
633191d808
Making sure scripts and tests check for GNUSOCIAL defined (instead of STATUSNET)
...
Orbited plugin may not work at all anymore, I had no means to try it.
But there's a check whether 'LACONICA' is defined there, which is a
very unlikely thing in the future. So far only tests and scripts have
been migrated consistently, though.
2013-09-28 15:20:10 +02:00
f7719b57f2
phpseclib extlib updated from phpseclib.sf.net
2013-09-24 02:09:37 +02:00
1c6f9df80e
PHP5.5 fix: Better use of startXML for Action classes (mostly AJAX)
...
I had a problem with PHP5.5 that caused ajax responses to be empty. This
fixes it, as the problem was related to pretty inconsistent calling to
headers, XMLWriter::startDocument etc. etc.
2013-09-24 01:18:33 +02:00
8205c56e25
Stylesheet event now removed of StatusNet-remnants
2013-09-23 22:13:12 +02:00
63306081bc
Subscription "get by" functions now don't use ArrayWrappers
...
They were getting in the way of some strict-typing stuff.
2013-09-21 18:38:14 +02:00
dfa1b15dd6
Changing js .live calls to .on for jquery 2.x
2013-09-10 18:52:09 +02:00
747fe9d59b
Tidying up getUser calls to profiles and some events
...
getUser calls are much more strict, and one place where this was found was
in the (un)subscribe start/end event handlers, which resulted in making the
Subscription class a bit stricter, regarding ::start and ::cancel at least.
Several minor fixes in many files were made due to this.
This does NOT touch the Foreign_link function, which should also have a more
strict getUser call. That is a future project.
2013-09-09 23:03:34 +02:00
de55d8f83b
plugins onAutoload now only overloads if necessary (extlibs etc.)
...
lib/plugin.php now has a parent onAutoload function that finds most common
files that are used in plugins (actions, dataobjects, forms, libs etc.) if
they are put in the standardised directories ('actions', 'classes', 'forms',
'lib' and perhaps some others in the future).
2013-08-28 16:10:30 +02:00
40fe10e002
Woops, forgot auto_increment (comes with 'serial')
...
There are still some classes not ported (like Yammer import)
2013-08-21 15:02:44 +02:00
0bbcfa7bdf
IMPORTANT - fixed HubSub to properly fetch primary keys
...
In commit e95f77d34c2a4dc77a637e4718a4eb
2013-08-21 11:25:08 +02:00
66997f2bec
OStatus classes now has modern schemaDef
2013-08-21 11:01:31 +02:00
6f4c572389
Unnecessary UTF-8 declaration for database
2013-08-20 09:43:23 +02:00
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
7e4718a4eb
IMPORTANT - fixed Magicsig to properly overload getKV (prev. staticGet)
...
In commit e95f77d34c2a4dc77a63
2013-08-18 19:07:18 +02:00
1710a619a8
Magicsig class now Managed_DataObject with nicer schemaDef
2013-08-18 15:31:18 +02:00
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
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
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
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
246e840dd3
Fix INSTALLDIR constant definition.
2013-06-15 15:20:19 +02:00
330041e8bf
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-07-28 13:59:40 -04:00
19c3cd541d
Issue 3401, ostatus group subscription lands on blank page
2012-07-28 13:58:26 -04:00
d5564fb8d8
Add a trace, too
2012-07-04 15:14:35 -04:00
7e60bb04e5
Add an exception on remote group join
2012-07-04 15:12:08 -04:00
51b28eda19
Localisation updates from http://translatewiki.net .
2012-06-30 11:10:38 +00:00
f2d66082b4
Localisation updates from http://translatewiki.net .
2012-06-24 18:26:18 +00:00
707076fca9
Localisation updates from http://translatewiki.net .
2012-06-17 23:26:20 +00:00
c658ede37c
Localisation updates from http://translatewiki.net .
2012-06-10 23:42:52 +00:00
bc733a200f
Localisation updates from http://translatewiki.net .
2012-06-04 15:02:34 +00:00
f059977c57
Localisation updates from http://translatewiki.net .
2012-05-26 21:15:30 +00:00
cd77348852
Localisation updates from http://translatewiki.net .
2012-05-20 11:10:38 +00:00
2e4e2f693d
Localisation updates from http://translatewiki.net .
2012-05-12 18:47:41 +00:00
6f557d3654
Localisation updates from http://translatewiki.net .
2012-05-06 17:08:47 +00:00
961607bc5d
Ignore non-atom updates links in Webfinger
2012-05-04 12:01:13 -04:00
eafe507068
Localisation updates from http://translatewiki.net .
2012-05-03 22:13:22 +00:00
c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
3898500ff9
Localisation updates from http://translatewiki.net .
2012-04-21 10:21:38 +00:00
b2c5b9de52
Localisation updates from http://translatewiki.net .
2012-04-15 12:11:05 +00:00
71a9644b35
Localisation updates from http://translatewiki.net .
2012-04-09 01:38:31 +02:00
3b3671b228
Localisation updates from http://translatewiki.net .
2012-03-11 22:12:10 +01:00
b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
5b6ecef24b
script to gc all feeds
2012-01-27 16:12:54 -05:00
cebb565f18
Localisation updates from http://translatewiki.net .
2012-01-20 20:07:45 +01:00
31305cb743
Localisation updates from http://translatewiki.net .
2011-12-28 14:00:49 +01:00
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
9f954eddc5
remove unsupported hcard action
2011-09-27 11:43:41 -04:00
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
0ee660af23
fix problem with using wrong arg to EndLeaveGroup event
2011-09-18 19:28:17 -04:00
bba39c4aaf
reorder routes for ostatus for better matches
2011-09-18 17:32:59 -04:00
dbb7324b25
test for missing profile in ostatus queue handler
2011-09-18 14:36:49 -04:00
2f1953ca25
Correct args for join event
2011-09-18 14:06:35 -04:00
915dd9c9b5
Copy-and-paste error in OStatus button output
2011-09-18 12:44:16 -04:00
f52d33753e
problem with remote subscription on groups in OStatus
2011-09-17 17:28:01 -04:00
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
c5d332f40a
move yet-another-rediscover-script to OStatus plugin
2011-09-07 16:56:38 -04:00
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
01fd24ce6a
Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch()
2011-08-27 12:06:34 -04:00
37bb0e6d20
Style cleanup for ostatus forms.
2011-08-26 12:51:55 -04:00
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
1fa689e913
tag -> list
2011-08-20 20:30:37 +02:00
083e9773f2
Add translator documentation.
...
doxygen fixes.
2011-08-19 17:13:15 +02:00
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
bd32b69355
Fix punctuation.
2011-08-15 16:18:21 +02:00
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
ebc5d6f676
fix call to Notice::saveNew() in Ostatus_profile::processShare()
2011-07-20 11:47:55 -04:00
0ad7411343
Make process*() functions return existing or new notice
2011-07-20 11:33:28 -04:00
0eeb175904
ID is a string
2011-07-20 11:13:25 -04:00
17b1492690
better ID from shared activities
2011-07-20 11:11:05 -04:00
e7ad9bf17a
ensure a shared item's author element
2011-07-19 16:47:37 -04:00
982426a790
handle incoming SHARE verbs
2011-07-19 15:20:06 -04:00
6f0bd73e6c
Squashed commit of the following:
...
Move OMB to a plugin
commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 11:16:54 2011 -0700
Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2
* 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Fix paths
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
Some odds and ends
Remove omb stuff from queuemanager defaults
Add check to make sure we're not untagging an OMB profile to OMB plugin
Move some more subscription stuff and peopletag checks to OMB plugin
Move some OMB-specific unsubscribe stuff to OMB plugin
Finish removing libomb from core extlibs
Fix more conflicts
Fix queuing/queuehandling
Move some stuff around; fix references
Fix conflicts
Move OMB-specific files to OMB plugin
Move some stuff around; fix references
Add OMB plugin README and rm references to OMB in mail StatusNet README
Update paths
Fix define
Basic plugin finished
Move OMB-specific files to OMB plugin
Remove OMB stuff from router
commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 14:38:40 2011 -0700
Fix paths
commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date: Tue Jul 12 18:17:06 2011 -0700
Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:02:08 2011 -0700
Some odds and ends
commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 19:01:23 2011 -0700
Remove omb stuff from queuemanager defaults
commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:46:44 2011 -0700
Add check to make sure we're not untagging an OMB profile to OMB plugin
commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 18:34:20 2011 -0700
Move some more subscription stuff and peopletag checks to OMB plugin
commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 16:37:25 2011 -0700
Move some OMB-specific unsubscribe stuff to OMB plugin
commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date: Wed Jul 6 15:26:30 2011 -0700
Finish removing libomb from core extlibs
commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:47:32 2011 -0700
Fix more conflicts
commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:49:22 2011 -0700
Fix queuing/queuehandling
commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 13 12:46:05 2011 -0700
Fix conflicts
commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:29:35 2011 -0700
Move some stuff around; fix references
commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date: Tue Jul 5 15:28:59 2011 -0700
Add OMB plugin README and rm references to OMB in mail StatusNet README
commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:50:09 2011 -0700
Update paths
commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:38:03 2011 -0700
Fix define
commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 23:30:43 2011 -0700
Basic plugin finished
commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:38 2011 -0700
Move OMB-specific files to OMB plugin
commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date: Thu Jun 30 19:10:01 2011 -0700
Remove OMB stuff from router
2011-07-15 12:13:57 -07:00
15dafffb3b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-04 12:26:41 -04:00
db85774f25
only update the avatar of an Ostatus_profile if it's a profile
2011-07-04 12:24:59 -04:00
eb90389a22
Localisation updates from http://translatewiki.net .
2011-07-01 13:02:21 +02:00
9f8d0b36a8
Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
2011-06-30 15:44:11 -04:00
2471f2092a
Fix avatar saving for OStatus -- how did this ever work?
2011-06-29 19:03:16 +00:00
da4ba6a5a9
reinstate lost replies code in OStatusQueueHandler
2011-06-29 13:51:19 -04:00
7759aa51e6
extra logging for OStatus enqueuing
2011-06-29 13:20:18 -04:00
42b28547d5
Localisation updates from http://translatewiki.net .
2011-06-19 13:20:34 +02:00
89aebb4ef0
Localisation updates from http://translatewiki.net .
2011-06-18 18:14:28 +02:00
2b3b11fca6
Add translator documentation.
2011-06-06 00:34:57 +02:00
c3f081c583
Localisation updates from http://translatewiki.net .
2011-06-05 21:15:31 +02:00
7c5fb37e59
Localisation updates from http://translatewiki.net .
2011-06-05 11:50:05 +02:00
9f9f940833
Add translator documentation.
...
Change a few double quotes to single quotes.
2011-06-05 11:30:46 +02:00
31b29fde50
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
1d1a929718
Update translator documentation and L10n.
2011-05-20 16:03:53 +02:00
d4aef7a007
Localisation updates from http://translatewiki.net .
2011-05-05 23:24:49 +02:00
4651c9d94a
Fix L10n/i18n.
...
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
2011-04-29 18:59:47 +02:00
5d72b600a1
Localisation updates from http://translatewiki.net .
2011-04-27 14:53:02 +02:00
2f48f0f914
Localisation updates from http://translatewiki.net .
2011-04-21 20:54:12 +02:00
cb8eb4d307
Localisation updates from http://translatewiki.net .
2011-04-20 10:19:58 +02:00
13ae3ab259
Localisation updates from http://translatewiki.net .
2011-04-18 13:41:15 +02:00
0d431cd6ee
Localisation updates from http://translatewiki.net .
2011-04-18 00:38:35 +02:00
5f3dbc3e98
Localisation updates http://translatewiki.net .
2011-04-17 20:30:47 +02:00
4ab995dd1e
Complete "people tag" to "list" in UI messages.
...
Update translator documentation accordingly.
Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
4c00b830bf
Localisation updates from http://translatewiki.net .
2011-04-17 01:15:30 +02:00
c27b9c0722
Update translator documentation.
...
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
53af608ef8
People tags -> Lists (only UI changes, for experimentation)
2011-04-14 19:49:42 +00:00
409550e1dc
Localisation updates from http://translatewiki.net .
2011-04-13 15:48:18 +02:00
124070e63d
Update punctuation for exceptions.
2011-04-13 15:13:14 +02:00
43f542c3a2
Script to delete bad OStatus hub URIs (until we have better error handling for broken hubs)
2011-04-12 02:29:02 -07:00
0644cdb6d0
Localisation updates from http://translatewiki.net .
2011-04-11 15:10:09 +02:00
b83e0fd0e8
Update translator documentation.
...
i18n fixes (gettext domain).
L10n updates.
Whitespace updates.
Some tabs to spaces.
2011-04-11 00:39:51 +02:00
e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00:00
396a0c08b3
Localisation updates from http://translatewiki.net .
2011-04-09 20:53:29 +02:00
a0ac51c22f
use notifyDeferred for tag/untag so that it gets queued offline
2011-04-09 17:18:33 +05:30
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
09523a19d7
Localisation updates from http://translatewiki.net .
2011-04-03 15:35:52 +02:00
d2a2575648
Localisation updates from http://translatewiki.net .
2011-04-01 22:59:31 +02:00
4ac471f380
Localisation updates from http://translatewiki.net .
2011-03-31 23:30:07 +02:00
14456cbbb2
Fix gettext domain for messages in plugins "_()" to "_m()".
...
Some other i18n and L10n updates, too.
i18n/L10n review not complete.
2011-03-30 22:31:23 +02:00
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
a74eda4e9a
don't send private notices over OStatus
2011-03-28 16:37:35 -04:00
d36f0707a4
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2011-03-28 03:25:40 -04:00
5502e535de
Localisation updates from http://translatewiki.net .
2011-03-26 12:21:36 +01:00
4e64bd4e5b
Localisation updates from http://translatewiki.net .
2011-03-24 16:08:03 +01:00
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
classes/Profile.php
2011-03-22 07:59:06 +05:30
31c1177970
Merge branch '1.0.x' into people_tags_rebase
...
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
541dfa04fe
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.
2011-03-21 14:35:29 -07:00
a390e3e888
Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars
2011-03-18 15:00:02 -07:00
5bb6fae307
Localisation updates from http://translatewiki.net .
2011-03-18 20:59:45 +01:00
7cf12f093e
Merge branch '1.0.x' into testing
...
Conflicts:
lib/common.php
2011-03-17 09:20:32 -04:00
27ef3b1d90
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
actions/public.php
2011-03-15 12:42:58 -04:00
c335db4bbc
OStatus support for people tags
2011-03-07 00:45:34 +05:30
7a9b989349
Localisation updates from http://translatewiki.net .
...
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
5fd9767e80
Localisation updates from http://translatewiki.net .
...
* Fix previous commit. Pot files were built against master instead of 1.0.x.
2011-03-03 18:39:12 +01:00
641018e950
Merge branch 'master' into 0.9.x
2011-03-02 13:52:22 -08:00
9ad00f726f
Add unsubscribe option to resub-feed.php
2011-03-02 12:49:37 -08:00
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
a86d293c93
Localisation updates from http://translatewiki.net .
2011-02-14 19:43:16 +01:00
c92358fa7b
add --all and --suspicious options for update-profile-data.php
2011-02-11 12:23:03 -08:00
f30744c7c5
refactor for multi....
2011-02-11 12:13:33 -08:00
f7b431d60b
woops
2011-02-11 12:08:35 -08:00
91535365b3
Work in progress: update-profile-data.php to update ostatus profile info from the current feed
2011-02-11 11:55:23 -08:00
dc424ab63a
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-10 22:23:06 -05:00
b09276635c
Merge branch 'master' into 0.9.x
2011-02-10 12:04:13 -08:00
8fa44e58f9
Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
...
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.
This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.
Bug: 3028
2011-02-10 09:39:40 -05:00
10500e7f85
ensure*() functions throw exceptions for errors
2011-02-09 03:08:52 -05:00
22e8893fba
OStatus uses Plugin::path()
2011-02-03 11:09:26 -05:00
308e615a3f
Localisation updates from http://translatewiki.net .
2011-02-03 01:31:31 +01:00
9573f725c1
Merge branch '0.9.x' into testing
2011-01-31 11:08:15 -08:00
3fc323f8f9
Localisation updates from http://translatewiki.net .
2011-01-31 00:04:03 +01:00
e6e402cefd
Localisation updates from http://translatewiki.net .
2011-01-29 23:10:15 +01:00
ee9e368aa8
Fix ticket #3016 : when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field
2011-01-26 14:57:52 -08:00
2a59453d4c
Merge branch 'testing' into moveaccount
2011-01-17 17:34:03 -05:00
a3c08faddd
Erroneous code ensuring Webfinger accounts
...
Ostatus_profile::ensureProfileURI() was accidentally falling through to
the default switch case, and was also calling common_log() incorrectly.
2011-01-17 17:32:44 -05:00
a2aa87fbff
OStatusPlugin does discovery in Profile::fromURI()
2011-01-17 15:45:03 -05:00
0fa57948f2
move linkheader.php to core
2011-01-16 17:15:26 -05:00
7d1f609bf0
Move discovery library from OStatus plugin to core
2011-01-16 17:15:26 -05:00
f1820459a8
Localisation updates from http://translatewiki.net .
2011-01-15 01:30:01 +01:00
5c25364141
remove extraneous <dl> and <dt> tags
2011-01-14 15:36:06 -05:00
380ca7187c
Localisation updates from http://translatewiki.net .
2011-01-14 12:10:05 +01:00
7ec456198a
Ticket #2732 : add some regression tests for groups to OStatus remote-tests.php
...
Note that these tests won't pass on master branch yet as the join/leave don't work, and there's a bug in Activity parsing which prevents interop between new feeds and old remote subscribers (both fixed in this branch).
2011-01-06 15:13:38 -08:00
1d15145993
Salmon signature checks on incoming slaps now check both old and new signature formats.
2011-01-06 00:01:42 +00:00
437ac120b0
Outgoing Salmon slaps now use the corrected signature format; if the first hit is rejected with an HTTP error, we try again with the old format.
...
(This is not 100% ideal; possibly should try to distinguish between server errors and rejections, etc.)
2011-01-05 23:54:16 +00:00
946a4ac17b
Add test cases for internal change in Salmon signing; fix for the new code.
...
Updated sig passes Tuomas's verifier, which is a good sign
2011-01-05 23:26:39 +00:00
e25c34a2b6
Salmon slap / magicsig test script
...
Given a notice in the local system, we package it up as an Atom entry and MagicSig it up.
We run the magicenv verification on it locally to make sure our own functions can decode it.
Optionally with --verify we can send to Tuomas Koski's verification test service (not sure if this is working 100%)
If given --slap= with a target Salmon endpoint, we'll sent it on and see if it liked it. (Note that StatusNet will reject if there's not a relevant mention, but will report acceptance for dupes so you can use a message that's already been delivered as a test.)
2011-01-05 14:27:53 -08:00
51d1535f15
Added doc comments on Salmon magicsig-related stuff to help in figuring out what's going on
2011-01-05 14:05:59 -08:00
32eb4c5e2d
Merge remote branch 'gitorious/0.9.x' into 1.0.x
...
Conflicts:
lib/common.php
2010-12-30 15:52:08 -08:00
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
b54ea6767a
New event for Salmon including target
2010-12-27 10:51:59 -08:00
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
67bde86f7c
accept bookmarks over PuSH
2010-12-23 09:42:42 -08:00
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
f82dd4e14f
Merge branch '0.9.x' into 1.0.x
2010-12-20 14:28:43 -08:00
b83e7005ed
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/classes/FeedSub.php
2010-12-20 14:23:15 -08:00
46123e3754
*cough* don't commit the code that breaks your code that you used to test the debug code :D
2010-12-20 13:06:58 -08:00
a4e2f38356
Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config.
2010-12-20 13:05:17 -08:00
e36399974e
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
lib/action.php
plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
dd48bdb1c4
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:48:02 -08:00
c71d701a3f
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:46:23 -08:00
16fc5314fb
move code to get an author object for a feed to a library from Ostatus_profile
2010-12-17 13:09:37 -05:00
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
0330bad688
Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts)
2010-12-15 12:14:25 -08:00
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
6bdce2b1e5
Localisation updates from http://translatewiki.net .
2010-11-30 21:35:25 +01:00
ee67a0673d
Localisation updates from http://translatewiki.net .
2010-11-30 18:53:04 +01:00
adb98ce5d1
updated
2010-11-29 16:02:17 -05:00
675d902cab
updated
2010-11-29 16:01:19 -05:00
3277523448
updated
2010-11-29 16:00:54 -05:00
4da41d95ee
updated
2010-11-29 16:00:17 -05:00
f4dd6c2916
updated
2010-11-29 15:58:41 -05:00
67db18d30b
updated
2010-11-29 15:57:28 -05:00
432237178f
updated
2010-11-29 15:55:58 -05:00
ed0e91c7a1
Localisation updates from http://translatewiki.net .
2010-11-29 20:28:28 +01:00
Mikael Nordfeldth
Joshua Judson Rosen
Jean Baptiste Favre
Evan Prodromou
Siebrand Mazeland
Samantha Doherty
Zach Copley
Ian Denhardt
Shashi Gowda
Brion Vibber
Matt Lee