Commit Graph

4508 Commits

Author SHA1 Message Date
Evan Prodromou 83dfe5ed3e show addressees in notice lists 2011-04-16 15:30:50 -04:00
Evan Prodromou b3e7838552 show best name in noticelistitem 2011-04-16 11:22:46 -04:00
Evan Prodromou ff782f1d97 Thread by conversation, not id 2011-04-15 18:28:36 -04:00
Evan Prodromou 2dd81d9a5c add a threading notice stream class 2011-04-15 18:20:54 -04:00
Evan Prodromou 97bae46da1 Revert "Add threading notice stream class to threaded pages"
This reverts commit 97a8bae4a9.
2011-04-15 18:20:06 -04:00
Evan Prodromou 97a8bae4a9 Add threading notice stream class to threaded pages
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -04:00
Zach Copley da6822c1f0 Merge branch 'lists_fixes' into 1.0.x 2011-04-15 20:50:04 +00:00
Shashi Gowda b78e5de474 Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists. 2011-04-16 00:52:58 +05:30
Siebrand Mazeland c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland edb467978d Fix incorrect translator documentation. 2011-04-15 09:31:30 +02:00
Zach Copley bef1ed75b5 Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 22:29:11 +00:00
Evan Prodromou 3d9dc111a2 class on the invite link 2011-04-14 18:28:37 -04:00
Shashi Gowda 7224ca571c List timeline cache blowing wasn't working. fixed. 2011-04-14 22:28:25 +00:00
Evan Prodromou 873b1fb186 invite button section 2011-04-14 18:19:09 -04:00
Evan Prodromou f512e3df40 breakup Section::show() 2011-04-14 18:18:39 -04:00
Evan Prodromou 9eba121339 better title for active groups 2011-04-14 18:16:27 -04:00
Evan Prodromou e5a84bfca2 better title for active groups 2011-04-14 18:16:10 -04:00
Evan Prodromou 9208c94b29 don't show private lists; correct link in header 2011-04-14 17:27:26 -04:00
Evan Prodromou edee3995c2 no All groups link 2011-04-14 17:14:57 -04:00
Evan Prodromou c8a58c924b show lists as a comma-separated list in sidebar 2011-04-14 17:03:10 -04:00
Evan Prodromou 90e6eab68e show user's lists in sidebar 2011-04-14 16:57:50 -04:00
Evan Prodromou 14308c21db Don't show featuredusersection by default 2011-04-14 16:25:13 -04:00
Evan Prodromou a2d1eb399f disable sms, email by post by default 2011-04-14 16:24:56 -04:00
Evan Prodromou 9ef13976fc Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 16:09:18 -04:00
Evan Prodromou 80ba45d665 better title for personal tagcloud section 2011-04-14 16:08:26 -04:00
Evan Prodromou ddb03c9fc6 move follower/following/groups stats to those sections 2011-04-14 16:08:10 -04:00
Evan Prodromou 0c52ed76dd gallery actions use same aside as profile 2011-04-14 15:50:45 -04:00
Zach Copley 7a00be5cc7 Merge branch 'people_tag_fixes' into 1.0.x 2011-04-14 19:50:44 +00:00
Shashi Gowda 45952ff164 "Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside 2011-04-14 19:49:43 +00:00
Shashi Gowda 53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Shashi Gowda 22f6151a10 Annihilate profile_tag_inbox. 2011-04-14 19:45:31 +00:00
Evan Prodromou b64a1ef0e7 No All subscriptions/subscribers links 2011-04-14 15:43:08 -04:00
Evan Prodromou 0ff4dc0a03 just 8 groups per minilist 2011-04-14 15:07:24 -04:00
Evan Prodromou 52e3a72102 just one line of 8 in the minilist 2011-04-14 14:58:24 -04:00
Zach Copley bcafe0f819 Can't put a form (block level element) inside a span; changed it to a div 2011-04-13 17:34:31 -07:00
Zach Copley e188a11ef6 Fix public group nav to highlight properly when our group directory is selected 2011-04-13 16:11:34 -07:00
Zach Copley 0f9d6f4c82 DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page 2011-04-13 15:09:45 -07:00
Siebrand Mazeland f20ddaec56 Add plural support where needed for added/removed tags messages. 2011-04-13 13:30:21 +02:00
Zach Copley 03de85ed46 Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them. 2011-04-12 14:20:19 -07:00
Zach Copley fcd863bba9 Theming - add some new markup to DM and new notice pages 2011-04-12 11:54:12 -07:00
Evan Prodromou be467fef91 like search is the default for 1.0.x 2011-04-11 19:00:25 -04:00
Evan Prodromou 4331b8b4f1 make search results privacy-aware 2011-04-11 18:59:58 -04:00
Evan Prodromou 9204719522 inviteonly by default 2011-04-11 17:06:20 -04:00
Evan Prodromou 09cffc1928 hide and disable ToSelector for replies 2011-04-11 12:55:49 -04:00
Evan Prodromou d197c86a61 show full threaded notice list in conversation view 2011-04-11 12:39:06 -04:00
Evan Prodromou d7f96307dc all filtering stream classes take an optional profile parameter 2011-04-11 12:32:35 -04:00
Evan Prodromou 820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Evan Prodromou 61f62241da Get conversation root visible to this user in threadednoticelist 2011-04-11 11:19:11 -04:00
Evan Prodromou cc9f65ac81 pass profile down to ScopingNoticeStream in publicnoticestream 2011-04-11 11:17:38 -04:00
Evan Prodromou bae9eacaa1 use -1 for invalid arg default in ScopingNoticeStream 2011-04-11 11:17:14 -04:00
Samantha Doherty 13e2acaf5c Formatting for profile/group account blocks and entity action buttons. 2011-04-11 10:05:36 -04:00
Zach Copley 3ddaa5bff4 Fix bad i18n function call 2011-04-10 19:07:30 -07:00
Evan Prodromou 70faf76001 threadednoticelist takes a profile param 2011-04-10 20:16:51 -04:00
Evan Prodromou dfdde5d2bc groupnoticelist takes a profile param 2011-04-10 20:16:37 -04:00
Evan Prodromou 8b54f28330 getNotices() takes optional last 2 params 2011-04-10 20:16:14 -04:00
Evan Prodromou dad5db25e2 start the div 2011-04-10 19:34:48 -04:00
Evan Prodromou 57741c46ef try to fall back to default for exceptions on microapps 2011-04-10 19:33:11 -04:00
Siebrand Mazeland 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
Siebrand Mazeland cad040ce4e Leding tabs to spaces.
Superfluous whitespace removed.
2011-04-10 19:33:58 +02:00
Zach Copley e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Evan Prodromou c382a1d8cc fix errant class in notice content 2011-04-09 17:05:59 -04:00
Evan Prodromou 4d0f42aea2 Events for showing the 'tail' of a threaded notice 2011-04-09 16:58:38 -04:00
Evan Prodromou 8aacc4b84a Revert "Add an indicator saying to whom a notice is addressed"
This reverts commit 2c14185a52.
2011-04-09 16:30:52 -04:00
Evan Prodromou ec1579474c add classes to profile and group links in notices 2011-04-09 15:42:27 -04:00
Evan Prodromou 2c14185a52 Add an indicator saying to whom a notice is addressed 2011-04-09 15:41:48 -04:00
Shashi Gowda 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
Zach Copley 285c2ee72d Remove debugging statement 2011-04-08 17:41:40 -07:00
Zach Copley 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
Zach Copley 3022d711e3 Add some more events to aside profile blocks and rework a bit 2011-04-08 15:45:49 -07:00
Evan Prodromou 85c4e11f83 make ConversationNoticeStream accept a profile parameter 2011-04-08 18:03:18 -04:00
Evan Prodromou dc25564251 enable user directory and extended profile by default 2011-04-08 17:46:49 -04:00
Shashi Gowda 4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Shashi Gowda d442f59693 Fix weird alignment of controls in subscriptions page. The dots are gone now 2011-04-08 17:10:48 +05:30
Shashi Gowda 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
Shashi Gowda 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
Siebrand Mazeland 8d99a5f949 Whitespace updates. 2011-04-08 01:49:34 +02:00
Siebrand Mazeland f9f437f5da Update translator documentation. 2011-04-08 01:22:00 +02:00
Evan Prodromou 684d0a386d allow passing a profile to inboxnoticestream 2011-04-07 15:39:23 -04:00
Shashi Gowda e5495e7df8 Fix subscription lists 2011-04-08 00:39:40 +05:30
Evan Prodromou 5dfb8e2bc4 Use InboxNoticeStream class for inbox
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
Shashi Gowda 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
Evan Prodromou ca0f59d46a Revert "add some timing comments to output to debug poor performance"
This reverts commit a2782523d7.
2011-04-07 00:07:39 -04:00
Evan Prodromou 59d0e2f373 cache the notice count for threaded view 2011-04-06 23:17:17 -04:00
Evan Prodromou a2782523d7 add some timing comments to output to debug poor performance 2011-04-06 18:33:05 -04:00
Evan Prodromou 4b5f76d688 more flexible oEmbed handling 2011-04-06 17:57:33 -04:00
Shashi Gowda 14aef781ad Use the cool and new NoticeStream for people tag timeline 2011-04-06 11:25:50 +05:30
Siebrand Mazeland 69778f12c8 Update translator documentation.
Whitespace updates.
2011-04-06 01:55:29 +02:00
Siebrand Mazeland 3d36c755a3 Fix translator documentation issues. 2011-04-06 01:40:03 +02:00
Evan Prodromou 2138c3b339 a hook for showing the default local nav 2011-04-05 18:07:10 -04:00
Evan Prodromou a36fa8364a Move streams nav to groups nav 2011-04-05 17:49:45 -04:00
Evan Prodromou 77441beb97 Merge branch '1.0.x' into testing 2011-04-05 17:20:48 -04:00
Evan Prodromou 9568d17cb9 Add streams to left nav 2011-04-05 17:02:48 -04:00
Evan Prodromou 8697f1a1e7 alpha2 2011-04-05 15:47:35 -04:00
Evan Prodromou 1328023f88 Merge branch '1.0.x' into testing 2011-04-05 13:30:21 -04:00
Evan Prodromou 4b9c3335d4 default to private sites 2011-04-05 13:30:05 -04:00
Evan Prodromou 2d2c134a1f fix constructor error in FileNoticeStream 2011-04-05 13:28:41 -04:00
Evan Prodromou 36b331d469 Merge branch '1.0.x' into testing
Conflicts:
	plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou 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
