41c8048efd
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-25 22:19:50 +01:00
c11064a539
Updated 'more' anchor for attachments to do an XHR GET
...
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
2010-03-25 14:15:54 -07:00
3c5586d4bd
Using rel=external instead of class=external for jOverlay title link
2010-03-25 21:33:38 +01:00
53bed00f90
Added rel=external to geo location link
2010-03-25 21:33:26 +01:00
321093886f
Assigned an identifier for the representative user and group profile
2010-03-25 21:32:28 +01:00
040b4b74ef
Merge commit 'origin'; branch '0.9.x' into 1.0.x
2010-03-25 13:05:02 -07:00
29a25848de
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-25 13:04:09 -07:00
920acf8d96
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-25 13:50:49 -04:00
c3ceaa893f
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2010-03-24 14:11:01 -07:00
ecb009bcf5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-24 13:57:20 -07:00
a954fd65ba
Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml
2010-03-24 13:36:57 -07:00
09ff213d1c
Using hCard label instead of location. Matches userprofile.
2010-03-24 20:58:13 +01:00
e7ae36b52a
Updated tag list output in subscriptions list. Matches userprofile.
2010-03-24 20:50:07 +01:00
647b3a1f6b
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-24 14:50:12 +01:00
abe4be5438
Use $param instead of hardcoded 'attach' name.
2010-03-23 22:42:30 -04:00
7277b59734
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-23 12:13:32 -07:00
16fa03212b
Ticket 2188: add a daily average post count to profile statistics sidebar.
...
When we have more detailed history stats, this'd be a good place to link to details/graphs.
2010-03-23 11:25:36 -07:00
44caa3a93f
Consistently send Profiles into Fave::addNew()
2010-03-23 11:08:30 -07:00
533a3bf6a3
Consistently send Profiles into Fave::addNew()
2010-03-23 11:06:37 -07:00
80b16c8499
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:56:05 -07:00
2d79455a1f
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:54:24 -07:00
dd115fcb08
change router to allow hooking path connections
2010-03-23 12:33:41 -04:00
a5c78a6f1a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 08:21:32 -07:00
b8e97ac709
Some initial media parsing
...
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
886e28aaa9
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-22 13:58:27 -07:00
e89908f261
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/channel.php
scripts/imdaemon.php
2010-03-22 13:56:16 -07:00
26f49de0dd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
4168b9cec1
Log backtraces for non-ClientException exceptions caught at the top-level handler.
2010-03-22 11:33:56 -07:00
5697e4edb0
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:51:01 -07:00
7aee7670c7
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:35:54 -07:00
be7efe7504
Merge branch 'testing' into 0.9.x
2010-03-21 16:28:56 -07:00
fcb614d0eb
Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri
2010-03-21 16:25:12 -07:00
97bd7e22da
correct creation of avatar links for RSS and Posterous elements
2010-03-20 17:18:24 -05:00
11a86d046e
move atom category to its own file, too
2010-03-20 16:55:36 -05:00
323ff31fbd
special-case Posterous author element for activity actor
2010-03-20 16:53:30 -05:00
e458e9fe63
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/activity.php
2010-03-20 16:11:42 -05:00
99454be38c
Move activity classes to their own files
...
Moved the various classes used by the Activity class to their own
files. There were >10 classes in the same file, with around 1500 lines
in the file. Just too big.
This change makes autoloading work for these classes, so also removed
the hard require in lib/common.php.
2010-03-20 16:06:22 -05:00
aa6e198c12
Remove deprecated call-time pass-by-reference
2010-03-20 12:04:46 -04:00
2fc0f0433e
allow html content in summary and clean it out of title
2010-03-20 09:30:28 -05:00
65c8dc313c
rename $rss to $channel to prevent misunderstanding
...
RSS feeds have the format
<rss><channel><item/><item/><item/></channel></rss>. The element named
$rss was actually the <channel> element, so I renamed the variable so
I wouldn't hurt my head.
2010-03-20 07:19:54 -05:00
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
022c13418d
make deriving a subject from an RSS channel work
2010-03-19 15:49:38 -05:00
1292230e38
move ActivityObject constructors from Activity to ActivityObject
2010-03-19 15:41:48 -05:00
13b1acdd08
only search elements for links
2010-03-19 15:28:25 -05:00
05e3768e6a
Parse RSS items as activities
...
First steps to parsing RSS items as activities. RSS feeds don't seem
to have enough data to make good remote profiles, but this may work
with some "hints".
2010-03-19 09:48:39 -05:00
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
26ba430ae8
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 15:39:06 -07:00
9c5af9a38f
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 18:13:54 -04:00
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
d115932466
Sigh... somehow left a stray bit of test code and broke activity.php.
2010-03-18 09:10:44 -07:00
0a1b10114b
new exception class for when a user has no profile
2010-03-18 08:32:17 -05:00
55a54d6f6a
Ticket #2244 : fix to interpretation of escaped HTML and plaintext Atom content on incoming OStatus messages.
...
We were double-unescaping for <content type="html">, turning <b> escaped chars into literal tags (which then may get removed entirely by the HTML scrubber).
2010-03-17 17:35:27 -07:00
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
f797a10256
Display scrubbed HTML attachments inline on attachment view page.
2010-03-17 13:58:25 -07:00
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
22f827134c
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 11:04:41 -07:00
1c942afa60
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 10:52:11 -07:00
b9fc4c24b4
Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x and see if we can make it easier to disable through the config file for now.
...
Revert "Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list."
This reverts commit d9a9fd3779
2010-03-17 08:55:16 -07:00
f62b8a80cf
Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them.
...
For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null.
Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131
Revert "Don't attempt to retrieve the current user from the DB while processing a DB error"
This reverts commit 68347691b0d8212977ce
2010-03-16 16:32:25 -07:00
88f66131a1
Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them.
...
For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null.
Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131
Revert "Don't attempt to retrieve the current user from the DB while processing a DB error"
This reverts commit 68347691b0d8212977ce
2010-03-16 16:24:31 -07:00
d9a9fd3779
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-16 16:01:00 -07:00
b994d529f4
Throw an exception if we receive a document instead of a feed's root element
2010-03-15 19:06:06 -07:00
441e52718e
Background deletion of user accounts. Notices are deleted in chunks, then the user itself when they're all gone.
...
While deletion is in progress, the account is locked with the 'deleted' role, which disables all actions with rights control.
Todo:
* Pretty up the notice on the profile page about the pending delete. Show status?
* Possibly more thorough account disabling, such as disallowing all use for login and access.
* Improve error recovery; worst case is that an account gets left locked in 'deleted' state but the queue jobs have gotten dropped out. This would leave the username in use and any undeleted notices in place.
2010-03-15 16:08:00 -07:00
40cde2f710
Initial Twitpic-like media upload endpoint /api/statusnet/media/upload
2010-03-15 22:16:33 +00:00
2b684f6954
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-15 14:39:14 -07:00
c9232d8f26
Ticket #2242 : fix reading of inline XHTML content in Atom feeds for OStatus input.
...
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
2f380f6a9a
Using rel=external instead of class=external for jOverlay title link
2010-03-14 15:01:24 -04:00
00cac4c8b1
Added rel=external to geo location link
2010-03-14 14:11:21 -04:00
c4f89b06f1
give preference to rel="photo" (per latest ActivityStreams spec), but still support rel="avatar" for compat
2010-03-14 12:57:24 -04:00
5b078eadd9
Assigned an identifier for the representative user and group profile
2010-03-13 16:48:21 -05:00
14c488ebb0
Fix for _m() usage with context in StatusNet main code.
2010-03-13 12:12:06 -08:00
a9dabbe77e
* wrong param order to in_array
...
* in getContent() if "type" isn't set, assume text (per atom spec)
2010-03-13 10:37:08 -05:00
9e9ab23e1f
Fixes for updating indices, charset/collation and engine type on plugin-created tables.
...
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.
Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.
Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.
Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.
TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
f72eb17304
Merge commit 'origin/testing' into 0.9.x
2010-03-12 09:41:49 -08:00
f3066c80d3
Merge commit 'origin/0.9.x' into 0.9.x
2010-03-12 09:41:45 -08:00
3dc84dd02d
Output enclosing geo elements and GeoRSS xmlns in XML timelines
2010-03-12 05:39:36 +00:00
13556e7ba9
Add Atom self link to tag timeline
2010-03-12 04:08:31 +00:00
b1d90a835f
Don't switch people from the Memcache to Memcached plugin without their knowledge when using back-compatibility $config['memcached']['enabled']. Performance characteristics for Memcached version on large-scale sites not tested yet.
...
New installations should be using addPlugin explicitly.
2010-03-11 18:10:41 -08:00
fe7b063b85
Remove stray whitespace at file start that snuck into last update
2010-03-11 18:07:00 -08:00
2179aae758
fubared a715271f84 - this is the fix
2010-03-11 21:02:41 -05:00
e1537d8387
More generalized method for calculating Atom rel="self" links
2010-03-12 01:40:52 +00:00
a715271f84
reuse Subscription::cancel instead of reimplementing it.
...
I didn't know this method existed before... pretty neat.
2010-03-11 20:40:25 -05:00
d6e0640251
move image type checking to constructor, so checking will be done in all cases
...
check if the relevant image handling function exists when deciding if the image type is supported
2010-03-11 20:12:32 -05:00
78f0d6bbd2
Scrub all atom output with common_xml_safe_str()
2010-03-12 01:12:30 +00:00
b12c344930
Generator tag should have 'uri' attr not 'url'
2010-03-11 23:44:50 +00:00
7e1a1506f5
Output self link in rss2 feeds, if available
2010-03-11 23:28:41 +00:00
023f258b63
- Output georss xmlns in rss element
...
- Only output geopoint in rss if one is set
2010-03-11 23:05:56 +00:00
ded26ae8f5
Fixes the indenting bug for geo anchor. Also mention in trac ticket 2235
2010-03-11 16:40:16 -05:00
c6f09306b1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 17:04:51 -08:00
5cd020bf29
Workaround intermittent bugs with HEAD requests by disabling keepalive in HTTPClient.
...
I think this is a bug in Youtube's web server (sending chunked encoding of an empty body with a HEAD response, leaving the connection out of sync when it doesn't attempt to read a body) but the HTTP_Request2 library may need to be adjusted to watch out for that.
2010-03-10 15:13:16 -08:00
6d73fc1d54
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 11:57:38 -08:00
54ff17010b
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-10 11:56:51 -08:00
532e486a93
Detect when queuedaemon/xmppdaemon parent processes die and kill the child processes.
...
Keeps stray daemon subprocesses from floating around when we kill the parents via a signal!
Accomplished by opening a bidirectional pipe in the parent process; the children close out the writer end and keep the reader in their open sockets list. When the parent dies, the children see that the socket's been closed out and can perform an orderly shutdown.
2010-03-10 11:54:00 -08:00
55e8473a7a
A blank username should never be allowed.
2010-03-10 09:57:00 -08:00
ddb656fcd2
Merge branch 'testing' into 0.9.x
...
Conflicts:
actions/apistatusnetconfig.php
2010-03-10 09:55:14 -08:00
58fcb5ac6f
Merge branch 'master' into testing
2010-03-10 09:53:55 -08:00
8ee8b89dd8
Ticket #2221 : fix for missing whitespace between messages in en-gb.
...
The final whitespace should be dropped from the source messages after we've stabilized; trailing space is pretty unreliable to keep through translation tools and should be avoided. Use separator strings outside the messages!
2010-03-10 09:36:00 -08:00
49f1b1e8b2
removed a stay bit of debug
2010-03-10 22:03:36 +13:00
75e2be3b71
map the mysql-ish column types to ones postgres likes
2010-03-10 22:02:56 +13:00
7398353c44
primary keys and unique indexes working in postgres
2010-03-10 21:54:30 +13:00
c4ee2b20be
throw an error that looks like mysql errors.. :-S
2010-03-10 21:25:44 +13:00
7f2253759c
A blank username should never be allowed.
2010-03-10 03:39:05 +00:00
6ea7e1c06e
Merge branch 'testing' into 0.9.x
2010-03-09 14:20:50 -08:00
971f1f64f1
Added scripts/command.php, can be used to run commands such as subscription on behalf of users.
...
This includes whatever support for extended command parsing plugins may have added.
Example:
./scripts/command.php -nbrionv sub update@status.net
2010-03-09 13:41:05 -08:00
8bf1b54abd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-09 13:07:52 -08:00
32532c7c42
Merge branch 'commands' into testing
2010-03-09 13:05:51 -08:00
80a17387bf
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
...
OStatus plugin overrides these to allow using webfinger (user@example.com ), profile URL (http://example.com/user ) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
4caf0d2e73
Merge commit 'origin/master' into testing
2010-03-09 11:27:30 -08:00
60e0f04261
Ticket #2210 : adjust locale setup fallback to try more locales on the system if en_US isn't available. We just need *something* other than C or POSIX to let gettext initialize itself, apparently...
...
Gets Spanish, French, Russian etc UI localization working on Debian Lenny fresh installation set up in Spanish (so es_ES.UTF-8 is available but en_US.UTF-8 isn't).
2010-03-09 17:38:16 +01:00
689e2e112b
make common_copy_args() work when the post/get request includes arrays (form elements with names ending in [] having multiple values)
2010-03-08 21:43:34 -05:00
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
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
Sarven Capadisli
Brion Vibber
Evan Prodromou
Craig Andrews
Zach Copley
James Walker
Brenda Wallace
Brion Vibber
Dave Hall
Siebrand Mazeland