Luke Fitzgerald
2250273942
Only attempt callback if non-null
2010-08-04 08:46:04 -07:00
Luke Fitzgerald
4cfe04a68f
Remove old debugging code
2010-08-03 20:07:59 -07:00
Evan Prodromou
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
Evan Prodromou
004e42e3e0
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-08-03 16:04:54 -07:00
Evan Prodromou
b17fc0ca5b
update tests to include 'mentioned' links
2010-08-03 16:04:19 -07:00
Evan Prodromou
e2c90576c0
re-add mentioned link lost in last merge
2010-08-03 16:01:50 -07:00
Evan Prodromou
2ba36fc242
Merge branch 'activityhooks' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc
Merge branch 'testing' into 0.9.x
2010-08-03 15:57:05 -07:00
Evan Prodromou
cc71f1ae82
output Atom dates in UTC
2010-08-03 15:55:40 -07:00
Evan Prodromou
f83171824f
correctly show <source> for atom feeds
2010-08-03 15:50:21 -07:00
Evan Prodromou
744233c6dc
add actor info to tests
2010-08-03 15:49:49 -07:00
Evan Prodromou
8d19162122
more tests for activity generation
2010-08-03 15:26:19 -07:00
Evan Prodromou
6756a752c4
add some more tests for replies and group posts
2010-08-03 14:17:36 -07:00
Evan Prodromou
1a6148f0e4
initial unit tests for activity generation
2010-08-03 13:41:44 -07:00
Luke Fitzgerald
678911af24
Revert "Merged in Phergie changes"
...
This reverts commit a3df3b6367
2010-08-03 11:45:55 -07:00
Luke Fitzgerald
c71319419b
Cosmetic whitespace change
2010-08-03 10:02:47 -07:00
Luke Fitzgerald
a3df3b6367
Merged in Phergie changes
2010-08-03 09:42:02 -07:00
Siebrand Mazeland
74d8746697
Localisation updates from http://translatewiki.net
2010-08-03 15:31:54 +02:00
Evan Prodromou
f12cafb275
correct output for EndActivityInReplyTo event
2010-08-02 17:56:44 -07:00
Evan Prodromou
936f97b914
document activity entry hooks
2010-08-02 17:56:23 -07:00
Evan Prodromou
fe2b4fdf1c
add some activity hooks
2010-08-02 17:16:04 -07:00
James Walker
5fa19a0384
Merge branch '2429' into 0.9.x
2010-08-02 16:45:23 -04:00
James Walker
8120842780
Fix for #2429 - move OStatus XML writing to XMLStringer
2010-08-02 16:42:28 -04:00
Brion Vibber
c56939d596
Remove the 'Enable Twitter import' checkbox from Twitter admin panel by default; can be re-added with setting:
...
addPlugin('TwitterBridge', array('adminImportControl' => true, ....));
Added a note on the label that it requires manual daemon setup. (Note that by default the admin panel won't be shown, so it's no biggie to be hiding this for now.)
2010-08-02 13:00:50 -07:00
James Walker
56294016a7
fix #2478 - ensure all XRD documents get proper content-type headers
2010-08-02 14:47:13 -04:00
James Walker
eaef724c49
urgh. typo
2010-08-02 14:24:50 -04:00
James Walker
e603632f13
add support for Salmon's new "mentioned" rel value
2010-08-02 14:06:14 -04:00
James Walker
517c7483d1
move to rel="salmon" (per latest spec)
2010-08-02 13:24:38 -04:00
Brion Vibber
a1aea74fe2
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-08-02 09:43:58 -07:00
Siebrand Mazeland
557c6aa40f
Localisation updates from http://translatewiki.net
2010-08-01 01:04:01 +02:00
Siebrand Mazeland
46bffe3d69
Tweak message per suggestion of The Evil IP Address[1].
...
[1] http://translatewiki.net/w/i.php?title=Thread:Translating_talk:StatusNet/to_their_attention%3F&oldid=2220913
2010-08-01 00:16:39 +02:00
Siebrand Mazeland
44d01f70a6
Localisation updates from http://translatewiki.net
...
* add support for Danish
2010-07-31 23:59:22 +02:00
Luke Fitzgerald
68ec3f855d
Fix a bunch of bugs where DB object wasn't correctly defined
2010-07-31 10:47:58 -07:00
Brion Vibber
2b0a8c8cb3
Merge branch '2286' into 0.9.x
2010-07-30 17:52:19 -07:00
Brion Vibber
1bb18e9bab
Merge branch '2471' into 0.9.x
2010-07-30 17:52:12 -07:00
Luke Fitzgerald
0f7fdd4804
Changes to make plugin use database instead of polling session readiness
2010-07-30 17:12:35 -07:00
Brion Vibber
84726791d3
Fix for ticket #2286 : [mobile] Text extends beyond border of repeat confirmation dialog floater box on iPhone
...
http://status.net/open-source/issues/2286
This bit of CSS was constricting the vertical size of the popup form for repeats:
.notice-options form {
width:16px;
height:16px;
}
I can only assume this was originally meant to constrain the mini inline AJAX forms to the size of the clickable buttons, but it doesn't make a difference to how those are displayed on iPhone, Android, or Opera Mini.
Removing the statement lets the popup form go to its natural size, covering the button.
2010-07-30 14:12:37 -07:00
Brion Vibber
0caebc9308
Fix for ticket #2471 : install.php returns unsuccessfully but doesn't display error message if PHP < 5.2.6 is used
...
http://status.net/open-source/issues/2471
Old bit of code didn't get updated for new installer
2010-07-30 13:16:47 -07:00
Siebrand Mazeland
8f8588026b
Fixes for messages after review by Brion.
2010-07-30 19:25:55 +02:00
Siebrand Mazeland
e753422480
* Address i18n related FIXMEs after talk with Brion.
...
* Tweak message
2010-07-30 19:15:07 +02:00
James Walker
47f19988d1
allow schema to work on more than one connection (namely, the Status_network DB)
2010-07-29 21:04:28 -04:00
James Walker
c2a26ba653
removing redundant constructor
2010-07-29 21:03:48 -04:00
Zach Copley
fb2e00eacc
Merge branch 'master' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-07-29 20:44:11 +00:00
James Walker
fadeafbccc
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-07-29 16:33:08 -04:00
James Walker
3fa76463ed
oops. really embarassing typo (that explains some weird behaviour)
2010-07-29 16:32:41 -04:00
Zach Copley
0faa988e91
Fix for issue ID 2290: make sure errors are returned in the right
...
format, and use callback for errors when the request is JSONP
2010-07-29 20:31:22 +00:00
Brion Vibber
54d723adc1
Initial fix for #2479 : New post should be displayed on timeline only if it belongs there (AJAX post)
...
Previously we pushed out your latest post into the currently visible timeline regardless of whether it belonged there or not. This could be pretty confusing!
Currently we don't have clearly machine-readable info on the page and returned notice HTML to determine whether it belongs, but we can do a couple checks easily which I've added:
* public timeline (always show)
* 'and friends' timeline (show for your own page only)
* profile timeline (show for your own page only)
Other places that should be added in the future:
* group timelines if it's a group your posting to
* tag timelines if the post contains the tag
* reply & friends timelines for people you've mentioned
Currently those aren't easy since the mention/group target links in the notice HTML are using the canonical form with user or group ID, while the available navigation links we can use to identify the current page use the names.
2010-07-29 13:27:09 -07:00
Zach Copley
4e8e77f6b0
Return HTTP 403 instead of 400 when silenced users try to post via API
2010-07-29 18:47:28 +00:00
Siebrand Mazeland
a0b35f35b4
Localisation updates from http://translatewiki.net
2010-07-29 20:29:48 +02:00
Siebrand Mazeland
125ff142e8
* mark a few message for translation
...
* add translator documentation
2010-07-29 13:36:08 +02:00