Samantha Doherty 5bc6a8c614 Style changes for privacy selectors and markers. 2011-04-05 12:38:15 -04:00
Shashi Gowda ced00cf0bd Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-05 10:28:05 +05:30
Evan Prodromou ddbd4801e0 include protected flag for users in JSON or XML 2011-04-04 17:44:23 -04:00
Evan Prodromou b41c62a27c single flag for private groups 2011-04-04 16:58:52 -04:00
Shashi Gowda 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
Siebrand Mazeland cdebd59970 L10n consistency tweak. 2011-04-04 01:08:11 +02:00
Siebrand Mazeland 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
Brion Vibber c642eb2771 Switch some strings from heredoc to double-quotes so xgettext picks them up. 2011-04-03 15:37:39 -07:00
Siebrand Mazeland 9a6ee5e859 Update translator documentation. 2011-04-03 23:47:46 +02:00
Siebrand Mazeland 18185b2237 Tabs to spaces. 2011-04-03 23:02:24 +02:00
Siebrand Mazeland 7bd594e9d3 Use _m() instead of ngettext(). 2011-04-03 22:08:50 +02:00
Siebrand Mazeland ea8b468348 Update translator documentation.
Remove superfluous whitespace.
i18n/L10n tweaks.
2011-04-03 14:43:18 +02:00
Siebrand Mazeland b1d451f98b Upadte translator documentation.
Add FIXME for missing class documentation.
i18n/L10n tweaks.
Superfluous whitespace removed.
2011-04-03 14:24:55 +02:00
Siebrand Mazeland fec3edee45 Fix several L10n and i18n issues.
Add dummy method MessageListItem::messageListItemDummyMessages() to allow xgettext to add possible sources to POT files.
Mark a few i18n issues as FIXME as well as some messages for which the use case was not clear to me.
Merged some code on multiple lines into one.
Translator documentation added.
Remove superfluous whiteapace.
2011-04-03 01:09:02 +02:00
Siebrand Mazeland a466d4573a Fix incorrect parameter numbering. 2011-04-01 23:40:20 +02:00
Siebrand Mazeland 7abecb61bd i18n/L10n updates.
Translator documentation updated.
Superfluous whitespace removed.
Some FIXMEs added.
2011-04-01 19:47:24 +02:00
Siebrand Mazeland c17d8e0f5f Update translator documentation.
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
Evan Prodromou 61fe49b100 ActivityImporter gives up on any exception 2011-03-31 13:53:17 -04:00
Brion Vibber 02c2c3a6cc Provisional workaround for router inconsistencies in background processes that switch site configs.
Ensure that router is cleared when we do site setup; we can still fetch the data from cache, so it should stay fast, but should ensure that we don't end up with someone else's routes still set up, which may be an issue breaking some of the bookmark handling that needs routing with a rare plugin.
2011-03-30 14:18:29 -07:00
Brion Vibber da7c54023d Format timestamps as UTC in ActivityStreams output. While using local times is legit per spec, it's confusing to have it change around and confuses some clients that don't handle zones right. 2011-03-30 12:36:54 -07:00
Shashi Gowda 5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou f213ac33db fix call-by-reference deprecation warning in microappplugin.php 2011-03-30 05:10:07 -04:00
Brion Vibber 674e3c2a0e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/apistatusesretweet.php
	actions/repeat.php
	classes/Notice.php
	lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber 9adbb49fc9 Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)

