Commit Graph

298 Commits

Author SHA1 Message Date
Brion Vibber 04ca706601 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php
2010-11-02 15:02:10 -07:00
Brion Vibber 6a181bb128 Unrolled tagged vs untagged, page 1 vs page N message variants for showstream title. #2668 2010-11-02 14:20:06 -07:00
Brion Vibber 426cda5e1f Alternate pretty-title tweaks for #2668 2010-11-02 13:42:44 -07:00
Brion Vibber ca489631db Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Siebrand Mazeland 4b4894b121 Many i18n/L10n updates and lots of descriptions for translators added. 2010-10-20 00:35:39 +02:00
Brion Vibber 7765ddae81 Merge branch '0.9.x' into 1.0.x
Conflicts:
	README
	lib/default.php
2010-10-18 12:17:11 -07:00
Evan Prodromou 7c05b0dafc options to nofollow external links in notices 2010-10-18 11:29:52 -04:00
Brion Vibber 5c4723919f Merge branch '0.9.x' into 1.0.x 2010-10-04 13:06:40 -07:00
Brion Vibber 12f68c4ff2 Throw in a quick event hook to override the profile list type on showstream (should be made more general in future).
Replace with a NoticeList to have output include avatar and username -- but CSS still hides them in default theme.

Event::addHandler('ShowStreamNoticeList', 'awesome');
function awesome($notice, $action, &$pnl)
{
    $pnl = new NoticeList($notice, $action);
    return false;
}
2010-10-01 11:05:15 -07:00
Evan Prodromou 9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Siebrand Mazeland 46bffe3d69 Tweak message per suggestion of The Evil IP Address[1].
[1] http://translatewiki.net/w/i.php?title=Thread:Translating_talk:StatusNet/to_their_attention%3F&oldid=2220913
2010-08-01 00:16:39 +02:00
Eric Helgeson 9b899eea75 Make some messages gender neutral. 2010-07-19 21:09:09 -05:00
Craig Andrews 32084e33a2 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-02-16 10:25:57 -05:00
Brion Vibber 384387c9b0 OStatus cleanup...
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
2010-02-08 14:58:12 -08:00
Craig Andrews 057ec1fcea Merge branch '0.9.x' into 1.0.x
Conflicts:
	EVENTS.txt
	lib/imqueuehandler.php
	lib/jabber.php
	lib/util.php
	plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Evan Prodromou 30268cff78 Add Really Simple Discovery (RSD) support
Anil Dash suggested that all implementers of the Twitter API include
support for the remedial RSD format. This commit adds an RSD action
that returns the API root and additional API data to help client
developers discover and use our Twitter-compatible API.

http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html
http://tales.phrasewise.com/rfc/rsd
2010-01-31 15:16:59 -05:00
Craig Andrews d14651706c Merge branch '0.9.x' into 1.0.x 2010-01-28 16:13:06 -05:00
Sarven Capadisli 17f2096d70 Removed avatar from repeat of username (matches noticelist) 2010-01-28 15:08:33 +01:00
Sarven Capadisli 5b1245a32a Removed avatar from repeat of username (matches noticelist) 2010-01-28 15:06:03 +01:00
Craig Andrews 914bc9f9c5 Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/queuemanager.php
2010-01-27 22:07:04 -05:00
Craig Andrews e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00
Evan Prodromou e400437d57 fix interpolation for positional arguments in showstream 2010-01-24 22:50:07 -05:00
Siebrand Mazeland b0aea3f9c1 * L10n updates: consistent puctuation
* i18n updates: number parameters if more than one are being used
2010-01-10 01:45:58 +01:00
Evan Prodromou 0cb1feed51 show repeated notice's author on profile page 2009-12-11 12:16:11 -05:00
Brion Vibber 088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Siebrand Mazeland 5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Shashi b12caedb88 Widgetized user profile rendering. 2009-11-04 18:41:17 +05:30
Craig Andrews 35ace5562d Fix feed links which were broken when the API was restructured 2009-10-29 19:09:42 -04:00
Evan Prodromou e88dd2d087 fix uninitialized variables in showstream.php 2009-10-29 14:34:08 -04:00
Evan Prodromou 76ac7c358a add lots of events to customize the profile page 2009-10-09 16:14:20 -04:00
Evan Prodromou 44a59bbc2d add some hooks for the profile page 2009-10-09 15:28:12 -04:00
Evan Prodromou 5702764e52 Rationalize logic in showProfile()
Pulled together some of the if() statements in showProfile() so they
weren't so redundant.

