Evan Prodromou
2526a5ae94
Merge branch 'master' into testing
2010-03-02 02:57:35 -05:00
Evan Prodromou
f504a9237e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 02:56:57 -05:00
Evan Prodromou
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
Zach Copley
6c1321b108
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 07:33:18 +00:00
Zach Copley
40e1b249cf
Initial Facebook admin panel
2010-03-01 23:31:56 -08:00
Zach Copley
1df8c2a44d
Some wording / spelling fixes
2010-03-01 22:58:27 -08:00
Zach Copley
27a49361eb
- Make 'Sign in with Twitter' optional
...
- Updates to the Twitter bridge plugin README
2010-03-01 22:41:07 -08:00
Zach Copley
82c9714fca
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
High-priority OStatus fixes:
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
2010-03-01 21:54:53 -08:00
Zach Copley
871b3aa6c0
Remove un-needed config variable for enabling/disabling Twitter integration
2010-03-01 21:52:31 -08:00
Zach Copley
6b2d67216e
Initial Twitter bridge admin panel
2010-03-01 21:35:24 -08:00
Craig Andrews
68347691b0
Don't attempt to retrieve the current user from the DB while processing a DB error
2010-03-01 21:53:54 -05:00
Brion Vibber
c38ed1bb19
High-priority OStatus fixes:
...
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:48:45 -08:00
Brion Vibber
680ace1966
High-priority OStatus fixes:
...
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:46:34 -08:00
Craig Andrews
a0114f2006
Correctly handle the case when MIME/Type doesn't know what file extension a mime type maps to
2010-03-01 21:44:42 -05:00
Craig Andrews
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
Craig Andrews
f9dd83caa7
Modify configuration to have an option to allow uploads regardless of mime type
2010-03-01 21:44:41 -05:00
Brion Vibber
3c0729786d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-01 16:59:40 -08:00
Brion Vibber
e30af99873
Merge branch 'work' into testing
2010-03-01 16:57:58 -08:00
Brion Vibber
493b5479c1
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
...
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
Zach Copley
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
Brion Vibber
45e8819c1b
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
2010-03-01 16:35:36 -08:00
Evan Prodromou
2c677e0f2d
Revert "show service debug info"
...
This reverts commit 19ec0e3a62
2010-03-01 18:49:39 -05:00
Evan Prodromou
0512151eab
more output in updateostatus.php
2010-03-01 18:19:20 -05:00
Evan Prodromou
503bc53762
Merge branch 'omb2ostatus' of root@windba.gs:/var/www/statusnet into omb2ostatus
...
Conflicts:
lib/omb.php
2010-03-01 18:08:31 -05:00
Evan Prodromou
f7c2c19ce8
lost important fields when switching queries
2010-03-01 18:07:21 -05:00
Evan Prodromou
19ec0e3a62
show service debug info
2010-03-01 18:03:18 -05:00
Evan Prodromou
64918cfd35
pass listener URI into consumer for OMB
2010-03-01 18:03:18 -05:00
Evan Prodromou
656a977016
remove strict check on OMB exception strings
2010-03-01 18:03:18 -05:00
Evan Prodromou
c7d8641e7d
return correct HTTP status code for OMB errors
2010-03-01 18:03:18 -05:00
Evan Prodromou
1414b6b849
send smaller error pages for OMB API endpoints
2010-03-01 18:03:18 -05:00
Evan Prodromou
17c2c793a5
Remove check for secret in token deletion on Subscription::cancel()
2010-03-01 18:03:17 -05:00
Evan Prodromou
48ce511f94
Better logging on bad token in subscription
2010-03-01 18:03:17 -05:00
Evan Prodromou
c3ba26bb99
Return empty array when no subscriptions to remote
2010-03-01 18:03:17 -05:00
Evan Prodromou
320036dbfb
drop tokens for OMB on unsubscribe
2010-03-01 18:03:17 -05:00
Evan Prodromou
d77248343f
fix path for updateostatus.php
2010-03-01 18:03:17 -05:00
Evan Prodromou
3ff3abb247
Script to convert OMB subscriptions to OStatus subscriptions
2010-03-01 18:03:17 -05:00
Zach Copley
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
Zach Copley
bb94f160bd
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery.
Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post.
Update pot file
2010-03-01 14:59:54 -08:00
Brion Vibber
3c4ead4996
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php
2010-03-01 14:59:26 -08:00
Zach Copley
a5dc5f9c62
Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-01 14:58:06 -08:00
Evan Prodromou
79b2e671c2
show service debug info
2010-03-01 17:55:46 -05:00
Brion Vibber
7bbdea1032
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-03-01 14:55:09 -08:00
Brion Vibber
00f724d0e6
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
2010-03-01 14:10:13 -08:00
Siebrand Mazeland
bf95fa92b5
Fix forgotten "m" in 8e102da76c
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 22:35:27 +01:00
Siebrand Mazeland
8e102da76c
Add contextual documentation to allow better localisation.
2010-03-01 22:28:38 +01:00
Brion Vibber
946445eea9
Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery.
...
Index was present on live identi.ca database but missing from master definitions: group_inbox_notice_id_idx
2010-03-01 13:09:20 -08:00
Evan Prodromou
1ac3d15242
pass listener URI into consumer for OMB
2010-03-01 15:59:24 -05:00
Evan Prodromou
baee6dac9e
remove strict check on OMB exception strings
2010-03-01 15:39:41 -05:00
Evan Prodromou
9b4ee90704
return correct HTTP status code for OMB errors
2010-03-01 15:31:20 -05:00
Brion Vibber
e529ceee21
Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post.
2010-03-01 12:20:04 -08:00