These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Siebrand Mazeland 0a19674c9f @evan Fixed message domain for messages in plugins for recent commits.
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber 880661de4e Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view. 2011-03-29 15:40:07 -07:00
Brion Vibber 18a994d105 Fix typo in filteringnoticestream that caused some messages to get lost 2011-03-29 15:19:04 -07:00
Brion Vibber d7304d5659 php notice fix -- misspelled bit 2011-03-29 15:05:54 -07:00
Evan Prodromou 9f1603462d Merge branch 'limitdist2' into 1.0.x 2011-03-29 17:32:17 -04:00
Siebrand Mazeland 700018fd09 L10n/i18n updated.
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Evan Prodromou 32145484c2 Disallow repeats (retweets) of private notices
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.

Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou e862dcdb8a Merge branch '1.0.x' into limitdist2 2011-03-28 21:56:34 -04:00
Brion Vibber 5d31dd259a Subscription pending notification mail 2011-03-28 17:15:48 -07:00
Brion Vibber e5b5c256a3 Working subscription approval! 2011-03-28 17:08:04 -07:00
Brion Vibber a70e68e09c Work in progress: can create & cancel sub requests 2011-03-28 16:12:51 -07:00
Evan Prodromou ec5a43bf4f let actions set a default address for toselector 2011-03-28 16:24:02 -04:00
Evan Prodromou dca5e20b91 Make the to-selector clear left 2011-03-28 16:23:31 -04:00
Evan Prodromou b1783e8d49 make to_user/to_profile consistent in NoticeForm 2011-03-28 12:13:46 -04:00
Evan Prodromou 5147404ea2 ToSelector widget to send private notices
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
Evan Prodromou c1fd36c043 Merge branch '1.0.x' into limitdist2 2011-03-27 11:36:57 -04:00
Evan Prodromou c7defb32f9 NoticeForm constructor takes array of optional parameters
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
Evan Prodromou 53a3fd822d add indicator for limited-scope notices 2011-03-26 16:47:36 -04:00
Evan Prodromou c7f866b032 Caller can set scope for Notice::saveNew() 2011-03-26 15:49:46 -04:00
Evan Prodromou d69f912b00 Merge branch '1.0.x' into limitdist2 2011-03-25 16:18:10 -04:00
Evan Prodromou 7a56637baa Make function signature for getNoticeIds agree
There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.
2011-03-25 16:15:55 -04:00
Evan Prodromou e0d5093ee5 Merge branch '1.0.x' into limitdist2
Conflicts:
	lib/groupnoticestream.php
	lib/taggedprofilenoticestream.php
2011-03-25 15:57:07 -04:00
Evan Prodromou 84984fdbfe All notice streams check notice scope
Added filtering code so that notice streams check notice scope.

Added new class to implement filtering a stream, FilteringNoticeStream.

Added a subclass that does the logic for checking Notice scope.

And made all the streams use ScopingNoticeStream.
2011-03-25 12:22:22 -04:00
Siebrand Mazeland ac955699b6 Fix use of incorrect method causing i18n issue. 2011-03-25 10:13:26 +01:00
Siebrand Mazeland 3cc7dda478 * PHP short tags "<?" to full tag "<?php".
* superfluous whitespace removed.
2011-03-25 10:02:02 +01:00
Evan Prodromou 22bf63bb46 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-24 18:05:32 -04:00
Evan Prodromou 44bcc942b8 Break up stream code to use separate notice stream classes
Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.

Now, different classes implement NoticeStream.
2011-03-24 18:04:19 -04:00
Siebrand Mazeland 8a8a194316 Fix typo in documentation. 2011-03-24 17:02:28 +01:00