Also, reformatted the file. Lots of whitespace gar.
2009-10-07 05:55:54 -04:00
Evan Prodromou 8ade2e1c7d don't reset in showProfile() 2009-10-07 05:43:18 -04:00
Evan Prodromou 8284b3cb82 Merge branch '0.8.x' into 0.9.x
Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php
2009-09-23 09:45:22 -04:00
Christopher Vollick c4ef2346b8 Pagination of user/tag was navigating to wrong page.
Fixes bug #1736.
2009-09-16 05:07:33 -04:00
Evan Prodromou 5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou 865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou 59beff6b46 Revert "Added configuration option to only allow OpenID logins."
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
2009-08-21 16:45:42 -04:00
Jeffery To 14b46e2183 Added configuration option to only allow OpenID logins.
If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.

The user will still need to set a password to access the API and RSS
feeds.
2009-08-10 13:57:39 +08:00
Evan Prodromou 07f5797f2f Make the personal tag streams actually work 2009-06-17 15:04:57 -07:00
Evan Prodromou c2ba727d61 Merge branch '0.7.x' into 0.8.x 2009-06-14 15:58:19 -07:00
Evan Prodromou 203a5aba67 Some UI improvements for blocking and unblocking
Add unblock to the router table, so unblocking will work at all.

Block form and unblock form return to subscribers list, not
subscriptions list, by default.

showstream action sends its parameters to block and unblock forms to
better return to the right page.
2009-06-14 15:54:22 -07:00
Evan Prodromou c0853e3040 Merge branch '0.7.x' into 0.8.x 2009-06-10 09:09:57 -07:00
Evan Prodromou f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -07:00
Robin Millette f5606b6aa3 Added RSS for personal tags 2009-05-18 18:18:08 -04:00
Robin Millette 0271859c24 Added personal tag page: http://example.com/MY_NICK/tag/A_TAG 2009-05-18 17:18:57 -04:00
Evan Prodromou 5ff8d8d447 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Conflicts:
	actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang 99f4367d03 Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Evan Prodromou e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Robin Millette afebef50e4 showemptListMessage -> showEmptyListMessage method name cleanup. 2009-04-08 01:20:50 +00:00
Sarven Capadisli a839daad2e HTML br is not needed. Using 'clear' in CSS instead. 2009-04-07 23:45:22 +00:00
Robin Millette d704b3fa8e added filler/guide text to user timeline. 2009-04-07 23:14:02 +00:00
Evan Prodromou 50b32227d1 Add subscribers, subscriptions, groups to personal page
We show stats, subscriptions info on the personal page in the sidebar.
Pushed code from showstream.php into a common parent class for
personal and profile.
2009-04-07 17:47:08 -04:00
Evan Prodromou 73fbf65800 full name in title and h1 of the personal profile 2009-03-30 09:58:28 -04:00
CiaranG b4c273113c A couple more 'Join Now' messages that need disabling when the site is closed or invite only 2009-03-19 21:55:03 +00:00
Meitar Moscovitz 4327ae19d4 Fixes ticket:1053; removes spacing between hash and tag on profile page. 2009-02-17 18:37:02 +11:00
Sarven Capadisli 012288bdf6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 16:53:01 +00:00
Sarven Capadisli fc293545be Minor. Changed from @class location to label 2009-02-11 16:50:07 +00:00
Evan Prodromou 22b10399aa Unify feeds definition in actions
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Meitar Moscovitz b240a17194 Beginning to refactor document relationship links to reduce common code.
My attempts here are to mimic the `pagination()` method shared by
actions. I'm tentatively adding the `$count` property to actions so that
we can query the number of notices ''being displayed'' per page prior to
calling the actual `pagination()` method itself, since document
relationship `<link>` elements need to be output inside of `showHead()`,
before `showContent()`, which is where `pagination()` is, gets called.
2009-02-10 20:25:44 +11:00
Meitar Moscovitz 8cb3035b89 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 05:05:04 +11:00
Evan Prodromou 9b7c57d094 whitespace and formatting in showstream.php 2009-02-09 12:07:21 -05:00
Meitar Moscovitz 6e2f045837 Add machine-readable pagination using HTML4.01 `<link rel="next">`, etc.
These extra `<link>` elements only appear on pages where pagination
makes sense. They trigger functionality in some user agents, such as
Opera's Navigation Bar for more easily navigating forward and backwards
across a paged set of notices, messages, or group lists, etc.
2009-02-09 00:02:51 +11:00
Sean Murphy a3d5e00f64 Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:

	actions/showstream.php
