dcca04fd6f
Merge branch '1.0.x' into testing
2011-04-10 18:32:51 -04:00
d375317c7f
Better SQLStats output with 0 queries
2011-04-10 18:32:09 -04:00
5304373b0b
Merge branch '1.0.x' into testing
2011-04-10 14:20:46 -04:00
f0d762f196
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
cad040ce4e
Leding tabs to spaces.
...
Superfluous whitespace removed.
2011-04-10 19:33:58 +02:00
8c63d6ead4
Localisation updates from http://translatewiki.net .
2011-04-10 10:44:39 +02:00
e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00:00
396005ecf6
Fix incorrect parameter notation.
2011-04-10 01:32:57 +02:00
d6aea8e39e
Update translator documentation.
2011-04-10 01:24:15 +02:00
cfff80a730
If you search for a tag, redirect to tag page
2011-04-09 17:30:59 -04:00
638d29a820
Hide RSVPs from threaded notice output
2011-04-09 17:11:38 -04:00
b80ece1691
hide poll response notices from threaded view
2011-04-09 17:07:03 -04:00
c382a1d8cc
fix errant class in notice content
2011-04-09 17:05:59 -04:00
4d0f42aea2
Events for showing the 'tail' of a threaded notice
2011-04-09 16:58:38 -04:00
8aacc4b84a
Revert "Add an indicator saying to whom a notice is addressed"
...
This reverts commit 2c14185a52
2011-04-09 16:30:52 -04:00
ec1579474c
add classes to profile and group links in notices
2011-04-09 15:42:27 -04:00
2c14185a52
Add an indicator saying to whom a notice is addressed
2011-04-09 15:41:48 -04:00
8b46624d19
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-09 15:38:39 -04:00
070b07632b
Make sure something's an int before comparing to -1
2011-04-09 15:34:33 -04:00
5a377a24c9
Fix incorrect translator documentation. Spotted by OsamaK.
2011-04-09 21:08:41 +02:00
396a0c08b3
Localisation updates from http://translatewiki.net .
2011-04-09 20:53:29 +02:00
fc21e5c76b
Fix type conversion warnings caused when calling getUser / getProfile for the second time
2011-04-09 22:16:52 +05:30
f47027abbe
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
lib/profileblock.php
theme/default/css/display.css
2011-04-09 21:57:45 +05:30
a0ac51c22f
use notifyDeferred for tag/untag so that it gets queued offline
2011-04-09 17:18:33 +05:30
285c2ee72d
Remove debugging statement
2011-04-08 17:41:40 -07:00
e3789488c6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
use conversationnoticestream in conversationrepliesaction
use conversationnoticestream in conversationaction
make ConversationNoticeStream accept a profile parameter
enable user directory and extended profile by default
Remove incompatible theme victorian
Remove incompatible theme shiny
Remove incompatible theme pigeonthoughts
Remove incompatible theme mnml
Remove incompatible theme identica
Remove incompatible theme h4ck3r
Remove incompatible theme default
Remove incompatible theme cloudy
Remove incompatible theme cleaner
Remove incompatible theme clean
Remove incompatible theme biz
correctly return for deleted items
show event as deleted
Use pkeyGet() instead of idStream() for fave caching
store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
3022d711e3
Add some more events to aside profile blocks and rework a bit
2011-04-08 15:45:49 -07:00
9a86e64b46
use conversationnoticestream in conversationrepliesaction
2011-04-08 18:03:42 -04:00
79f3c0939b
use conversationnoticestream in conversationaction
2011-04-08 18:03:34 -04:00
85c4e11f83
make ConversationNoticeStream accept a profile parameter
2011-04-08 18:03:18 -04:00
dc25564251
enable user directory and extended profile by default
2011-04-08 17:46:49 -04:00
8cb0d7e708
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-08 17:09:15 -04:00
af02de01e5
Remove incompatible theme victorian
2011-04-08 17:08:29 -04:00
53df5470e8
Remove incompatible theme shiny
2011-04-08 17:08:29 -04:00
c0697752d2
Remove incompatible theme pigeonthoughts
2011-04-08 17:08:29 -04:00
86d99f3541
Remove incompatible theme mnml
2011-04-08 17:08:29 -04:00
28d254e130
Remove incompatible theme identica
2011-04-08 17:08:29 -04:00
eb4ec37add
Remove incompatible theme h4ck3r
2011-04-08 17:08:29 -04:00
0079a00042
Remove incompatible theme default
2011-04-08 17:08:29 -04:00
400f5033f9
Remove incompatible theme cloudy
2011-04-08 17:08:29 -04:00
ecf357f469
Remove incompatible theme cleaner
2011-04-08 17:08:28 -04:00
6f8ecc2e7b
Remove incompatible theme clean
2011-04-08 17:08:28 -04:00
7ad0404e42
Remove incompatible theme biz
2011-04-08 17:07:06 -04:00
8335d234f7
Don't try to show search and tag subs unless a user is logged in
2011-04-08 13:56:08 -07:00
bfc33f3999
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-08 16:14:09 -04:00
ea82086297
Update translator documentation.
...
Whitespace updates.
Header updates.
Break long lines in README.
Indentation updates.
2011-04-08 18:47:07 +02:00
b77531897a
Fixed incorrect single quotes with newlines from Commit:3e8bf13aab25050cce09a3180ea7b56c41ed40e3.
2011-04-08 18:47:04 +02:00
997babfea3
correctly return for deleted items
2011-04-08 12:15:32 -04:00
50c4731d20
show event as deleted
2011-04-08 12:14:05 -04:00
e0c00449bb
Hide legend and show best marker, for QnA answers when not displayed inline.
2011-04-08 11:10:34 -04:00
Evan Prodromou
Siebrand Mazeland
Zach Copley
Shashi Gowda
Samantha Doherty