Siebrand Mazeland
878818d2c0
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 22:01:18 +01:00
Sarven Capadisli
e9c127ddd8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 15:26:27 -05:00
Sarven Capadisli
4113f28851
Added Subscribe button to remote user entity actions in profie lists
2010-03-02 15:25:32 -05:00
Sarven Capadisli
1550d1004d
Don't need to float the anchor
2010-03-02 15:24:07 -05:00
Brion Vibber
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
Craig Andrews
380439ba77
Redirect to main page when transparent SSO is in place for the CAS plugin (which is what the user expects)
2010-03-02 15:10:30 -05:00
Brion Vibber
b1ffbf17d3
Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort.
2010-03-02 12:06:40 -08:00
Brion Vibber
6b134ae4c7
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
...
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
Siebrand Mazeland
f65478b624
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-03-02 19:13:51 +01:00
Brion Vibber
f596e072e7
Fix for regression in updated mention checks, sometimes lost links to folks mentioned in the replied message.
2010-03-02 09:53:00 -08:00
Sarven Capadisli
e3c2b8e0b5
Refactored remote subscribe action in OStatus
2010-03-02 12:41:18 -05:00
Sarven Capadisli
88c33bbb57
Showing remote subscription button on the personal timeline
2010-03-02 12:35:27 -05:00
Sarven Capadisli
5abff91041
Generalized style for entity remote subscription action
2010-03-02 12:34:35 -05:00
Sarven Capadisli
350e1289af
Added event hook for before and after personal timeline content
2010-03-02 12:33:25 -05:00
Siebrand Mazeland
767d49495d
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:45:15 +01:00
Siebrand Mazeland
d08fd8254a
Document 404 "Page not found" server error for translators.
2010-03-02 17:30:22 +01:00
Siebrand Mazeland
53ac232f91
Documented all but one UI string in actions/accessadminpanel.php to get a feel on what documenting them in code actually means.
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:23:40 +01:00
Siebrand Mazeland
284b1dc014
* Change translator documentation using _m() as designed together with Brion
...
* Add more translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
Sarven Capadisli
623faf9f2d
Just a label change. Since the user already went ahead with
...
subscribing, in this step we are just confirming the profile.
2010-03-02 09:57:28 -05:00
Evan Prodromou
ffa80c50ff
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 03:41:03 -05:00
Evan Prodromou
e2578cfad6
Revert "Show <activity:subject> and no activity actors for user feed"
...
This reverts commit c25fc8a4b5
2010-03-02 03:40:43 -05:00
Zach Copley
f68e3dfba5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
don't duplicate title in summary in Atom output per RFC4287 4.2.13
Show <activity:subject> and no activity actors for user feed
Revert "show service debug info"
2010-03-02 00:38:50 -08:00
Zach Copley
9816b35063
Update Facebook plugin README with info about new admin panel
2010-03-02 00:38:00 -08:00
Evan Prodromou
40ac724797
don't duplicate title in summary in Atom output per RFC4287 4.2.13
2010-03-02 03:13:05 -05:00
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
