Evan Prodromou
|
9f0715a993
|
Merge branch '0.9.x' into 1.0.x
|
2010-08-03 16:05:03 -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
|
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
|
f12cafb275
|
correct output for EndActivityInReplyTo event
|
2010-08-02 17:56:44 -07:00 |
|
Evan Prodromou
|
fe2b4fdf1c
|
add some activity hooks
|
2010-08-02 17:16:04 -07:00 |
|
James Walker
|
e603632f13
|
add support for Salmon's new "mentioned" rel value
|
2010-08-02 14:06:14 -04: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 |
|
Zach Copley
|
fb2e00eacc
|
Merge branch 'master' into 0.9.x
Conflicts:
classes/Notice.php
|
2010-07-29 20:44:11 +00:00 |
|
James Walker
|
3fa76463ed
|
oops. really embarassing typo (that explains some weird behaviour)
|
2010-07-29 16:32:41 -04: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
|
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
|
e694da24a9
|
Number parameters
|
2010-07-28 22:17:54 +02: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
|
29b8a6a18f
|
don't try to save empty tags
|
2010-07-28 11:57:54 -04:00 |
|
James Walker
|
772018810b
|
Merge branch 'master' into testing
|
2010-07-27 12:18:40 -04: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 |
|
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 |
|
Evan Prodromou
|
d73feb82d8
|
cache sitemap notice and user counts for 4h
|
2010-07-14 10:38:34 -04:00 |
|
Evan Prodromou
|
dfd65a4290
|
push exception on missing profile down to Notice::getProfile()
|
2010-07-13 10:51:25 -04:00 |
|
Zach Copley
|
4c5098cd32
|
Handle the case where a screen name has shifted from one Twitter ID to another
|
2010-07-08 21:17:11 +00:00 |
|
Brion Vibber
|
dcfe5b24f6
|
Fix regression in 92ded7c6cb56056a89bc8b3caabd08049104898e: spewed PHP notices when checking for enclosures due to uninitialized variables.
|
2010-06-28 15:20:50 -04:00 |
|
Brion Vibber
|
fa282823d9
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2010-06-26 15:10:47 -04:00 |
|
Brion Vibber
|
c6b1e25d17
|
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
|
2010-06-26 15:09:30 -04:00 |
|
Brion Vibber
|
ef7e85c0ab
|
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
|
2010-06-26 15:09:08 -04:00 |
|
Brion Vibber
|
f0c5e7eca3
|
Fix for bug #2382: releasing claim on failed queue item works again with DB-based queues.
Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
|
2010-06-26 15:07:32 -04:00 |
|
Brion Vibber
|
00e129b013
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2010-06-26 10:18:03 -04:00 |
|
Brion Vibber
|
696e4ba393
|
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)
|
2010-06-26 10:17:36 -04:00 |
|
Brion Vibber
|
d9e56e15cc
|
Merge branch 'master' into testing
|
2010-06-26 10:16:27 -04:00 |
|
Zach Copley
|
1eec7f779f
|
- Add profile_info tag to Atom author
- Normalize xmlns:statusnet links in the API
|
2010-06-22 16:28:06 -07:00 |
|
Zach Copley
|
105c1a22d6
|
Include source client's related URL (if any) in source attribution for
Atom notice feeds
|
2010-06-17 23:08:40 +00:00 |
|
James Walker
|
b667092153
|
adding a Status_network::updateKeys() method, since DB_DataObject update doesn't do keys.
|
2010-06-17 13:44:17 -04:00 |
|
Zach Copley
|
d3d499879c
|
- More useful group info from api/statusnet/group/show
- Add statusnet:group_info tag to group Atom feeds
|
2010-06-16 14:29:24 -07:00 |
|
Brion Vibber
|
004200f958
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2010-06-11 12:09:55 -07:00 |
|
Brion Vibber
|
7f3b3620af
|
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
|
2010-06-11 12:05:53 -07:00 |
|
Brion Vibber
|
b1a68e15b7
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
|
2010-06-10 15:37:06 -07:00 |
|
Brion Vibber
|
5a96b9e805
|
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
|
2010-06-07 10:34:00 -07:00 |
|
Brion Vibber
|
d88b208edc
|
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openid.php
|
2010-06-07 10:19:40 -07:00 |
|
Evan Prodromou
|
6d39a75137
|
use DB_DataObject_Cast objects in a couple of different places in the code
|
2010-06-04 15:29:38 -04:00 |
|
Evan Prodromou
|
cbdeb6fb8f
|
Merge branch 'master' of gitorious.org:statusnet/mainline
|
2010-06-04 13:26:25 -04:00 |
|