Commit Graph

9949 Commits

Author SHA1 Message Date
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
Siebrand Mazeland 312c6b6865 * add FIXME for messages that may need i18n.
* trailing whitespace removed.
2010-07-29 13:18:41 +02:00
Siebrand Mazeland 5813ecada2 * add translator documentation
* mark strings for translation
* add FIXME for unclear/confusing message
2010-07-29 13:01:04 +02:00
Siebrand Mazeland e7acb45b57 * add string for translation with translator documentation
* add FIXMEs for strings that may need i18n, but leaving decision to other dev(s)
2010-07-29 12:58:48 +02:00
Siebrand Mazeland f241cdcbb3 * mark two untranslatable server exceptions as translatable
* number parameters when multiple are user in a message
* update translator documentation
2010-07-29 11:34:58 +02:00
Siebrand Mazeland 81d562d4b7 Update po files 2010-07-28 22:40:22 +02:00
Siebrand Mazeland cb09b5c62a Update pot 2010-07-28 22:38:48 +02:00
Siebrand Mazeland e694da24a9 Number parameters 2010-07-28 22:17:54 +02:00
Siebrand Mazeland 97728791a1 Localisation updates from http://translatewiki.net 2010-07-28 22:13:37 +02:00
Brion Vibber ab2c3686b7 Merge branch 'testing' into 0.9.x 2010-07-28 11:59:42 -07:00
Brion Vibber 189d341733 Merge branch 'master' into testing 2010-07-28 11:56:55 -07:00
James Walker 5688c635a6 backwards compatibility for old tags format in hasTag 2010-07-28 12:13:53 -04:00
James Walker 5daa5bc2af try/catch just in case.. 2010-07-28 12:04:37 -04:00
James Walker 29b8a6a18f don't try to save empty tags 2010-07-28 11:57:54 -04:00
James Walker 4853b1e2a0 SQL script to update status_network table 2010-07-28 11:50:04 -04:00
James Walker dd7647aa95 script to normalize status_network tags 2010-07-28 11:49:09 -04:00
James Walker a6b1feb08c leaving tags column in (for now) 2010-07-28 11:43:47 -04:00
James Walker 772018810b Merge branch 'master' into testing 2010-07-27 12:18:40 -04:00
Evan Prodromou db90bcb329 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-07-26 10:32:30 -04:00
Evan Prodromou dbb5e9e191 accept mailto: URIs as OStatus identifiers 2010-07-22 16:00:26 -07:00
Brion Vibber 3040a5ff85 Quick fix for IE7 via sammy: remove redundant media specifiers from base style @import in main themes.
The <link>s already specify screen/etc media, so all it was doing was breaking. There are still some issues, but most things seem to work-ish as long as Realtime plugins are off.
2010-07-22 05:22:09 +00:00
Zach Copley 25e963769c Revert "Revert "Change the cache window on notices from 61 to 200, the max number""
This reverts commit a65b3f171c.
2010-07-21 12:29:47 -07:00
James Walker 7065450f03 normalizing tags for status_network 2010-07-20 17:34:58 -07:00
Eric Helgeson 9b899eea75 Make some messages gender neutral. 2010-07-19 21:09:09 -05:00
Zach Copley a65b3f171c Revert "Change the cache window on notices from 61 to 200, the max number"
This reverts commit d51820adc5.
2010-07-19 17:38:11 -07:00
Brion Vibber f0620a74c8 Provisional OAuth, OpenID token check timing attack patches 2010-07-19 16:47:49 -07:00
Zach Copley d51820adc5 Change the cache window on notices from 61 to 200, the max number
of notices available at one time through the API. Note: this will
require a memcache restart.
2010-07-19 13:47:42 -07:00
Zach Copley 65862d8f7f Suppress HTTP error headers for JSONP API output 2010-07-16 14:40:22 -07:00
Evan Prodromou d73feb82d8 cache sitemap notice and user counts for 4h 2010-07-14 10:38:34 -04:00
Evan Prodromou 453a06fff4 Exceptions are caught and continued on JSON, XML, Atom and RSS output in API 2010-07-13 11:11:29 -04:00
Evan Prodromou 1044f27e47 handle missing profile for notices better in Rss10Action 2010-07-13 10:59:15 -04:00
Evan Prodromou d706a3e21b handle missing profile for notices better in NoticeList 2010-07-13 10:59:01 -04:00
Evan Prodromou 6968c96b44 log exceptions in atom feeds, but don't let them kill the output 2010-07-13 10:53:47 -04:00
Evan Prodromou dfd65a4290 push exception on missing profile down to Notice::getProfile() 2010-07-13 10:51:25 -04:00
Evan Prodromou ab149755b6 handle notices without profiles better in RSS output 2010-07-13 10:42:06 -04:00
Brion Vibber 1339f1f908 Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:24:43 -07:00
Brion Vibber d645b342ac Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:22:36 -07:00
Brion Vibber cd29d3d646 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-07-12 14:21:57 -07:00
Brion Vibber 1b3b7f9a42 Ticket 2427: fix regression in plugin i18n 2010-07-12 10:27:23 -07:00
Brion Vibber 974c4df029 Ticket 2433: Skip locale fallback list check on Windows ('locale -a' shell-out doesn't work there) 2010-07-12 09:56:32 -07:00
Evan Prodromou bb2f5defd5 remove debugging statement and add a bit of output to updatecounts 2010-07-10 09:58:27 -04:00
Evan Prodromou d53d0f7908 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-07-10 09:51:49 -04:00