Brion Vibber
39a8e9d8e6
Ensure that shortened URLs haven't accumulated whitespace when fetched by a plugin. Some shorteners have ended up inserting extra newlines when the string gets extracted from tidied HTML.
2010-02-25 10:30:37 -08:00
Brion Vibber
4a71753f20
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 09:28:19 -08:00
Brion Vibber
84fa3776e2
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:14:42 -08:00
Brion Vibber
99c0e16844
Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:12:45 -08:00
Brion Vibber
66373f8e5a
Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:11:07 -08:00
Evan Prodromou
22255da735
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 12:10:57 -05:00
Evan Prodromou
d53b4b9b84
save mainpage element for groups
2010-02-25 12:05:22 -05:00
Evan Prodromou
8f42d37593
Add 'mainpage' to User_group
...
Add the mainpage attribute to user_group objects.
2010-02-25 09:24:29 -05:00
Sarven Capadisli
ffdcdbc198
Removed dangling icons in Realtime plugin
2010-02-25 13:55:06 +00:00
Sarven Capadisli
a0f6977baa
Fixes replyto JS after the upgrade from jQuery 1.4.2
2010-02-25 14:51:23 +01:00
Sarven Capadisli
b54480247a
Updated jQuery JavaScript Library from v1.4.1 to v1.4.2
2010-02-25 14:50:40 +01:00
Evan Prodromou
e6858d7203
modify group actions so they use Local_group to look up by nickname
2010-02-25 08:44:15 -05:00
Sarven Capadisli
90d396a123
Moved otalk theme out of core. It will be updated separately and may
...
be reintruced back to core when appropriate.
2010-02-25 12:36:22 +01:00
Sarven Capadisli
3299078e33
Updated pigeonthoughts theme
2010-02-25 12:35:15 +01:00
Sarven Capadisli
5061fb7cc4
Updated cloudy theme
2010-02-25 12:08:49 +01:00
Sarven Capadisli
58d8b258cf
Removed dangling geo icon
2010-02-25 11:43:14 +01:00
Sarven Capadisli
b33f9a2d13
Added author, license information for the icons that are in base theme
2010-02-25 11:42:25 +01:00
Sarven Capadisli
9ef7eb036c
Moved common icons from Realtime plugin to core icons file
2010-02-25 10:38:55 +00:00
Sarven Capadisli
44cb354698
Added external, play, pause icons to main icons file
2010-02-25 11:20:36 +01:00
Evan Prodromou
ddc3671b6a
recover user_openid tables, which got lost in generation
2010-02-24 23:32:20 -05:00
Evan Prodromou
68a10970f9
fixup exe bits
2010-02-24 23:30:14 -05:00
Evan Prodromou
bd68154772
Make user_group able to handle remote groups
...
We add a local_group table to store data about local groups. It has
the unique key for nickname, so /group/<nickname> looks up here.
Updated DB data object classes and data files.
2010-02-24 23:28:41 -05:00
Evan Prodromou
374c488cf1
return attachement from saveHTMLFile()
2010-02-24 22:26:40 -05:00
Evan Prodromou
b08a527139
content_* to common_*
2010-02-24 22:22:42 -05:00
Evan Prodromou
75cf4d4312
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 22:03:01 -05:00
Evan Prodromou
942521ef30
if OStatus post is too long, show the summary and save it as an HTML attachment
2010-02-24 22:02:43 -05:00
Brion Vibber
58e232a10a
OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org)
...
Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
2010-02-25 02:56:56 +00:00
Brion Vibber
b798faf9ea
OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run.
2010-02-25 02:43:20 +00:00
Zach Copley
10884dcd49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
Brion Vibber
5173d92895
Merge StatusNet core localization updates from 0.9.x branch
2010-02-24 16:47:00 -08:00
Brion Vibber
3b7084c6dd
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
2010-02-24 16:34:45 -08:00
Brion Vibber
e04f556304
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 23:40:28 +00:00
Brion Vibber
e18e659ca3
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
2010-02-24 23:39:40 +00:00
Brion Vibber
93507a1927
OStatus: handle update-profile Salmon pings
2010-02-24 23:28:01 +00:00
Sarven Capadisli
b782225ade
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
...
This reverts commit 72037d6143
.
Until some of the XHR notice related bugs are sorted out in Opera and
Chromium, reverting back to the previous version. It throws slightly
less errors. XHR file attachments is still a bit problematic in
Opera 10.10/Ubuntu, Opera 10.10/Windows, and Chrome 4/Ubuntu. But this
revert will at least allow regular XHR notices to work okay in Opera
and Chromium.
Standards suck!
2010-02-25 00:10:36 +01:00
Brion Vibber
ec4899e617
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
...
Updated plugin README with available config options.
Cleanup for a bad element fallback lookup in Activity
2010-02-24 22:16:17 +00:00
Evan Prodromou
01cfe86cd2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 15:54:29 -05:00
Evan Prodromou
c0d13097dd
use Notice::bestUrl() to determine notice url in NoticeListItem::showNoticeLink()
2010-02-24 15:54:13 -05:00
Brion Vibber
0c7844734e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 20:38:38 +00:00
Brion Vibber
c36bdc1ba5
- break OMB profile update pings to a background queue
...
- add event hooks to profile update pings
- send Salmon pings with custom update-profile event to OStatus subscribees and groups (subscribers will see it on your next post)
- fix OStatus queues with overlong transport names, should work on DB queues now
- Ostatus_profile::notifyActivity() and ::notifyDeferred() now can take XML, Notice, or Activity for convenience
2010-02-24 20:36:36 +00:00
Evan Prodromou
269d567d94
use Subscription::start() for remote subscribes
2010-02-24 15:20:06 -05:00
Evan Prodromou
daea988786
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 15:00:52 -05:00
Brion Vibber
07214f1370
OStatus: save updated profile bits when they come in over the wire; fix up nicknames
2010-02-24 19:06:10 +00:00
Brion Vibber
5cabb63e4e
Include <author> with actor ID and name in Activity::asString(); fixes Salmon signature on OStatus unsub pings
2010-02-24 17:36:31 +00:00
Sarven Capadisli
959171acac
Added a cookie for the nickname cookie for the login page and prefill
...
the input field.
2010-02-24 16:39:16 +01:00
Sarven Capadisli
1f45273d53
Moved StatusNetInstance into SN in util.js
2010-02-24 16:35:20 +01:00
Sarven Capadisli
8e7606cc8d
Added processing indicator for .form_remote_authorize on ostatussub page
2010-02-24 15:20:44 +01:00
Sarven Capadisli
2466dbfc97
Break long strings in tagcloud
2010-02-24 14:55:35 +01:00
Zach Copley
618ce6a855
- Move ActivityParseTests to core
...
- Add test for Portable Contacts stuff
2010-02-23 23:58:21 -08:00