Commit Graph

10352 Commits

Author SHA1 Message Date
Evan Prodromou
2a3cb86e29 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-20 15:51:55 -05:00
Evan Prodromou
dbccebb14b update friends, not user, timeline for recipients of notice in PuSH plugin 2010-01-20 15:43:24 -05:00
Sarven Capadisli
6815ddafe0 Better alignment for notice options in MobileProfile 2010-01-20 18:50:48 +01:00
Sarven Capadisli
b87c80e0a9 Updated notice item view where a) notice text no longer wraps around
(under author's photo) b) supplemental notice content and options will
start right under notice text.
2010-01-20 18:32:24 +01:00
Brion Vibber
906450e2f5 DEBUG HACK: error checking for xml_parse in XMPPHP input stream 2010-01-20 08:37:58 -08:00
Siebrand Mazeland
b0be2da0ca Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-20 00:58:11 +01:00
Brion Vibber
71df23642c Extra debug instrumentation for xmppdaemon 2010-01-19 12:26:59 -08:00
Evan Prodromou
dd0a99f58a Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-19 00:32:05 -05:00
Evan Prodromou
01dc77c2fd Merge branch 'master' into 0.9.x 2010-01-19 00:31:42 -05:00
Evan Prodromou
c7f14cd777 allow all rights reserved, private data 2010-01-19 00:04:58 -05:00
Evan Prodromou
42a47a7719 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-18 23:26:03 -05:00
Evan Prodromou
71f519f64a add event for showing content license in action 2010-01-18 23:25:45 -05:00
Eric Helgeson
0ddfcc5521 Added Plugin Version info to recaptcha plugin 2010-01-18 18:33:09 -05:00
Siebrand Mazeland
d29a791fff Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-19 00:24:53 +01:00
Brion Vibber
ae9f2bf187 add a quickie plugins/ dir readme mentioning how to add plugins, plus ref to wiki pages 2010-01-18 09:37:42 -08:00
Brion Vibber
3bf4056055 Fix order of params on 'plugin not found' exception 2010-01-18 09:28:58 -08:00
Sarven Capadisli
d501acf438 Missing null className for incoming email form legend 2010-01-18 17:17:02 +00:00
Sarven Capadisli
42601b1ff0 Some JS cleaning up for NoticeLocationAttach (which fixes also fixes a
few bugs in WebKit)
2010-01-18 12:55:14 +00:00
Sarven Capadisli
187a70873a Updated path to farbtastic stylesheet 2010-01-18 11:29:05 +00:00
Sarven Capadisli
602dbb5f87 Moved farbtastic's stylesheet to use relative paths for its own images 2010-01-18 11:12:05 +00:00
Brenda Wallace
02a6006baf Merge commit 'mainline/0.9.x' into 0.9.x 2010-01-18 11:48:11 +13:00
Sarven Capadisli
4978810c81 Took out focus out of textare when location share is enabled/disabled.
Also avoids the conflict with the URL fragment on the conversation page.
2010-01-17 22:31:47 +00:00
Sarven Capadisli
3f589da243 Updated UI for notice aside content and notice options in MobileProfile 2010-01-17 19:45:35 +00:00
Sarven Capadisli
07de97a103 Inline script for maxlength is deprecated 2010-01-17 14:04:47 +00:00
Eric Helgeson
e3dc45d103 Merge commit 'refs/merge-requests/117' of git://gitorious.org/statusnet/mainline into integration 2010-01-16 17:42:53 -05:00
Brion Vibber
9dc9c404cf Merge branch 'master' into 0.9.x 2010-01-16 13:40:49 -08:00
Brion Vibber
775c63b654 Cleanup for memcached host/port split -- apparently we use ';' on purpose, restoring. Keeping fix for the notices spewing into the log. 2010-01-16 13:39:05 -08:00
Brion Vibber
faedddaa81 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-01-16 13:37:49 -08:00
Sarven Capadisli
aea83bbe15 Using visibility:hidden instead of display:none for checkbox 2010-01-16 20:57:18 +00:00
Sarven Capadisli
d22cdad5fe Added missing position paramater 2010-01-16 20:10:46 +00:00
Sarven Capadisli
8896df22af JSLinting on JSON 2010-01-16 19:44:37 +00:00
Sarven Capadisli
6494cb17e9 Some JSlint-ing 2010-01-16 19:42:32 +00:00
Sarven Capadisli
3398bb6ca9 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-16 19:17:14 +00:00
Sarven Capadisli
407e425aed Removed extra comma in object 2010-01-16 19:16:44 +00:00
Siebrand Mazeland
e8ba2794e7 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-16 18:57:34 +01:00
Eric Helgeson
5fd8e331f3 Missed change when refactoring groups. Thanks macno 2010-01-16 11:56:07 -05:00
Evan Prodromou
1f6bbc1890 Merge branch 'master' into 0.9.x 2010-01-16 08:06:02 -08:00
Evan Prodromou
21c3e08804 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-16 07:48:59 -08:00
Evan Prodromou
d6b8b13116 change rc3 to beta3 2010-01-16 07:48:46 -08:00
Evan Prodromou
42550321ff Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-16 06:57:01 -08:00
Brion Vibber
d35faa04c1 Fix for background recalculation of groups; needs to get Group objects not IDs; also don't list any groups for repeats to match saveGroups behavior
todo: merge calculation portion with saveGroups so they don't get out of sync
2010-01-15 13:06:21 -08:00
Siebrand Mazeland
1ef8efe4c5 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-15 20:20:18 +01:00
Brion Vibber
598072468c --xmpp-only hack for queuedaemon.php to run separate queue daemon with only xmpp threads 2010-01-15 11:13:06 -08:00
Brion Vibber
963260d262 Fix since_id and max_id API parameters for inbox-based loads; was failing if the exact id mentioned wasn't present in the inbox (or had been trimmed out) 2010-01-15 10:03:02 -08:00
Brion Vibber
745d428365 Fix since_id and max_id API parameters for inbox-based loads; was failing if the exact id mentioned wasn't present in the inbox (or had been trimmed out) 2010-01-15 10:01:50 -08:00
Brion Vibber
ef016dca45 Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-01-15 09:52:50 -08:00
Brion Vibber
038287c1ff fix for --skip-xmpp hack -- forgot to do it on the ping & confirm handlers 2010-01-14 17:14:41 -08:00
Craig Andrews
a27aef9206 Add nickname suggestion capability for use during autoregistration. 2010-01-14 19:52:11 -05:00
Brion Vibber
58bc33850a temporary --skip-xmpp flag on queuedaemon.php, allows to run queue daemons but skip subscription to xmpp-based queues
(still working on making these behave gracefully when server is down)
2010-01-14 15:32:37 -08:00
Siebrand Mazeland
c82c43d5ee Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-14 23:43:44 +01:00