Ian Denhardt
762731d8ee
Merge branch 'master' of git://gitorious.org/statusnet/mainline
2010-08-02 11:10:19 -04: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
Mike Sheldon
a31d977b43
Make TemplatePlugin compatible with PHP 5.3
2010-07-31 23:10:22 +01:00
Siebrand Mazeland
44d01f70a6
Localisation updates from http://translatewiki.net
...
* add support for Danish
2010-07-31 23:59:22 +02: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
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
Matt Lee
ac005adbb2
fixed image path
2010-07-29 11:45:13 -04: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
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
Matt Lee
d85f4ddc7f
remove zealous label removal
2010-07-28 11:01:39 -04:00
James Walker
772018810b
Merge branch 'master' into testing
2010-07-27 12:18:40 -04:00
Matt Lee
163d7d60f8
updated copyright notice
2010-07-26 22:24:12 -04:00
Matt Lee
e82f9bc588
fixes for paths, etc
2010-07-26 22:10:17 -04:00
Matt Lee
c9769ce889
fixes for paths, etc
2010-07-26 22:10:01 -04:00
Matt Lee
a431c26498
added comments
2010-07-26 22:09:26 -04:00
Matt Lee
6b34a2111d
GNU social plugin (for look/feel), theme, template
2010-07-26 22:05:33 -04:00
Evan Prodromou
db90bcb329
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-07-26 10:32:30 -04:00
