e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00: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
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
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
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
4d61760154
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-08 17:16:20 +05:30
d442f59693
Fix weird alignment of controls in subscriptions page. The dots are gone now
2011-04-08 17:10:48 +05:30
14a82dae61
Sidebar sections to show peopletags and tag subscriptions.
...
FIXME: currently you can see the subscriptions section only on *your* profileaction pages, is this OK?
2011-04-08 16:22:51 +05:30
c44a94e8f5
Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS.
2011-04-08 14:51:05 +05:30
8d99a5f949
Whitespace updates.
2011-04-08 01:49:34 +02:00
f9f437f5da
Update translator documentation.
2011-04-08 01:22:00 +02:00
684d0a386d
allow passing a profile to inboxnoticestream
2011-04-07 15:39:23 -04:00
e5495e7df8
Fix subscription lists
2011-04-08 00:39:40 +05:30
5dfb8e2bc4
Use InboxNoticeStream class for inbox
...
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
ca0f59d46a
Revert "add some timing comments to output to debug poor performance"
...
This reverts commit a2782523d7
2011-04-07 00:07:39 -04:00
59d0e2f373
cache the notice count for threaded view
2011-04-06 23:17:17 -04:00
a2782523d7
add some timing comments to output to debug poor performance
2011-04-06 18:33:05 -04:00
4b5f76d688
more flexible oEmbed handling
2011-04-06 17:57:33 -04:00
14aef781ad
Use the cool and new NoticeStream for people tag timeline
2011-04-06 11:25:50 +05:30
69778f12c8
Update translator documentation.
...
Whitespace updates.
2011-04-06 01:55:29 +02:00
3d36c755a3
Fix translator documentation issues.
2011-04-06 01:40:03 +02:00
2138c3b339
a hook for showing the default local nav
2011-04-05 18:07:10 -04:00
a36fa8364a
Move streams nav to groups nav
2011-04-05 17:49:45 -04:00
77441beb97
Merge branch '1.0.x' into testing
2011-04-05 17:20:48 -04:00
9568d17cb9
Add streams to left nav
2011-04-05 17:02:48 -04:00
8697f1a1e7
alpha2
2011-04-05 15:47:35 -04:00
1328023f88
Merge branch '1.0.x' into testing
2011-04-05 13:30:21 -04:00
4b9c3335d4
default to private sites
2011-04-05 13:30:05 -04:00
2d2c134a1f
fix constructor error in FileNoticeStream
2011-04-05 13:28:41 -04:00
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
7533c7cfe1
Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
...
This reverts commit 880661de4e
2011-04-05 12:53:49 -04:00
5bc6a8c614
Style changes for privacy selectors and markers.
2011-04-05 12:38:15 -04:00
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
ddbd4801e0
include protected flag for users in JSON or XML
2011-04-04 17:44:23 -04:00
b41c62a27c
single flag for private groups
2011-04-04 16:58:52 -04:00
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
cdebd59970
L10n consistency tweak.
2011-04-04 01:08:11 +02:00
2dbdb0f185
Translator documentation updated/added.
...
i18n tweaks.
Superfluous whitespace removed.
YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
c642eb2771
Switch some strings from heredoc to double-quotes so xgettext picks them up.
2011-04-03 15:37:39 -07:00
9a6ee5e859
Update translator documentation.
2011-04-03 23:47:46 +02:00
18185b2237
Tabs to spaces.
2011-04-03 23:02:24 +02:00
7bd594e9d3
Use _m() instead of ngettext().
2011-04-03 22:08:50 +02:00
Zach Copley
Evan Prodromou
Shashi Gowda
Siebrand Mazeland
Samantha Doherty
Brion Vibber