2009-02-07 11:02:10 -05:00
Sean Murphy d6245dca63 Fixed #1048: Edit avatar link on profile page. 2009-02-06 18:36:34 -05:00
Evan Prodromou 343cd6f205 Move common_avatar_* functions to Avatar
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Zach Copley ab82978b2d Trac #894 and #1013 - fixed bad redirects after delete notice 2009-02-05 16:16:10 -08:00
Adrian Lang 68a3139d0b Fix #81: Profile and personal shows „you“ instead of username when looking at own profile / personal. While doing so I fixed a wrong gettext usage were the result was not sprintf'd, but concat'd. 2009-02-05 11:53:32 -05:00
Zach Copley c16ddd6775 trac1095 Profile page had bad alternate links for RSS and Atom feeds 2009-02-03 16:31:41 -08:00
Sarven Capadisli 5f004c0158 Added "Edit" entity_action.
Updated theme files.
2009-02-02 16:33:47 +00:00
sarven 8e4f985e45 Minor 2009-01-24 03:45:44 +00:00
Evan Prodromou 5f89b88650 showstream is readonly 2009-01-23 09:45:48 +01:00
sarven 500ed2f5eb Cleanup 2009-01-23 05:23:28 +00:00
sarven 961c5af3ce Anonymous notice 2009-01-23 03:47:32 +00:00
Evan Prodromou 13bd15b0b5 p -> div for markup wrapper 2009-01-23 04:31:50 +01:00
Evan Prodromou b09a58e8dc Add anonymous message for user pages 2009-01-23 04:15:03 +01:00
Evan Prodromou 4e7192579a Add personal tag cloud 2009-01-22 20:46:37 +00:00
sarven 07b52e19be Minor cleanup for future groups_related 2009-01-22 00:12:16 +00:00
sarven a57f12b06c selector name cleanup 2009-01-22 00:04:13 +00:00
sarven d72706ce9d Changed to @class entity_profile from @id user_profile. 2009-01-21 23:33:52 +00:00
sarven 4b42c35269 General markup and style cleanup 2009-01-21 22:44:27 +00:00
Evan Prodromou 3260106537 list of groups to profile page 2009-01-21 13:33:06 -05:00
Evan Prodromou ed9cb94ff3 fix sub/unsub buttons, profileminilist for sections 2009-01-21 13:03:33 -05:00
sarven 92e2f3babc Added @title to user_action inputs and anchor and form legends 2009-01-21 07:14:43 +00:00
sarven 27b627c094 Made user_actions styles more consistent 2009-01-21 06:54:17 +00:00
sarven 6c78421298 Moved common_profile_new_message_nudge() to showstream.php 2009-01-21 06:31:53 +00:00
sarven f51984175a Matching markup for tags 2009-01-21 01:22:08 +00:00
sarven 1ab0de3ddd If user has fn, then it will not link to their own profile with @class
'fn'. Only put @class 'fn' on the anchor if there is no fn.
2009-01-20 23:50:52 +00:00
sarven bb4a6a514b user_actions form markup and styling 2009-01-20 22:36:57 +00:00
sarven 96dc058bfa Using nickname only for uid 2009-01-20 05:58:35 +00:00
sarven 27308afe85 Added mark_hash for content (i.e., to indicate tags with the
character '#')
2009-01-20 05:11:45 +00:00
sarven 918bd84c0d Removed extra div 2009-01-20 05:06:46 +00:00
sarven 7f60558cbb User subscriptions markup 2009-01-20 05:04:41 +00:00
sarven ec1249d3ad User statistics markup 2009-01-20 04:57:15 +00:00
sarven 8e8c580586 showPageTitle() and showPageNoticeBlock()
and using url on nickname instead of fullname
2009-01-19 23:19:05 +00:00
sarven 774fc5378b user_profile markup 2009-01-19 22:40:21 +00:00