Commit Graph

10375 Commits

Author SHA1 Message Date
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
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
James Walker
a44641bdb6 oops. really embarassing typo (that explains some weird behaviour) 2010-07-28 23:59:46 -04:00
Evan Prodromou
e10621a52a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-07-28 17:51:07 -04:00
Evan Prodromou
a01bc6b575 Merge branch 'googleadsadminpanel' into testing 2010-07-28 17:50:49 -04:00
Evan Prodromou
659e8b26ac add admin panel for Adsense 2010-07-28 17:50:36 -04: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
Luke Fitzgerald
9b9a36e492 Introduce error checking when calling handleEvents 2010-07-28 11:56:15 -07:00
Luke Fitzgerald
2fe1b12804 Merge in Phergie changes 2010-07-28 10:42:01 -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
Luke Fitzgerald
dd882be803 Merge in Phergie fixes and remove some whitespace 2010-07-27 09:14:07 -07:00
Luke Fitzgerald
3c1d7d81cf Remove some testing/debugging code 2010-07-26 12:25:23 -07:00
Luke Fitzgerald
e911480587 Add timeout method to force call of idle to send ping 2010-07-26 11:21:11 -07:00
Luke Fitzgerald
82f44c5fa0 Fix typo 2010-07-26 11:14:18 -07:00
Luke Fitzgerald
742b302739 More Irc plugin work 2010-07-26 11:13:00 -07:00
Evan Prodromou
db90bcb329 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-07-26 10:32:30 -04:00
Luke Fitzgerald
950685a466 Merged in Phergie changes 2010-07-25 16:04:12 -07:00
Luke Fitzgerald
2645133c43 Use non-statusnet class 2010-07-24 20:04:00 -07:00
Luke Fitzgerald
3b9d720df5 Change ircmanager to not use unnecessary class 2010-07-24 20:03:16 -07:00
Luke Fitzgerald
c0214ac0a4 Merged in Phergie change (Allow sec/usec = 0) 2010-07-24 11:26:20 -07:00
Luke Fitzgerald
75373e4a7a Remove old comment 2010-07-24 10:07:02 -07:00
Luke Fitzgerald
007d9ec8ce Updated commenting 2010-07-24 10:01:37 -07:00
Luke Fitzgerald
9f0eea69ff Handle the case where confirmation is cancelled 2010-07-24 07:54:09 -07:00
Luke Fitzgerald
be0fb03560 Cosmetic: Rearrange code 2010-07-23 14:13:37 -07:00
Luke Fitzgerald
4dcf2a1f51 Another comment 2010-07-23 13:57:39 -07:00
Luke Fitzgerald
13c63d554d Added some missing comments 2010-07-23 13:40:11 -07:00
Luke Fitzgerald
f1f78b3142 Remove Phergie diff file 2010-07-23 13:34:39 -07:00