51a245f18c
Added Memcached plugin (using pecl/memcached versus pecl/memcache)
2010-03-08 17:17:37 -05:00
42463e160d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-08 13:37:45 -08:00
217ad420ac
Fix ticket #2208 : regression in XMPP sending when server != host
...
The upstream class sets $this->basejid with host unconditionally, which wasn't previously an issue as the fulljid would always be filled in by the server at connect time before sending messages. With the new queued messaging, we need to make sure we've filled out $this->fulljid correctly without making a connection.
Now using $server if provided to build $this->basejid and $this->fulljid in the queued XMPP proxy class, so queued messages are sent correctly.
2010-03-08 12:19:06 -08:00
a77efb2447
XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable
2010-03-08 10:32:40 -08:00
5f7aa6f2e3
make API realm configurable
2010-03-08 12:36:03 -05:00
dbe6b979d7
implement mail headers
2010-03-04 23:10:27 -05:00
2f41e93339
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-04 14:44:38 -08:00
5dbcc184c9
Add Breton to language.php
2010-03-04 20:04:44 +01:00
f7f7f167d6
update version number
2010-03-04 13:18:41 -05:00
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
bc6a77f334
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 12:51:18 -05:00
74dbd37e9a
Bringing aside back because it is needed for Design values. Will hide
...
from CSS instead.
2010-03-04 12:49:42 -05:00
0ddd1ef191
Ignore API 'since' silently as Twitter does instead of throwing a 403 error. Getting extra results is less disruptive than total failure.
...
Threw in an X-StatusNet-Warning header on the off chance some API client developer notices it. :)
2010-03-04 08:55:36 -08:00
fd4eefe6b4
OStatus enabled by default
2010-03-04 11:43:31 -05:00
62d5f1addb
Merge branch 'testing'
2010-03-04 07:00:45 -08:00
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
14d7f4a598
Removed unused stub class
2010-03-04 01:23:02 -08:00
79b392a39e
Add generator tag into Atom feeds.
2010-03-04 01:16:25 -08:00
37b106d49c
Fix variable name in NoConfigException
2010-03-04 00:00:46 -08:00
8ffb34a90c
Temp fix for problem getting actor from PuSH updates where actor is only specified in subject
2010-03-03 20:58:34 -08:00
f210cadfec
Revert "Revert "Show <activity:subject> and no activity actors for user feed""
...
This reverts commit e2578cfad6
2010-03-03 20:58:34 -08:00
61de37ec7b
Move snapshot configuration to its own admin panel
...
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03 16:49:14 -08:00
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
4a2511139e
Initial user role controls on profile pages, for owner to add/remove administrator and moderator options.
...
Buttons need to be themed.
2010-03-03 15:43:49 -08:00
0f1c6e239a
Merge branch 'testing'
2010-03-03 18:20:45 -05:00
337b1aaaa1
Site-wide notice text admin panel
2010-03-03 14:37:30 -08:00
ef6bf8f331
Removed aside container from output for the admin panel sections
2010-03-03 15:42:34 -05:00
c7d390e494
Add class="admin" to the content div of admin panels for styling
2010-03-03 12:18:20 -08:00
0881eba80e
Language setting fixes:
...
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
2010-03-03 12:10:43 -08:00
13521cb510
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
2010-03-03 11:42:02 -08:00
33af29b47c
Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there.
2010-03-03 19:22:22 +00:00
3bb42d1170
Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.)
2010-03-03 19:00:02 +00:00
a82cd89a97
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Using position relative only for the remote subscription in section
Added group subscription button to groups mini list
Added event hooks at the start and end of groups mini list
2010-03-03 10:28:45 -08:00
61ada4558d
Fix for disappearing 'connect' menu if xmpp and sms are disabled.
...
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08:00
15574c59de
Added event hooks at the start and end of groups mini list
2010-03-03 12:55:01 -05:00
7313cd9094
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-03-03 09:53:38 -08:00
06fb1124f5
Added event hooks for start and end of subscriptions mini list
2010-03-03 11:14:39 -05:00
79ffebb51b
OStatus: save file records for enclosures
...
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.
Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
7175e7c7a1
OStatus fix: look for <link>s in the current element's children, not in all its descendants. Was breaking notice URL transfer, pulling a profile link by mistake.
2010-03-02 15:38:52 -08:00
09705a1e98
stupid mistake... let's not talk about this.
2010-03-02 14:25:27 -08:00
c30f95c55c
Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"
2010-03-02 14:25:06 -08:00
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
878818d2c0
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 22:01:18 +01:00
e9c127ddd8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 15:26:27 -05:00
4113f28851
Added Subscribe button to remote user entity actions in profie lists
2010-03-02 15:25:32 -05:00
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
6b134ae4c7
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
...
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
f65478b624
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-03-02 19:13:51 +01:00
f596e072e7
Fix for regression in updated mention checks, sometimes lost links to folks mentioned in the replied message.
2010-03-02 09:53:00 -08:00
284b1dc014
* Change translator documentation using _m() as designed together with Brion
...
* Add more translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
e2578cfad6
Revert "Show <activity:subject> and no activity actors for user feed"
...
This reverts commit c25fc8a4b5
2010-03-02 03:40:43 -05:00
2526a5ae94
Merge branch 'master' into testing
2010-03-02 02:57:35 -05:00
f504a9237e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 02:56:57 -05:00
c25fc8a4b5
Show <activity:subject> and no activity actors for user feed
...
We only need one author for user feeds: the user themselves. So, show
the user as the activity:subject, and don't repeat the same
activity:actor for every notice unnecessarily.
2010-03-02 02:54:52 -05:00
871b3aa6c0
Remove un-needed config variable for enabling/disabling Twitter integration
2010-03-01 21:52:31 -08:00
6b2d67216e
Initial Twitter bridge admin panel
2010-03-01 21:35:24 -08:00
d8212977ce
Use PHP exceptions for PEAR error handling.
...
Allows for the common try/catch construct, which makes error handling cleaner and easier.
2010-03-01 21:44:41 -05:00
f9dd83caa7
Modify configuration to have an option to allow uploads regardless of mime type
2010-03-01 21:44:41 -05:00
0ca7aa68d3
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline: (25 commits)
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
more output in updateostatus.php
lost important fields when switching queries
show service debug info
pass listener URI into consumer for OMB
remove strict check on OMB exception strings
return correct HTTP status code for OMB errors
send smaller error pages for OMB API endpoints
Remove check for secret in token deletion on Subscription::cancel()
Better logging on bad token in subscription
Return empty array when no subscriptions to remote
drop tokens for OMB on unsubscribe
fix path for updateostatus.php
Script to convert OMB subscriptions to OStatus subscriptions
show service debug info
pass listener URI into consumer for OMB
remove strict check on OMB exception strings
return correct HTTP status code for OMB errors
send smaller error pages for OMB API endpoints
Remove check for secret in token deletion on Subscription::cancel()
...
2010-03-01 16:38:56 -08:00
2c677e0f2d
Revert "show service debug info"
...
This reverts commit 19ec0e3a62
2010-03-01 18:49:39 -05:00
f7c2c19ce8
lost important fields when switching queries
2010-03-01 18:07:21 -05:00
19ec0e3a62
show service debug info
2010-03-01 18:03:18 -05:00
64918cfd35
pass listener URI into consumer for OMB
2010-03-01 18:03:18 -05:00
c3ba26bb99
Return empty array when no subscriptions to remote
2010-03-01 18:03:17 -05:00
1b1dab206f
Merge branch 'testing' into 0.9.x
...
* testing:
Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-01 15:00:33 -08:00
a5dc5f9c62
Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-01 14:58:06 -08:00
bf95fa92b5
Fix forgotten "m" in 8e102da76c
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 22:35:27 +01:00
8e102da76c
Add contextual documentation to allow better localisation.
2010-03-01 22:28:38 +01:00
5a14264f0c
Change 'Home' to 'Personal' in the header.
...
csarven indicated he accepted this change.
2010-03-01 14:16:44 -05:00
3bfe3345df
Use common_nicknamize() in better places.
2010-03-01 11:56:07 -05:00
63ff9d86b8
Add content for all 3 Send buttons (2 are the same as far as I can tell)
2010-03-01 15:57:27 +01:00
f00e8bbf47
Merge branch 'testing' into 0.9.x
2010-02-27 17:07:57 -05:00
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
babca69f67
add bugfix to version number.
2010-02-27 11:04:24 -05:00
d3fc8e2219
Pull conversation URL from Conversation instead of assuming it's local
2010-02-26 14:47:38 -08:00
4b696cf51f
add a flag to impede adding sessions to URLs (for permanent stuff)
2010-02-26 17:28:44 -05:00
a796a7cdc6
nicknamize the requested nickname during autoregistration
2010-02-26 16:31:38 -05:00
b0acaeafe3
Check for conversation with unique conversation ID
2010-02-26 13:06:06 -08:00
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
517fd54b65
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:36 -08:00
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -05:00
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
ea044722e0
'on' is what checkboxes use for boolean true
2010-02-26 12:28:58 -05:00
d9d1a77bb0
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 11:40:12 -05:00
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
eabae96fb4
Get ApiAction autoloading properly
2010-02-25 22:08:17 -08:00
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
3daf17d935
Get ApiAction autoloading properly
2010-02-25 22:02:40 -08:00
b573c5e260
Fix for group timeline feeds by name
2010-02-25 21:27:59 -08:00
08c17bfcaa
try/catch on omb profile pings
2010-02-25 21:06:53 -08:00
da4b21d3a9
try/catch on omb profile pings
2010-02-25 21:06:16 -08:00
417f5d653f
update to beta6
2010-02-25 23:27:20 -05:00
254e210763
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 21:53:50 -05:00
f9e5acbfa7
remove linkback from default plugins
2010-02-25 21:53:18 -05:00
2fa953da22
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 18:52:26 -08:00
2feb09f434
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
2010-02-25 18:51:44 -08:00
c49fbb63c5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
init_conversation.php script to copy old notice conversations into the conversation table
cache results of webfinger lookups
Parse an hcard for hints, if available
use new hcard method for webfinger
add hkit for hCard parsing
use new dedicated hcard method for Webfinger profile
Add an hcard action
2010-02-25 18:13:34 -08:00
207cc89074
Set avatar height correctly
2010-02-25 18:06:03 -08:00
1cae324555
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 19:59:01 -05:00
Craig Andrews
Brion Vibber
Evan Prodromou
Dave Hall
Siebrand Mazeland
Sarven Capadisli
Zach Copley