Zach Copley
76c48a7099
Fix syntax err
2011-08-18 18:17:38 -07:00
Evan Prodromou
ff656a8b3a
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-18 17:27:55 -07:00
Siebrand Mazeland
edd8045375
Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK.
2011-08-18 15:11:10 +02:00
Siebrand Mazeland
30d0a1d3d9
Simplify message.
2011-08-18 14:21:43 +02:00
Evan Prodromou
827b13a2a4
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-16 15:59:06 -04:00
Siebrand Mazeland
fd4c72bf85
Fix awkward attempt at i18n.
2011-08-16 18:04:56 +02:00
Siebrand Mazeland
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
Siebrand Mazeland
bd32b69355
Fix punctuation.
2011-08-15 16:18:21 +02:00
Siebrand Mazeland
0a420fd7d0
More list...
2011-08-15 16:06:35 +02:00
Siebrand Mazeland
4239e2bb9e
Fix incorrect documentation.
2011-08-15 16:04:06 +02:00
Siebrand Mazeland
5115aa3e4c
tag -> list
2011-08-15 16:03:24 +02:00
Siebrand Mazeland
6319003a34
Change "stream" to "timeline" for consistency.
2011-08-15 15:57:36 +02:00
Siebrand Mazeland
6f386b2f8b
Update translator documentation.
2011-08-15 15:50:36 +02:00
Evan Prodromou
11f2078893
better exception handling in delicious importer
2011-08-09 13:07:36 -07:00
Evan Prodromou
632ed129eb
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-08-08 12:01:48 -04:00
Evan Prodromou
ac268773bf
Pass correct notice id to Memcached_DataObject::listGet() in getFaves()
2011-08-08 12:01:39 -04:00
Evan Prodromou
f405ffa507
Corrected pkeys for listGet()
2011-08-08 12:01:15 -04:00
Evan Prodromou
e09310ffb7
Cache the repeat_of query for noticelists
2011-08-08 10:51:13 -04:00
Evan Prodromou
0c762dde42
pre-fill all notices in conversations on the page
2011-08-08 10:39:45 -04:00
Evan Prodromou
ed31052d26
Store pkeys in cache for listGet()
...
I was storing the full objects in the cache for the listGet()
function. I've changed it to store only pkeys, and use pivotGet() to
get all the corresponding values.
This also required changing pivotGet() so it can get objects with
multi-column pkeys, which complicated the whole thing quite a bit. But
it seems to work OK.
2011-08-08 10:22:20 -04:00
Evan Prodromou
776fbfd26a
Merge branch '1.0.x' into testing
2011-08-05 10:43:14 -04:00
Evan Prodromou
8b32ac85d8
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-05 10:42:42 -04:00
Evan Prodromou
0502e1d737
Properly structure X-XSS-Protection header
2011-08-05 10:42:18 -04:00
Zach Copley
fc2e6ea172
Fix syntax err
2011-08-04 12:06:57 -07:00
Evan Prodromou
7db5abff69
Merge branch '1.0.x' into testing
2011-08-03 12:50:33 -04:00
Evan Prodromou
7ce2b3c756
change 140-char limit to unlimited by default
2011-08-03 12:50:12 -04:00
Evan Prodromou
7d214953e3
Merge branch '1.0.x' into testing
2011-08-03 11:02:16 -04:00
Evan Prodromou
1c05ed0845
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-03 10:42:50 -04:00
Zach Copley
b2c8f1292d
Adjustment to the simulation script so I can use my own word list for test notices
2011-08-03 09:46:29 +00:00
Evan Prodromou
16042387a0
pre-fill the addressees of notices in a list
2011-08-03 00:59:09 -04:00
Evan Prodromou
ba6235a446
Get faves in Notice and pre-fill
2011-08-03 00:04:18 -04:00
Evan Prodromou
dfbdd481fa
Pre-fill Notice attachments
2011-08-02 23:12:21 -04:00
Evan Prodromou
9a84907d17
Remove unused File::getAttachments()
2011-08-02 23:11:41 -04:00
Evan Prodromou
9cab0958f5
use Notice::attachments() to get attachments for a notice
2011-08-02 18:22:06 -04:00
Evan Prodromou
d918ee95f4
pre-fetch groups for notices
2011-08-02 18:13:56 -04:00
Evan Prodromou
447ae92eca
only do a db call if need to fetch some in listGet()
2011-08-02 18:12:46 -04:00
Evan Prodromou
435c08a753
add listGet() method
2011-08-02 17:20:51 -04:00
Evan Prodromou
575ecd9f4c
Merge branch '1.0.x' into testing
2011-08-02 15:20:00 -04:00
Evan Prodromou
dc690459f5
1.0.0beta2
2011-08-02 15:12:27 -04:00
Evan Prodromou
513c54fa89
Merge branch 'master' into 1.0.x
...
Conflicts:
lib/common.php
2011-08-02 15:04:14 -04:00
Evan Prodromou
6ce8134471
New release because I'm stupid
2011-08-02 14:40:23 -04:00
Evan Prodromou
edb3f704b9
correctly include UTF-8 alphanum chars in tags
2011-08-02 14:03:12 -04:00
Evan Prodromou
897e3c87e5
encode values when inserting into MeteorUpdater JS
2011-08-02 13:49:27 -04:00
Evan Prodromou
10ce44c297
cleanse tags of non-tag characters when canonicalizing
2011-08-02 13:49:00 -04:00
Evan Prodromou
5081c56ea4
remove some debugging stuff in Profile::fillAvatars()
2011-08-02 13:14:11 -04:00
Evan Prodromou
f6a7335ccd
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-02 13:13:10 -04:00
Evan Prodromou
af49545e95
reduce the number of calls to get profile groups
2011-08-02 12:14:55 -04:00
Evan Prodromou
58d798b607
Change NoticeList::prefill() to a static function
2011-08-02 12:01:41 -04:00
Evan Prodromou
06e2422517
pre-fill avatars for Profiles in a notice list
2011-08-02 11:54:27 -04:00
Evan Prodromou
e05f423bea
properly cache nulls for pivotGet()
2011-08-02 11:54:10 -04:00