3664 Commits

Author	SHA1	Message	Date
Evan Prodromou	f38a8abd34	re-enable invite button and popular notice section on home stream	2011-04-23 13:45:43 -04:00
Evan Prodromou	07d164f8bd	disable fancy stuff in home sidebar	2011-04-22 09:26:42 -04:00
Evan Prodromou	0c0aabeda5	show tag cloud in public stream	2011-04-20 17:17:36 -04:00
Evan Prodromou	776c2c99ea	inbox tag cloud section	2011-04-20 16:11:42 -04:00
Evan Prodromou	a7a521e46a	Change avatar size on single notice page	2011-04-20 15:47:44 -04:00
Evan Prodromou	5650a6e9f7	Just use avatarSize() method for SingleNoticeItem	2011-04-20 13:39:23 -04:00
Evan Prodromou	24e1491582	don't override show() in SingleNoticeItem	2011-04-20 13:38:13 -04:00
Evan Prodromou	9b65efd64d	don't show notice attachments in single-notice view	2011-04-20 13:37:05 -04:00
Samantha Doherty	f7ffe1df86	Restore local nav to single notice and attachment pages.	2011-04-19 13:28:27 -04:00
Evan Prodromou	138ca38b6f	Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x ... Conflicts: plugins/EmailRegistration/emailregister.php	2011-04-18 20:19:25 -04:00
Siebrand Mazeland	2c105e5575	Update translator documentation.	2011-04-19 01:13:28 +02:00
Evan Prodromou	98b3f5ea91	no extra nulls on home page	2011-04-18 16:28:41 -04:00
Evan Prodromou	7a333e3175	recover password uses login menu	2011-04-18 16:19:00 -04:00
Evan Prodromou	9346d50102	inviter URL corrected	2011-04-18 13:40:27 -04:00
Evan Prodromou	122b38f354	check for valid email on invite	2011-04-18 13:26:46 -04:00
Evan Prodromou	d3215adfa1	Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x	2011-04-18 12:54:23 -04:00
Evan Prodromou	17adc94df7	DocFile::fromTitle() -> DocFile::forTitle()	2011-04-18 10:10:38 -04:00
Evan Prodromou	c30dcbebbc	no notice form on invites	2011-04-18 10:04:57 -04:00
Evan Prodromou	4a8a424bdf	Use mail templates for invite text	2011-04-18 09:04:11 -04:00
Evan Prodromou	ef67262a3f	Externalize document-finding code so plugins can use it	2011-04-18 06:16:32 -04:00
Siebrand Mazeland	cb28496054	Update people tag related UI messages. ... Update translator documentation accordingly.	2011-04-17 23:28:11 +02:00
Siebrand Mazeland	4ab995dd1e	Complete "people tag" to "list" in UI messages. ... Update translator documentation accordingly. Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".	2011-04-17 20:08:03 +02:00
Siebrand Mazeland	d68a86f019	people tag -> list	2011-04-17 02:15:17 +02:00
Siebrand Mazeland	049f23cdb3	people tag -> list	2011-04-17 02:11:46 +02:00
Siebrand Mazeland	271881d4dc	Fix translator documentation.	2011-04-17 02:09:47 +02:00
Siebrand Mazeland	f1316677d8	Add forgotten comment tag.	2011-04-17 02:06:17 +02:00
Siebrand Mazeland	c74adb5401	Fix typo in comment.	2011-04-17 00:53:29 +02:00
Evan Prodromou	d9f27fcb14	move Invite button to top	2011-04-16 16:12:04 -04:00
Evan Prodromou	3ba4258f9e	use notice list instead of threaded for list view	2011-04-15 18:56:24 -04:00
Evan Prodromou	9eafc8d0ba	use threadingnoticestream for groups	2011-04-15 18:54:35 -04:00
Evan Prodromou	ee81f98828	use threadingnoticestream for inbox	2011-04-15 18:51:18 -04:00
Evan Prodromou	52fce18e0a	use threading notice stream wrapper for public	2011-04-15 18:47:56 -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	55b58f0f1f	Update translator documentation.	2011-04-15 10:20:34 +02:00
Siebrand Mazeland	44bdc2ddaf	Remove obsolete code. ... Update translator documentation.	2011-04-15 10:12:49 +02:00
Zach Copley	335390f2ca	Merge branch 'onboarding-remix' into 1.0.x ... * onboarding-remix: * Show the right menus in the aside after successful registration * Events surrounding successful registration output	2011-04-14 15:46:40 -07:00
Zach Copley	951ee1faff	* Show the right menus in the aside after successful registration ... * Events surrounding successful registration output	2011-04-14 15:45:05 -07:00
Evan Prodromou	3df69fe5ba	show invite button in public	2011-04-14 18:19:59 -04:00
Evan Prodromou	0cc73b3b2a	show invite button section on home page	2011-04-14 18:19:18 -04:00
Evan Prodromou	93bfacad3b	no object nav for invite	2011-04-14 18:15:47 -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	4bda1b2a36	groups show same aside as profile	2011-04-14 15:53:18 -04:00
Evan Prodromou	b8a057bc2d	hide subscription tag sections	2011-04-14 15:51:07 -04:00
Evan Prodromou	f1da1a24d1	hide subscriber tag sections	2011-04-14 15:51:00 -04:00
Shashi Gowda	53af608ef8	People tags -> Lists (only UI changes, for experimentation)	2011-04-14 19:49:42 +00:00
Evan Prodromou	8def44bc57	no object nav for showstream	2011-04-14 15:47:01 -04:00
Shashi Gowda	22f6151a10	Annihilate profile_tag_inbox.	2011-04-14 19:45:31 +00:00
Evan Prodromou	4b5cbea16a	no popular notice section for tags	2011-04-14 15:33:59 -04:00
Evan Prodromou	c7a4aaddfc	show correct preview URL and hide delete button if avatar is not local	2011-04-14 11:47:55 -04: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	5454d22b79	Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x ... * '1.0.x' of gitorious.org:statusnet/mainline: Show both empty and full notice search results inside event wrapper More interesting test notices in createsim.php	2011-04-12 11:55:01 -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	606884385c	Show both empty and full notice search results inside event wrapper	2011-04-12 14:29:12 -04:00
Evan Prodromou	4331b8b4f1	make search results privacy-aware	2011-04-11 18:59:58 -04:00
Evan Prodromou	9c424cb7e6	events for validating outgoing invites	2011-04-11 16:49:28 -04:00
Evan Prodromou	25c5a1f0ef	hooks for adding email addresses	2011-04-11 16:38:57 -04:00
Evan Prodromou	d197c86a61	show full threaded notice list in conversation view	2011-04-11 12:39:06 -04:00
Evan Prodromou	1b00eb2599	Fix undefined variable in showgroup	2011-04-11 11:54:42 -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	19bd6fded4	pass user profile to ThreadedNoticeList in PublicAction	2011-04-11 11:18:12 -04:00
Siebrand Mazeland	abbe0cf4ab	Add space between two sentences.	2011-04-11 15:25:43 +02:00
Evan Prodromou	70faf76001	threadednoticelist takes a profile param	2011-04-10 20:16:51 -04:00
Evan Prodromou	5304373b0b	Merge branch '1.0.x' into testing	2011-04-10 14:20:46 -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
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	cfff80a730	If you search for a tag, redirect to tag page	2011-04-09 17:30:59 -04:00
Siebrand Mazeland	5a377a24c9	Fix incorrect translator documentation. Spotted by OsamaK.	2011-04-09 21:08:41 +02: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
Evan Prodromou	9a86e64b46	use conversationnoticestream in conversationrepliesaction	2011-04-08 18:03:42 -04:00
Evan Prodromou	79f3c0939b	use conversationnoticestream in conversationaction	2011-04-08 18:03:34 -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
Sam Nicholls	4bf5158d43	Modified actions/login.php to redirect logged in users who hit login/ to ... the site index. Removed the throwing of a clientError in favour of a common_redirect to index to fix Issue 2990: "If logged in, just redirect to home page on /login"	2011-04-08 12:06:55 +01:00
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
Evan Prodromou	fbc18a3c67	change apitimelinehome to use InboxNoticeStream	2011-04-07 15:35:00 -04:00
Evan Prodromou	831eaa039b	use inboxnoticestream in RSS 1.0	2011-04-07 15:28:25 -04:00
Evan Prodromou	328373e29c	use inboxnoticestream in API	2011-04-07 15:28:09 -04:00
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	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
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	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	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
Siebrand Mazeland	84a2fb44b9	Add/update translator documentation.	2011-04-04 00:12:52 +02:00
Siebrand Mazeland	9a6ee5e859	Update translator documentation.	2011-04-03 23:47:46 +02:00
Siebrand Mazeland	436a02959c	Tabs to spaces.	2011-04-03 22:44:41 +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
Siebrand Mazeland	f64c312942	Update translator documentation.	2011-03-31 22:48:03 +02:00
Siebrand Mazeland	4292fa1fc4	Tweak page titles. Thanks @evan for thinking with me.	2011-03-31 22:43:57 +02:00
Evan Prodromou	f70bcbdb6b	save private stream values	2011-03-30 16:23:13 -04: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
Brion Vibber	20ca5027cc	Consolidate common code in micro-apps custom notice type display actions. ... The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.	2011-03-29 16:58:15 -07: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
Evan Prodromou	9f1603462d	Merge branch 'limitdist2' into 1.0.x	2011-03-29 17:32:17 -04:00
Siebrand Mazeland	ede8fabb55	Fix incorrect translator documentation. Spotted by AVRS.	2011-03-29 23:14:40 +02: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
Siebrand Mazeland	a8af04feea	Update translator documentation. ... Superfluous whitespace removed. L10n consistency updates.	2011-03-29 21:30:36 +02:00
Siebrand Mazeland	f2d7c33ad3	Update translator documentation. ... Remove superfluous whitespace. Various L10n/i18n updates.	2011-03-29 21:30:35 +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	7b8fc701e0	don't show notices to out-of-scope viewers	2011-03-28 22:21:41 -04:00
Evan Prodromou	e862dcdb8a	Merge branch '1.0.x' into limitdist2	2011-03-28 21:56:34 -04:00
Brion Vibber	e5b5c256a3	Working subscription approval!	2011-03-28 17:08:04 -07:00
Brion Vibber	df5def8ce4	Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.	2011-03-28 15:13:59 -07:00
Brion Vibber	11b40ddb1b	work in progress...	2011-03-28 13:59:48 -07:00
Evan Prodromou	798b03fb5f	set default address for showstream	2011-03-28 16:24:28 -04:00
Evan Prodromou	a7380d5933	set default address for showgroup	2011-03-28 16:24:17 -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
Siebrand Mazeland	52d29a17a0	Fix incorrect translator documentation. Spotted by AVRS.	2011-03-28 01:43:01 +02:00
Evan Prodromou	889b35be9c	Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x	2011-03-27 11:26: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
Siebrand Mazeland	1adaa6a2ab	Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way.	2011-03-27 13:05:24 +02:00
Siebrand Mazeland	074be0d51e	i18n fixes. ... Translator documentation updates.	2011-03-25 17:12:53 +01:00
Siebrand Mazeland	e0cccfc40d	Translator documentation updated. ... i18n/L10n updates. Superfluous whitespace removed. Add FIXME for missing class documentation.	2011-03-24 12:09:50 +01:00
Siebrand Mazeland	78edb4bf56	Update translator documentation. ... Remove superfluous whitespace. L10n/I18n updates. FIXMEs added for missing documentation or headers.	2011-03-24 11:48:53 +01:00
Siebrand Mazeland	3be26565fb	Update translator documentation. ... i18n/L10n updates. Superfluous whitespace removed. Add FIXME in files with missing documentation.	2011-03-24 11:48:51 +01:00
Brion Vibber	265f9af6f7	Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...	2011-03-23 15:21:12 -07:00
Evan Prodromou	83fb5e6023	Mass replacement of #-comments with //-comments ... like leprous boils in our code. So, I've replaced all of them with // comments instead. It's a massive, meaningless, and potentially buggy change -- great one for the middle of a release cycle, eh?	2011-03-22 11:54:23 -04:00
Shashi Gowda	13e9e41d2f	Blend in with some new code. New menus, etc.	2011-03-22 08:30:16 +05:30
Shashi Gowda	bf121a695a	Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase ... Conflicts: classes/Profile.php	2011-03-22 07:59:06 +05:30
Shashi Gowda	31c1177970	Merge branch '1.0.x' into people_tags_rebase ... Conflicts: EVENTS.txt actions/peopletag.php actions/tagother.php classes/Notice.php js/util.js js/util.min.js lib/accountprofileblock.php lib/action.php lib/activityobject.php lib/command.php lib/personalgroupnav.php plugins/OStatus/OStatusPlugin.php	2011-03-22 07:56:25 +05:30
Brion Vibber	942887ca8c	Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.	2011-03-21 17:17:18 -07:00
Brion Vibber	6bdb1053ad	Pending members queue list -- doesn't yet allow approval.	2011-03-21 16:40:10 -07:00
Brion Vibber	471a480587	Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.	2011-03-21 16:26:41 -07:00
Brion Vibber	541dfa04fe	Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.	2011-03-21 14:35:29 -07:00
Brion Vibber	0bec9cfdbc	Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation. ... UI for setting the join policy is in, but not yet used.	2011-03-21 13:51:13 -07:00
Siebrand Mazeland	84e5ca6158	Translator documentation added/updated. ... Superfluous whitespace removed. L10n update.	2011-03-18 20:37:04 +01:00
Siebrand Mazeland	902990bb72	Add myself to contributors array.	2011-03-18 20:15:57 +01:00
Siebrand Mazeland	7ef8bd9275	i18n updates. ... Translator documentation added. Superfluous whitespace removed.	2011-03-18 20:12:59 +01:00
Siebrand Mazeland	8a2002afe7	Translator documentation added/updates. ... L10n/i18n updates. Superfluous whitespace removed.	2011-03-18 17:04:38 +01:00
Siebrand Mazeland	b7178d2197	Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x	2011-03-18 16:09:27 +01:00
Siebrand Mazeland	0de0ae2f48	Update/add translator documentation. ... L10n/i18n updates. Superfluous whitespace removed.	2011-03-18 13:48:47 +01:00
Siebrand Mazeland	6f9c277494	* Add FIXME: $profile appears to be undefined. ... * Update translator documentation.	2011-03-18 13:10:55 +01:00
Brion Vibber	4afa3caae3	ajax load for additional inline replies; /replies variant of conversationview	2011-03-17 16:27:42 -07:00
Evan Prodromou	7cf12f093e	Merge branch '1.0.x' into testing ... Conflicts: lib/common.php	2011-03-17 09:20:32 -04:00
Siebrand Mazeland	b74a7d7a75	Change email to SMS. Spotted by Nikerabbit.	2011-03-17 13:59:22 +01:00
Siebrand Mazeland	9785140da5	Update translator documentation. ... L10n/i18n updates. Superfluous whitespace removed.	2011-03-17 11:46:49 +01:00
Brion Vibber	0bf40bd748	Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view. ... Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.	2011-03-16 14:54:14 -07:00
Brion Vibber	5ec018ca19	Fix tag nesting bug on group page	2011-03-16 10:58:18 -07:00
Evan Prodromou	9b4533058c	no profileblock on login actions	2011-03-16 10:05:07 -04:00
Evan Prodromou	bbba1f6e16	Show group actions in profile block	2011-03-16 09:57:10 -04:00
Evan Prodromou	2d4554ea03	Remove UserProfile class	2011-03-16 09:57:10 -04:00
Evan Prodromou	561458650f	profile group uses account profile block	2011-03-16 09:57:09 -04:00
Brion Vibber	08b430a247	Event hook for notice search pages	2011-03-15 15:33:37 -07:00
Brion Vibber	e985a41a7e	Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input. ... If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through. Also switched from deprecated static DOMDocument::loadXML() to non-static call.	2011-03-15 10:11:13 -07:00
Brion Vibber	9e9cbdf505	Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input. ... If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through. Also switched from deprecated static DOMDocument::loadXML() to non-static call.	2011-03-15 10:09:20 -07:00
Brion Vibber	34e7d8ddf2	For good measure; trip short error mode in earlier on ajax shownotice	2011-03-14 13:44:39 -07:00
Brion Vibber	c7e7cc79da	'ajax' param on shownotice action so we can pull items in full html version for realtime	2011-03-14 13:05:30 -07:00
Siebrand Mazeland	eaef01233a	Fix incorrect parameter documentation. Spotted by Nikerabbit.	2011-03-14 18:01:22 +01:00
Siebrand Mazeland	e2defc1f7c	* update/add translator documentation. ... * remove superfluous whitespace. * minor updates to L10n/i18n.	2011-03-11 17:07:27 +01:00
Zach Copley	a984aae564	Show a reasonable error message when an image is bad, instead of ... letting the exception continue bubbling up.	2011-03-10 15:18:14 -08:00
Zach Copley	b7548fb9e2	Show a reasonable error message when an image is bad, instead of ... letting the exception continue bubbling up.	2011-03-10 18:14:22 +00:00
Brion Vibber	4d5f8e7876	Ticket #3076: fix regression in password recovery when email address given that doesn't match ... Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)	2011-03-09 15:48:46 -08:00
Brion Vibber	e74590d414	Ticket #3076: fix regression in password recovery when email address given that doesn't match ... Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)	2011-03-09 15:46:24 -08:00
Evan Prodromou	a4b3edaf40	Login actions don't show the notice form	2011-03-09 10:11:59 -05:00
Brion Vibber	5b0ca315b4	'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D	2011-03-08 10:58:14 -08:00
Evan Prodromou	55b4303ea4	Merge branch '3cl' into 1.0.x	2011-03-07 14:30:30 -05:00
Shashi Gowda	382e4d2cdb	people tag actions	2011-03-07 00:43:31 +05:30
Shashi Gowda	371e923c37	Twitter lists compatible people tags api	2011-03-07 00:36:06 +05:30
Siebrand Mazeland	e9933871e5	* fix i18n and L10n issues. ... * update translator documentation. * remove superfluous whitespace.	2011-03-05 17:03:12 +01:00
Siebrand Mazeland	a127ba78a8	* translator documentation updated. ... * superfluous whitespace removed. * small refactoring in noticeform.php to allow proper translator hints.	2011-03-05 00:24:19 +01:00
Siebrand Mazeland	b37e12ed34	* translator documntation updated ... * superfluous whitespace remove * minor L10n and i18n updates	2011-03-05 00:13:04 +01:00
Brion Vibber	9689bda21c	Loading the original form instead of faking up our own. Sorta works but not pretty :D	2011-03-04 14:11:11 -08:00
Siebrand Mazeland	d55a831d97	Update translator documentation.	2011-03-03 01:42:54 +01:00
Siebrand Mazeland	399c83db87	Fix typo in documentation. Spotted by Nikerabbit.	2011-03-02 23:06:45 +01:00
Brion Vibber	8cacecb6dc	Use threaded replies in group inbox view	2011-03-01 16:29:11 -08:00
Zach Copley	5bf0c9f610	Fix mising require_once (now required here because of rearranging)	2011-03-01 15:31:06 -08:00
Zach Copley	243b396660	Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x	2011-03-01 15:26:02 -08:00
Zach Copley	2fb8148788	Fix missing variable initialization	2011-03-01 15:25:06 -08:00
Brion Vibber	a7005f3975	Alternate Inbox streaming function optimized for threaded paging (for /all stream, while things using the existing API inbox methods won't be affected)	2011-03-01 15:16:39 -08:00
Evan Prodromou	64a1c9e376	object menu for user profile	2011-03-01 16:23:19 -05:00
Evan Prodromou	a1a0382d26	object menu on showgroup	2011-03-01 16:22:19 -05:00
Evan Prodromou	374253f0f7	defaultlocalnav for favorites	2011-03-01 16:21:22 -05:00
Evan Prodromou	55fa14baec	object menu in inviteaction	2011-03-01 16:20:14 -05:00
Evan Prodromou	6ee77f1302	defaultlocalnav in groups	2011-03-01 16:18:33 -05:00
Evan Prodromou	f29274cd0d	show defaultlocalnav in groupmembers	2011-03-01 16:17:42 -05:00
Evan Prodromou	0c877860b5	show defaultlocalnav in grouplogo	2011-03-01 16:17:01 -05:00
Evan Prodromou	4903c92dce	show defaultlocalnav in groupdesignsettings	2011-03-01 16:15:03 -05:00
Evan Prodromou	0850c66a21	default local nav in featured user list	2011-03-01 16:11:59 -05:00
Evan Prodromou	3c683ad7b5	default local nav in popular notices	2011-03-01 16:11:19 -05:00
Evan Prodromou	4561caec10	show default local nav in group edit	2011-03-01 16:10:40 -05:00
Evan Prodromou	737eb371f8	show full local nav in public tag cloud	2011-03-01 16:09:35 -05:00
Evan Prodromou	85320a7561	show object nav for blocked users in a group	2011-03-01 16:08:49 -05:00
Evan Prodromou	efdc85224a	user groups show subgroupnav in object menu area	2011-03-01 16:07:27 -05:00
Evan Prodromou	3377bc2ccf	RepliesAction uses default local nav	2011-03-01 16:06:29 -05:00
Evan Prodromou	64ab7b7d07	use default local nav for public action	2011-03-01 16:00:07 -05:00
Evan Prodromou	8c03e8b0b3	use default local nav for allaction	2011-03-01 15:59:01 -05:00
Brion Vibber	b351fad43a	Merge branch '1.0.x' into inline-comments	2011-02-28 16:48:05 -08:00
Zach Copley	e109b2592f	Merge branch '0.9.x' into 1.0.x	2011-02-28 16:41:24 -08:00
Brion Vibber	59a0b2a82d	Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments ... Conflicts: js/util.min.js	2011-02-28 16:18:38 -08:00
Zach Copley	f3ffc8bc46	Missed a couple of conflicts	2011-02-28 15:51:46 -08:00
Zach Copley	b7d0746694	Merge branch '0.9.x' into 1.0.x ... Conflicts: actions/confirmaddress.php actions/emailsettings.php actions/hostmeta.php actions/imsettings.php actions/login.php actions/profilesettings.php actions/showgroup.php actions/smssettings.php actions/urlsettings.php actions/userauthorization.php actions/userdesignsettings.php classes/Memcached_DataObject.php index.php lib/accountsettingsaction.php lib/action.php lib/common.php lib/connectsettingsaction.php lib/designsettings.php lib/personalgroupnav.php lib/profileaction.php lib/userprofile.php plugins/ClientSideShorten/ClientSideShortenPlugin.php plugins/Facebook/FBConnectSettings.php plugins/Facebook/FacebookPlugin.php plugins/NewMenu/NewMenuPlugin.php plugins/NewMenu/newmenu.css	2011-02-28 15:39:43 -08:00
Brion Vibber	d806907b81	Initial test threaded convo view inline on public, all timelines	2011-02-28 11:53:48 -08:00
macno	dc41e3dc2d	API group actions join/leave now handle same events of web UI action	2011-02-28 11:56:02 +01:00
macno	c246c17d3e	If there's a DB error, script returns after catching the exception	2011-02-28 11:53:11 +01:00
Brion Vibber	880b1b666e	Merge branch 'master' into 0.9.x	2011-02-25 12:24:18 -08:00
Brion Vibber	55b1f3d84c	Scalability work on user backup stream generation. ... UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits. This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory. Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion. Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior. There should be a better way to do this, swapping out the stringer output for raw output more consitently.	2011-02-25 12:15:38 -08:00
Brion Vibber	59a413cf5e	Merge branch 'master' into 0.9.x	2011-02-25 10:16:00 -08:00
Brion Vibber	f3c822cc15	Ticket #3011: Add attachments/uploads and attachments/file_quota to api/statusnet/config.(xml|json) ... file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled. This can be used by client apps to determine maximum size for an attachment.	2011-02-21 15:52:12 -08:00
Brion Vibber	8e7c279c9e	Fix issue #3035: search highlighting broke URLs in some imported messages (Twitter) ... Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values. This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex. I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.	2011-02-21 14:14:32 -08:00
Zach Copley	68017392ff	Make other timeline API endpoints output Activity Streams JSON	2011-02-18 15:43:40 -08:00
Zach Copley	e98e443605	Merge branch '0.9.x' into json-activities ... * 0.9.x: * update translator documentation. * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class. * update translator documentation. * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms Localisation updates from http://translatewiki.net. Double quotes to single quotes. * improve L10n consistency for English. For example proper punctuation for all button and label titles. * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace. add path separators for Plugin::path() argument to send email summary to all users on all sites fix indentation in siteemailsummaryhandler fix indentation in sendemailsummary.php fix indentation in Email_summary_status.php fix indentation in EmailSummaryPlugin.php fix indentation in usermailsummaryhandler.php	2011-02-17 19:11:29 -08:00
Siebrand Mazeland	6a1b0e2375	* update translator documentation. ... * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.	2011-02-17 21:10:48 +01:00
Siebrand Mazeland	65045a26f3	* update translator documentation. ... * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms	2011-02-17 20:58:22 +01:00
Siebrand Mazeland	db4213a9e0	Double quotes to single quotes.	2011-02-17 09:58:07 +01:00
Zach Copley	e4d5c47ebf	Add image to JSON ActivityObject and title + links to the JSON document	2011-02-16 16:21:46 -08:00
Siebrand Mazeland	a159352b65	* improve L10n consistency for English. For example proper punctuation for all button and label titles. ... * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace.	2011-02-17 00:40:47 +01:00
Zach Copley	a1b436a8c6	First cut at some JSON Activity Streams output	2011-02-15 20:25:39 -08:00
Evan Prodromou	2b869fa23f	Merge remote branch 'origin/master'	2011-02-14 12:41:52 -05:00
Evan Prodromou	40533ee851	backup action is read-only	2011-02-14 12:41:20 -05:00
Brion Vibber	30eddaf168	Update translator comment for the url shortener "free service" marker: free as in open	2011-02-11 14:11:37 -08:00
Evan Prodromou	e903ff0525	Make ShowmessageAction not be a subclass of MailboxAction ... The ShowmessageAction was using the MailboxAction to do its display of a single direct message. Since we redid the nickname management, this was breaking (MailboxAction requires a nickname argument, ShowmessageAction does not, and nickname validation that used to quietly fail now throws an exception). I've moved the message list processing to its own widget class, so the need to subclass MailboxAction has disappeared. I've rewritten this action to use the MessageListItem widget, and it works fine now.	2011-02-08 11:33:36 -05:00
Evan Prodromou	f500d4ea5b	Create and use MessageList widget ... Our mailbox actions (inbox and outbox) were doing their own display of messages. This was causing issues with especially showmessage, which since the more rigourous nickname checks were added, no longer works as a mailbox subclass. I've taken the time to rip out the message listing code from MailboxAction and moved it to a MessageList widget. The different mailboxes now have their own subclasses that show the correct profile in the list.	2011-02-08 11:11:21 -05:00
Evan Prodromou	b41816fdc1	add hooks for Group profile information	2011-02-07 14:04:58 -05:00
Evan Prodromou	8b20399932	Add a hook for group action list	2011-02-07 10:23:56 -05:00
Evan Prodromou	2cdba23df4	hook for new group through a form, same as editing	2011-02-03 16:19:41 -05:00
Evan Prodromou	99db745f9d	Merge branch 'testing' into privategroup ... Conflicts: lib/groupeditform.php	2011-02-03 12:56:55 -05:00
Brion Vibber	b46ce3b67d	Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switch to single-quote to fix.	2011-01-31 14:00:22 -08:00
Brion Vibber	9573f725c1	Merge branch '0.9.x' into testing	2011-01-31 11:08:15 -08:00
Siebrand Mazeland	f41dcb644c	Update translator documentation, remove FIXME and add comment.	2011-01-31 18:43:39 +01:00
Siebrand Mazeland	13991f7eb9	* add/update translator documentation. ... * remove superfluous whitespace. * update punctuation on form validation messages. * L10n tweaks. * add fixme for missing class documentation.	2011-01-31 18:16:55 +01:00
Siebrand Mazeland	dd5721848f	* tag i18n issue. ... * add translator documentation. * remove superfluous whitespace.	2011-01-31 17:12:39 +01:00
Siebrand Mazeland	8f776ec12d	* update/add translator documentation. ... * fix L10n issues. * update comments and tag missing documentation on some classes. * remove superfluous whitespace *	2011-01-31 16:39:54 +01:00
Siebrand Mazeland	691f374a52	* Add/update translator documentation. ... * Update punctuation in form validation message for consistency. * Remove superfluous whitespace.	2011-01-30 19:01:55 +01:00
Siebrand Mazeland	7db24c32d6	* fix some i18n and L10n issues ... * update/add translator documentation * remove superfluous whitespace	2011-01-29 00:33:13 +01:00
Evan Prodromou	5fee38b025	events for modifying group edit form	2011-01-26 18:21:43 -07:00
Brion Vibber	54e98ffe22	Fix ticket #3013: MAX_FILE_SIZE hidden fields were incorrectly placed ... In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.	2011-01-26 15:49:57 -08:00
Brion Vibber	621a7cb36d	Merge branch '0.9.x' into testing	2011-01-25 12:57:49 -08:00
Brion Vibber	0a3c05feb0	Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures.	2011-01-24 12:41:30 -08:00
Brion Vibber	820dd293c9	Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases ... Part of the reported issue was previuosly fixed by dc497ed0 (smaller size images being blanked). This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively) Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file. Copying instead of using move_uploaded_file() is fine here since: a) the files are cleaned up on script completion anyway (vs moving to remove it) b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing) ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.) Recommended for future: * additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes) * consolidate type checks and file naming into Avatar class	2011-01-24 12:22:47 -08:00
Evan Prodromou	570c7b63a2	Add internal URL shortener	2011-01-23 16:49:12 -05:00
Evan Prodromou	592e2be5e1	Make new menu the default menu ... There's a new menu layout in this version of the software. It was implemented as a plugin in 0.9.x to avoid clashes with existing themes, but we're going to break that compatibility in this version, so we're just going for it. This change involved moving all the changes in NewMenuPlugin into the default code that was calling it. In addition, since accountsettingsaction and connectsettingsaction differed only by menu, I removed them, changed all references to them to the settingsmenu, and moved the combined nav to its own class. Let's put that episode behind us. The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions was removed.	2011-01-23 12:35:35 -05:00
Siebrand Mazeland	6c0e43be9e	L10n consistency updates in wording and punctuation. ... Translator documentation added/updated. Superfluous whitespace removed.	2011-01-21 22:45:37 +01:00
Siebrand Mazeland	08cb576b52	Add translator documentation ... Fix L10n issues Remove superfluous whitespace	2011-01-21 16:35:00 +01:00
Siebrand Mazeland	bcd34a7f3c	Add correct punctuation for client exceptions.	2011-01-21 10:55:10 +01:00
Siebrand Mazeland	ee5479b902	Add correct punctuation for client exception.	2011-01-21 10:55:08 +01:00
Siebrand Mazeland	31895ba33a	Add correct punctuation for client exception.	2011-01-21 10:55:07 +01:00
Brion Vibber	6fa0bea76d	Merge branch '0.9.x' into testing	2011-01-20 15:12:57 -08:00
Siebrand Mazeland	91ee2ea3b1	Translator comments added ... L10n updates Remove superfluous whitespace Number parameters in message when two or more are used ClientException and ServerException should end with a period	2011-01-20 20:00:45 +01:00
Siebrand Mazeland	6658bd1893	Update translator documentation ... Remove unneeded i18n for debug message Remove superfluous whitespace	2011-01-20 18:45:13 +01:00
Siebrand Mazeland	26652d9be6	Update translator documentation ... Update L10n Remove superfluous whitespace	2011-01-20 18:40:20 +01:00
Zach Copley	882b6862a3	OAuth: Fix rare problem in which request tokens were sometimes being ... returned as access tokens.	2011-01-19 23:00:24 -08:00
Zach Copley	28f10ac528	Fix syntax error in error msg	2011-01-19 23:00:10 -08:00
Zach Copley	1543af748c	Merge branch 'testing' of gitorious.org:statusnet/mainline into testing ... * 'testing' of gitorious.org:statusnet/mainline: (63 commits) Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php fix wrong datatypes (saving string instead of array) in AtomPub notice processing Account moving is a background activity return a 409 Conflict when subscription already exists OStatusPlugin does discovery in Profile::fromURI() considerably more logging and error checking in AccountMover add a log method to AccountMover normalize accounts and check for return in HTTP for moving move account-moving classes to their own libraries execution protection on discovery.php PHPCS discovery.php Move discovery library from OStatus plugin to core Revert "Revert "0.9.7alpha1"" first example of moving a user Parse properties of links in XRD files Add the Atom username to the XRD output preserve activities in object let callers pass in an XMLOutputter to output to execution protection on discovery.php PHPCS linkheader.php ...	2011-01-19 22:58:07 -08:00
Zach Copley	e475bdfe77	OAuth: Fix rare problem in which request tokens were sometimes being ... returned as access tokens.	2011-01-19 22:55:00 -08:00
Zach Copley	a79427d86f	Fix syntax error in error msg	2011-01-19 16:13:42 -08:00
Brion Vibber	4026e208c2	Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php ... As with deleteuser.php, can pass -y to bypass the prompt if you're sure.	2011-01-19 15:13:46 -08:00
Brion Vibber	64844473f8	fix wrong datatypes (saving string instead of array) in AtomPub notice processing	2011-01-19 14:26:31 -08:00
Brion Vibber	963e7576f2	Merge branch 'testing' into moveaccount	2011-01-19 10:41:14 -08:00
Evan Prodromou	aa4a8e5051	wrap account actions in a section	2011-01-17 18:04:10 -05:00
Evan Prodromou	2a59453d4c	Merge branch 'testing' into moveaccount	2011-01-17 17:34:03 -05:00
Evan Prodromou	6d429ce357	return a 409 Conflict when subscription already exists	2011-01-17 15:57:04 -05:00
Siebrand Mazeland	573925c52a	* number parameters in messages ... * add translator documentation * remove superfluous whitespace * small L10n update	2011-01-15 00:24:06 +01:00
Evan Prodromou	5c25364141	remove extraneous <dl> and <dt> tags	2011-01-14 15:36:06 -05:00
Siebrand Mazeland	7903a2504f	* remove i18n for debug message. ... * add i18n for some server exceptions. * add translator documentation. * L10n updates. * remove superfluous whitespace.	2011-01-14 21:25:46 +01:00
Siebrand Mazeland	6e1dfab1b9	* change i18n for confirmation string to make a bit more certain that the confirmation string is consistent in all messages where it is used. ... * add translator documentation. * remove superfluous whitespace.	2011-01-14 20:48:17 +01:00
Brion Vibber	74a1c9def0	Fix error handling for missing group in apigroupmembership -- was trying to call methods on the variable before we checked it, which triggers PHP fatal error	2011-01-07 16:25:58 -08:00
Brion Vibber	5616bfb5ff	Fix warning in subscribers/subscriptions list pages where we attempted to call free() an ArrayWrapper after it was used up, thus trying to forward the call to a nonexistent object. ... Removed the free calls (unneeded since destructors now work), and added an error check w/ logging & an exception for future attempts to forward calls to nonexistent object.	2011-01-07 15:29:30 -08:00
Brion Vibber	edf8101b29	allow group join/leave commands in api posting, at least for the moment (no other way to do remote subscribe without a preexisting local id number via api)	2011-01-06 13:46:39 -08:00
Brion Vibber	281076d5f6	Fix for PHP notice spew in group creation via API: set default 'mainpage' in User_group::register() rather than forcing all callers to do it manually.	2011-01-06 13:22:44 -08:00
Evan Prodromou	32eb4c5e2d	Merge remote branch 'gitorious/0.9.x' into 1.0.x ... Conflicts: lib/common.php	2010-12-30 15:52:08 -08:00
Evan Prodromou	d3b10959f4	Merge branch '0.9.x' into noactor	2010-12-29 15:29:29 -08:00
Evan Prodromou	26afe79ed9	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x	2010-12-29 14:53:38 -08:00
Evan Prodromou	48edbb3023	add hooks for the account-management tools	2010-12-29 14:02:04 -08:00
Brion Vibber	e211e6228d	Merge branch '0.9.x' into 1.0.x	2010-12-28 11:38:34 -08:00
Brion Vibber	90c7ff1983	Merge branch 'master' into 0.9.x	2010-12-28 11:37:38 -08:00
Brion Vibber	d3d9797496	Prevent group creation by silenced users. ... * adds Right::CREATEGROUP * logic in Profile::hasRight() checks for silencing * NewgroupAction checks for the permission before letting you see or process the form in the UI * User_group::register() logic does a low-level check on the specified initial group admin, and rejects creation if that user doesn't have the right; guaranteeing that API methods etc will also have this restriction applied sensibly.	2010-12-28 11:34:02 -08:00
Evan Prodromou	0bcc3ee005	include saved notice in atompub events	2010-12-27 22:11:30 -08:00
Evan Prodromou	a85bbd9088	Add a user parameter to atom pub api events	2010-12-27 20:49:08 -08:00
Evan Prodromou	ab92496ddc	Stop using <activity:subject> for atom feeds	2010-12-27 10:03:34 -08:00
Brion Vibber	26baad63f2	Merge branch '0.9.x' into 1.0.x	2010-12-22 15:25:38 -08:00
Brion Vibber	d5c2b0d216	When queueing is off, restore runs immediately. Indicate that we've already finished processing on the success page in this case; otherwise continue to show the 'will take a few minutes' message.	2010-12-22 14:55:13 -08:00
Brion Vibber	055630516c	Merge branch 'righttoleave' into 0.9.x	2010-12-22 11:28:34 -08:00
Evan Prodromou	9a6ceb3303	Merge branch 'righttoleave' into 0.9.x	2010-12-22 11:22:51 -08:00
Brion Vibber	754bc1b616	Error handling cleanup on backup/restore: ... * avoid PHP notice from using wrong variable * show a visible error instead of blank screen if no file submitted with restore form * avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically * suppress PHP warning from XML parse errors	2010-12-22 11:13:57 -08:00
Brion Vibber	5abd2b7d0c	fix notice error	2010-12-22 11:06:45 -08:00
Brion Vibber	d8a3a88ec8	Merge branch '0.9.x' into 1.0.x ... Conflicts: classes/Memcached_DataObject.php	2010-12-17 17:13:21 -08:00
Brion Vibber	fb8312ebf4	Ticket #2959: implement api/users/profile_image endpoint in Twitter-compat API	2010-12-17 17:10:52 -08:00
Brion Vibber	c0669969f2	fix typo in showstream	2010-12-17 16:21:33 -08:00
Evan Prodromou	573bbeced1	action to restore a user's backup from the Web interface	2010-12-17 18:56:48 -05:00
Evan Prodromou	fd22f684bf	syntax error in deleteaccount	2010-12-15 17:39:58 -05:00
Evan Prodromou	e16cb8c03a	Merge branch '0.9.x' into righttoleave	2010-12-15 16:48:28 -05:00
Brion Vibber	bf20258f4b	Merge branch '0.9.x' into 1.0.x	2010-12-15 11:59:31 -08:00
Brion Vibber	6c67114198	Mark OembedAction, XrdAction, and (plugin) AutocompleteAction as read-only. Tweaked ApiStatusesShow and ApiTimelineUser to still claim read-only when hit with a HEAD request (usually link checkers or a precursor to a GET, and should be semantically equivalent to a GET without actually transferring data)	2010-12-14 16:14:15 -08:00
Brion Vibber	82a9560a2d	AtomPub fix: correct the response URL given from posting a new message (wrong parameter meant we got the main page instead of the message's URL)	2010-12-14 13:19:22 -08:00
Brion Vibber	54a0e801f3	AtomPub fixes: return '201 Created' on POST of new message; better error checking on Atom input	2010-12-14 13:12:24 -08:00
Evan Prodromou	d840578aa0	An action to delete your own account ... The new DeleteaccountAction lets a user delete their own account (subject to global rights set by the admin). It presents a form to delete the account, with an "I am sure." text entry box. It then schedules the account for deletion and logs the user out.	2010-12-14 12:38:43 -05:00
Evan Prodromou	6a7bf9dbf9	don't show the backup link if the user can't backup	2010-12-13 16:49:01 -05:00
Evan Prodromou	5089d3065c	add an action to backup the current account in ActivityStreams format	2010-12-13 16:32:39 -05:00
Evan Prodromou	027c73a4a1	Merge branch 'activityatompub' into 0.9.x	2010-12-13 14:35:42 -05:00
Evan Prodromou	1033e1e519	add the other three feeds to AtomPub service document	2010-12-13 14:35:29 -05:00
Evan Prodromou	c6d6f25b52	Atom pub feed for group memberships ... Feed for group memberships, in activity streams format. Shows a feed; has proper pagination; accepts activitystreams "join" activities to start a new membership.	2010-12-13 13:56:54 -05:00
Evan Prodromou	156bd011af	fix navigation links for favorite feed	2010-12-13 13:08:38 -05:00
Evan Prodromou	c5fee7573e	fix navigation links for subscriptions feed	2010-12-13 13:07:25 -05:00
Evan Prodromou	1a58fdd695	add atompub show membership action	2010-12-13 12:40:22 -05:00
Zach Copley	bb55784e90	Move getConnectedApps() from Profile to User, where it belongs	2010-12-12 17:37:42 -08:00
Evan Prodromou	30f0defcf1	atompub favorite feed	2010-12-12 13:16:34 -05:00
Evan Prodromou	1817aedb5c	fix subtitle in subscriptions feed	2010-12-12 12:13:54 -05:00
Evan Prodromou	d9a614c57e	use new Subscription stream methods for AtomPub	2010-12-11 11:24:07 -05:00
Evan Prodromou	37c447be46	Show a single favorite for AtomPub	2010-12-10 18:50:50 -05:00
Evan Prodromou	5d56dba904	add a new subscription using POST to APP	2010-12-09 16:25:47 -05:00
Evan Prodromou	c619a257fe	Add subscription feed for AtomPub	2010-12-09 16:05:07 -05:00
Evan Prodromou	34b8eb207d	make HEAD work for AtomPubShowSubscription	2010-12-09 14:25:57 -05:00
Evan Prodromou	11a0bde459	AtomPub for single subscription	2010-12-09 13:11:02 -05:00
Brion Vibber	9df856e667	Merge branch '0.9.x' into merge ... Conflicts: README actions/hostmeta.php classes/File_redirection.php lib/common.php lib/designsettings.php lib/router.php lib/util.php lib/xmppmanager.php plugins/OStatus/OStatusPlugin.php	2010-12-07 10:50:05 -08:00
Brion Vibber	aa96c3c1d9	Fix for tickets #2917, #2262: user URL shortening options not being applied in non-web channels ... common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc. Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that. Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little. Note also ticket #2919: there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.	2010-12-02 13:41:56 -08:00
Siebrand Mazeland	086d6c9f36	* Fix an incorrectly formatted message parameter in line 334. ... * i18n/L10n updates * translator documentation updated	2010-12-02 12:33:03 +01:00
Brion Vibber	5d9d0d7349	Ticket #2912 further cleanup: use JS on emailsettings form to help connect the 'I want to post by email' checkbox with the controls for adding or removing a post-by-email alias. ... Now, when you first come up the checkbox will most likely be off and the button to create an address is grayed out. Checking the box enables use of the 'new' button to generate an email address -- it's left disabled until you check the box, so you can't accidentally trip it. Actually adding the address now enables the post-by-mail option, as well, thus ensuring that it's saved. WARNING: OTHER CHANGES ON THE FORM WILL STILL BE LOST. Removing the address now disables the post-by-mail option, so it's not sitting around confusingly enabled but useless. You can still disable the checkbox manually without removing the address, in case you want to keep it for later. It's also still possible to actually save it in the state where the option is enabled, but there's no configured address, but that shouldn't happen too often. Possibly that should be prevented outright though.	2010-12-01 14:23:56 -08:00
Brion Vibber	36d605a1e9	Ticket #2912 tweaks: clean up wording on the incoming email generator box a bit.	2010-12-01 13:10:54 -08:00
Brion Vibber	3048f9100d	Ticket #2912: move 'I want to post notices by email" checkbox up from the email *output* prefs up into the box for the address to post to, so they're next to each other.	2010-12-01 13:04:18 -08:00
Brion Vibber	dc350b5463	Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.	2010-11-29 14:15:25 -08:00
Evan Prodromou	edf660c6ff	Make userxrd work without OStatus enabled	2010-11-26 22:09:51 -05:00
Evan Prodromou	fcc0825b14	Make userxrd part of the default hostmeta	2010-11-26 21:46:51 -05:00
Evan Prodromou	0a4911552e	Move user xrd action to core and use hooks to extend ... Moved the Webfinger user XRD action from the OStatus plugin to core. Added hooks to add OStatus-specific stuff, but kept general stuff in the core.	2010-11-26 21:38:38 -05:00
Craig Andrews	3f3b38766f	move xrd and hostmeta out of the OStatus plugin and into core ... add event for setting up hostmeta, and use them in the OStatus plugin	2010-11-26 21:12:14 -05:00
Brion Vibber	e0e7cb7c53	Merge branch 'master' into 0.9.x	2010-11-19 14:03:59 -08:00
Brion Vibber	ca55d6c514	Ticket #1987: support since_id on API notice search methods. ... max_id is not yet implemented, as it'll need support added to the search backends. (since_id we get 'for free' by just cropping off the list, it'll do for now)	2010-11-19 14:00:22 -08:00
Brion Vibber	fa6c6077d6	Merge branch 'master' into 0.9.x	2010-11-16 11:17:29 -08:00
Brion Vibber	9b9db3b28a	Prep for ticket #2895: consolidate common code from PopularNoticeList and FavoritedAction for fetching popular notice lists	2010-11-16 11:10:32 -08:00
Brion Vibber	89d5993674	Include width/height of locally-uploaded images in our oembed provider data for attachment pages.	2010-11-15 12:57:15 -08:00
Evan Prodromou	d038d0fa46	AtomPub-related actions are only read-only on GET	2010-11-15 14:14:09 -05:00
Evan Prodromou	8a21b13ee9	Merge remote branch 'gitorious/0.9.x' into 0.9.x	2010-11-15 11:57:31 -05:00
Evan Prodromou	c1cee3b27f	Merge branch 'atompub' into 0.9.x ... Conflicts: actions/apistatusesshow.php actions/apitimelineuser.php	2010-11-15 11:57:19 -05:00
Evan Prodromou	cb371d65c1	add hooks for atom pub posts	2010-11-15 11:54:42 -05:00
Evan Prodromou	01f32e3998	Merge remote branch 'gitorious/1.0.x' into 1.0.x ... Conflicts: actions/urlsettings.php	2010-11-14 06:49:43 -05:00
Brion Vibber	e4913f9722	fix syntax error introduced in i18n tweaks: newgroup action	2010-11-12 13:35:19 -08:00
Brion Vibber	9621904cac	Revert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug ... This reverts commit 3afb031d92.	2010-11-12 13:34:04 -08:00
Brion Vibber	5d12ec0532	Merge branch 'oembed-thumbnails' into 0.9.x	2010-11-12 12:28:44 -08:00
Zach Copley	0ed572ff3f	Fix missing close of comment block	2010-11-11 10:39:05 -08:00
Zach Copley	09aaf21e8d	Fix missing close of comment block	2010-11-11 10:33:26 -08:00
Evan Prodromou	3afb031d92	Missing one close-paren in newgroup.php	2010-11-09 17:08:11 -05:00
Evan Prodromou	a988e2e97b	hook points for the email settings form	2010-11-09 15:00:30 -05:00
Brion Vibber	f25accc43e	split out InlineAttachmentList from AttachmentList	2010-11-09 10:45:19 -08:00
Brion Vibber	6d7f02ff31	Pass file attachment thumbnails along with oEmbed data.	2010-11-08 17:22:01 -08:00
Brion Vibber	551b196a35	doomy doom doom	2010-11-08 15:32:41 -08:00
Evan Prodromou	719b480eaa	use subclassing to change notice list output for single notice	2010-11-08 13:08:59 -05:00
Siebrand Mazeland	f5b037c169	Update translator documentation.	2010-11-07 22:32:52 +01:00
Siebrand Mazeland	66e34a28f7	screen_name -> nick names. Spotted by The Evil IP address.	2010-11-07 22:31:02 +01:00
Brion Vibber	b716d01a41	Merge branch '0.9.x' into 1.0.x	2010-11-03 16:09:49 -07:00
Brion Vibber	51a756c211	Fix ticket #2860: clarify API doc comments for 'source' parameter's interaction with OAuth on api/statuses/update	2010-11-03 14:58:33 -07:00
Brion Vibber	6e03456753	Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.	2010-11-03 13:10:42 -07:00
Brion Vibber	dc4fafbbd1	General cleanup & part of ticket #2864: use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.	2010-11-03 12:59:19 -07:00
Siebrand Mazeland	973a48bded	i18n/L10n fixes and translator documentation addded/updated.	2010-11-02 23:48:36 +01:00
Siebrand Mazeland	a65362f7fa	Add context for different uses of "%1$s (%2$s)"	2010-11-02 23:08:59 +01:00
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	81e0653080	Merge branch 'pretty-title2' into 0.9.x	2010-11-02 14:21:23 -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	bc85f6914b	fix syntax error introduced in i18n tweaks: newgroup action	2010-11-02 14:03:50 -07:00
Brion Vibber	426cda5e1f	Alternate pretty-title tweaks for #2668	2010-11-02 13:42:44 -07:00
Siebrand Mazeland	760a1c27bc	Update translator documentation.	2010-11-01 16:49:36 +01:00
Siebrand Mazeland	6ab34fd8e8	* i18n/L10n updates. ... * translator documentation added. * superfluous whitespace removed.	2010-11-01 16:49:35 +01:00
Siebrand Mazeland	5c6732c4bb	Update translator documentation.	2010-11-01 16:49:35 +01:00
Siebrand Mazeland	1c0e84f066	Add forgotten translator documentation.	2010-10-31 01:26:39 +02:00
Siebrand Mazeland	5406873007	* translator documentation updated. ... * superfluous whitespace removed. * added FIXMEs for missing documentation and un-i18n-able timestamps.	2010-10-31 01:16:59 +02:00
Siebrand Mazeland	08edd1fedf	* i18n/L10n updates. ... * translator documentation added/updated. * superfluous whitespace removed.	2010-10-31 00:58:35 +02:00
Siebrand Mazeland	234b03d945	* translator documentation updates. ... * added FIXMEs in actions/showgroup.php. * superfluous whitespace removed.	2010-10-30 14:36:54 +02:00
Evan Prodromou	c4b8f68a1a	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-29 11:14:02 -04:00
Brion Vibber	b26eccf33c	Merge branch '0.9.x' into 1.0.x	2010-10-28 16:26:34 -07:00
Brion Vibber	8d0c014ced	Merge branch 'master' into 0.9.x	2010-10-28 13:01:10 -07:00
Brion Vibber	9ea7cafd27	Fix for regression: fatal error on group page display when not logged in. ... Bug was introduced with group deletion feature.	2010-10-28 12:19:19 -07:00
Siebrand Mazeland	796d7b4939	Update translator documentation.	2010-10-28 01:42:09 +02:00
Siebrand Mazeland	04ae500749	* i18n/L10n fixes. ... * translator documentation updated. * superfluous whitespace removed.	2010-10-28 01:21:21 +02:00
Siebrand Mazeland	a12474a99d	* i18n/L10n fixes. ... * translator documentation updated. * superfluous whitespace removed.	2010-10-28 01:21:09 +02:00
Zach Copley	b3cd558fe7	Fix OAuth verifier display page title and msgs for i18n	2010-10-26 13:19:23 -07:00
Evan Prodromou	93a8718f97	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-26 09:22:21 -04:00
Zach Copley	1a1ca22aca	Supress header, footer, sidebar on OAuth verifier pin page when in "desktop" mode	2010-10-25 13:30:38 -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
Zach Copley	82c280979d	Add special CSS classes to OAuth authorization and pin pages when ... in desktop mode	2010-10-25 11:25:35 -07:00
Zach Copley	479096c8d7	Less scary OAuth authorization messages when using anonymous consumer	2010-10-25 10:38:40 -07:00
Evan Prodromou	e6ba379c8b	navigation links in user timeline (for AtomPub)	2010-10-25 11:08:10 -04:00
Evan Prodromou	59a7d78acb	Atom Service Document	2010-10-24 23:43:26 -04:00
Evan Prodromou	c0664599aa	allow posting to user timeline using AtomPub	2010-10-24 22:50:13 -04:00
Evan Prodromou	292e789584	delete a notice using AtomPub	2010-10-24 21:24:23 -04:00
Evan Prodromou	43a67b150a	show a single notice in atom entry format	2010-10-24 15:58:53 -04:00
Siebrand Mazeland	0b6cc7c33d	* translator documentation added. ... * superfluous whitespace removed.	2010-10-23 19:20:51 +02:00
Zach Copley	3913b6a5d8	Updated styling for OAuth authorization page's desktop mode. ... TODO: move these styles into the main CSS file.	2010-10-22 11:21:44 -07:00
Evan Prodromou	568cb8a205	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-22 09:24:50 -04:00
Zach Copley	131c339c5a	Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct ... returnto URL	2010-10-22 02:08:38 +00:00
Zach Copley	ac45f661f6	Fix regression (whoops!)	2010-10-21 18:38:54 -07:00
Zach Copley	c5a84ef76f	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x	2010-10-21 18:16:35 -07:00
Zach Copley	0b134d3e69	Re-camelcase ApiOauthAuthorizeAction so it will be accessible when ... a site is in pivate mode	2010-10-21 18:15:11 -07:00
Zach Copley	aa6ec40c51	Fix syntax errors	2010-10-22 00:48:26 +00:00
Zach Copley	ce0d81c190	OAuth - inform consumer when user refused to authorize a request token ... http://status.net/open-source/issues/2848	2010-10-21 17:11:59 -07:00
Zach Copley	94f7bfa50a	Don't show 'anonymous' app in OAuth application list.	2010-10-21 16:42:59 -07:00
Zach Copley	4ab110e071	Fix bad reference.	2010-10-21 14:52:41 -07:00
Zach Copley	a548861dbf	OAuth - proper callback handling and better styling for authorization ... page when in desktop mode	2010-10-21 14:45:42 -07:00
Zach Copley	648f79be10	Change OAuth authorization page's action name to be inline with ... other web page action names so the body id outputs correctly. Fix some other bugs.	2010-10-21 13:00:59 -07:00
Zach Copley	bab012bd67	New "desktop" mode for the OAuth authorization page. If mode=deskstop ... is specified in the request the page is probably meant to be displayed in a small webview of another application, so suppress header, aside and footer.	2010-10-21 12:23:04 -07:00
Siebrand Mazeland	cb74822e7a	i18n/L10n consistency updates.	2010-10-21 13:20:21 +02:00
Siebrand Mazeland	fb12094f61	i18n/L10n updates, translator docs updated, superfluous whitespace removed.	2010-10-21 03:10:46 +02:00
Zach Copley	bfdb8385ec	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: actions/apioauthauthorize.php lib/apioauthstore.php	2010-10-20 17:28:28 -07:00
Craig Andrews	90c87553ee	Redirect to https when making an http request for a sensitive action	2010-10-20 20:26:35 -04:00
Zach Copley	e56385a7bb	Use a new table (oauth_token_association) to associate authorized ... request tokins with OAuth client applications and profiles.	2010-10-20 17:21:04 -07:00
Siebrand Mazeland	1603b7afc9	i18n/L10n updates, translator comments added/fixed, superfluous whitespace removed.	2010-10-21 01:53:42 +02:00
Brion Vibber	c24f4ddfdb	Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.	2010-10-20 16:14:32 -07:00
Brion Vibber	bcc06d05e8	Initial OpenID+OAuth thingy.	2010-10-20 15:59:27 -07:00
Siebrand Mazeland	ac4afb31e8	Consistent punctuation.	2010-10-20 20:29:59 +02:00
Siebrand Mazeland	59d0be4761	* i18n for many missing messages (???) ... * add translator documentation.	2010-10-20 20:28:04 +02:00
Siebrand Mazeland	dc62cf1c0b	* i18n/L10n fixes. ... * translator documentation updated/added. * superfluous whitespace removed.	2010-10-20 19:34:27 +02:00
Zach Copley	2760ef07f5	Stick OAuth developer help info in a section	2010-10-19 21:24:19 -07:00
Zach Copley	5ca29ab0de	Merge branch 'anon-consumer' into 0.9.x	2010-10-19 21:01:53 -07:00
Zach Copley	e8b6d7c946	Add support for an anonymous OAuth consumer. Note: this requires a ... small DB tweak. Oauth_application_user needs to have the primary compound key: (profile_id, application_id, token). http://status.net/open-source/issues/2761 This should also make it possible to have multiple access tokens per application. http://status.net/open-source/issues/2788	2010-10-19 20:54:53 -07:00
Siebrand Mazeland	0157df7396	Add missing "address"	2010-10-20 00:49:12 +02: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	3593f3f132	Merge branch '0.9.x' into 1.0.x	2010-10-19 15:18:07 -07:00
Brion Vibber	d358c88f94	Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x	2010-10-19 15:10:47 -07:00
Brion Vibber	e13eb797c7	Fix PHP notice when submitting 'design' admin panel on a browser that doesn't support file uploads such as Mobile Safari	2010-10-19 15:09:45 -07:00
Zach Copley	d48f4a81d6	Relax restrictions on URL validation for oauth_callback. We need to ... allow custom schemes like mustard:// etc.	2010-10-19 19:29:21 +00:00
Zach Copley	5ac694c74f	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x	2010-10-19 12:08:48 -07:00
Zach Copley	5866493cae	OAuth - better log messages	2010-10-19 12:07:59 -07:00
Brion Vibber	53d45d7ffb	Merge branch '0.9.x'	2010-10-18 15:21:02 -07:00
Siebrand Mazeland	24b94ebb2c	* fix bugs in parameter numbering for two messages ... * add translator documentation	2010-10-18 22:47:50 +02:00
Evan Prodromou	3a36714847	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-18 15:42:21 -04: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
Siebrand Mazeland	505ac6eba0	* add plural support where missing ... * update translator documentation.	2010-10-16 14:38:12 +02:00
Siebrand Mazeland	31415b5853	Update translator documentation.	2010-10-16 14:31:41 +02:00
Brion Vibber	9a35e48ee2	Fix for ticket #2837: white screen when hitting 'make admin' button on group members list. ... RedirectingAction->returnToArgs() has been renamed to returnToPrevious() to avoid confusion with the existing Action->returnToArgs which gives the arguments that would be used to pass to one of those. :) Switching to the correct function call gets it working. Thanks to Siebrand for catching it when I could debug it live!	2010-10-15 15:33:54 -07:00
Evan Prodromou	9abe6fa666	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-15 13:46:44 -04:00
Evan Prodromou	9b9ba29791	add SSL servers and paths to pathadminpanel.php	2010-10-15 13:46:21 -04:00
Craig Andrews	0721d8d3e2	Merge remote branch 'statusnet/0.9.x' into 1.0.x	2010-10-14 15:27:17 -04:00
Evan Prodromou	fc6711327b	let users set their SSL logo through the admin panel	2010-10-14 15:06:11 -04:00
Evan Prodromou	07963a2a10	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-13 15:18:33 -04:00
Craig Andrews	f79dbaf9a7	Add a doc page that links to the StatusNet wiki API page ... Add a redirect action that merely redirects to another action Redirect /api to /doc/api so users don't get the "lame" "No such user" error message	2010-10-12 23:38:16 -04:00
Zach Copley	04f3f57e2e	Merge branch 'oauth-1.0a' into 0.9.x	2010-10-12 17:52:04 -07:00
Brion Vibber	5f81f6119b	Merge branch '0.9.x' into 1.0.x	2010-10-12 16:33:36 -07:00
Zach Copley	d8e06e66e9	Print a proper error message	2010-10-12 16:19:53 -07:00
Brion Vibber	f4f16af8ac	Add a basic group deletion for moderator users.	2010-10-12 15:49:20 -07:00
Zach Copley	a77bc11326	Output a log message when issuing a request token	2010-10-12 12:25:34 -07:00
Evan Prodromou	4580d6065c	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-12 11:16:32 -04:00
Brion Vibber	aa02f6020e	Merge branch '0.9.x' into 1.0.x	2010-10-08 11:47:50 -07:00
Brion Vibber	f62e7c461f	Fix PHP fatal error in DeletenoticeAction: died when we had a valid notice, but weren't logged in due to accessing $this->user before the login check. Moved check up to prepare() from handle() so it's done before usage	2010-10-08 10:33:43 -07:00
Zach Copley	459727bd61	Update ApiOauthAccessTokenAction to OAuth 1.0a	2010-10-07 18:32:27 -07:00
Zach Copley	f8808b0761	Added a comment about an open question: Should we allow pin-based ... workflow for clients registered as web applications?	2010-10-07 14:19:42 -07:00
Zach Copley	b8f2cc4e6f	Make the verifier pin display a little nicer	2010-10-07 13:51:47 -07:00
Zach Copley	69e621a3e8	- Update ApiOauthAuthorizeAction to 1.0a ... - Fix enumerable bugs - New page for displaying 1.0a verifier (still needs work)	2010-10-06 19:20:47 -07:00
Zach Copley	f97b863fd7	Update ApiOauthRequestTokenAction to support OAuth 1.0a	2010-10-06 13:40:03 -07:00
Evan Prodromou	8aa9c271df	Merge remote branch 'gitorious/1.0.x' into 1.0.x	2010-10-05 14:09:17 -04:00
Brion Vibber	5c4723919f	Merge branch '0.9.x' into 1.0.x	2010-10-04 13:06:40 -07:00
Brion Vibber	59119482ca	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x ... Conflicts: actions/hostmeta.php actions/imsettings.php classes/User.php lib/adminpanelaction.php lib/channel.php lib/default.php lib/router.php lib/util.php	2010-10-04 12:54:36 -07:00
Brion Vibber	5c19d33b27	Bugfix in FB-sharing header for empty profile avatar	2010-10-01 14:42:12 -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
Brion Vibber	8b8450f9ad	Add helper metadata on individual notice pages to aid sharing to Facebook (use poster's avatar as image, indicate the text content)	2010-09-30 18:21:38 -07:00
Zach Copley	fd779009b8	Add Start/EndShowNoticeItem event hooks to single notice page	2010-09-29 16:35:12 -07:00
Brion Vibber	a6469aeed8	Fix PHP syntax errors introduced during localization fixups in a few files.	2010-09-25 12:10:36 -07:00
Zach Copley	da04858902	Update OAuth actions in show application page so it will display the right endpoint URLs	2010-09-23 16:16:32 -07:00
Evan Prodromou	0f1fc36a05	Merge branch '0.9.x'	2010-09-23 09:50:46 -04:00
Zach Copley	84331ca7bd	Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the ... login page when a site is in private mode	2010-09-22 23:33:06 +00:00
Zach Copley	77609e0c4a	Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the ... login page when a site is in private mode	2010-09-22 23:30:50 +00:00
Zach Copley	da4463cb76	License admin panel should allow empty or valid URLs for (license ... URL and license image URL) when selecting private or allrightsreserved licenses.	2010-09-21 13:06:23 -07:00
Brion Vibber	42dd460d3b	Merge branch 'master' into 0.9.x	2010-09-21 12:48:16 -07:00
Brion Vibber	d342899677	Fix #2323: typo on oauth connections page	2010-09-20 18:07:19 -07:00
Brion Vibber	85bf20d95a	Fix error when editing OAuth app registration and only changing the icon.	2010-09-20 16:57:07 -07:00
Brion Vibber	a47e664094	Fix for #2419: There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)	2010-09-20 16:43:00 -07:00
Brion Vibber	64cdbe6c55	Ticket #2750: fixes to HTTP caching behavior across login/logout boundaries ... * now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec * now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed) There'll still be some last-modified stamps that aren't including user info properly, probably.	2010-09-20 13:42:58 -07:00
Zach Copley	55ad954b15	Basic license admin panel (maybe we can make it fancier later)	2010-09-17 16:38:12 -07:00
Zach Copley	afc799ddf8	Removed periods from instructions on some admin panels for consistency	2010-09-17 14:32:18 -07:00
Zach Copley	f4a1858b33	Fixed typo, and updated copyright dates while I was there	2010-09-17 14:20:05 -07:00
Brion Vibber	ead2f3375a	Ticket #2701: old color settings now get reset when changing themes, so you don't end up with the previous theme's colors.	2010-09-13 13:37:13 -07:00
Siebrand Mazeland	bb2a4e7aac	Update translator documentation.	2010-09-12 17:43:43 +02:00
Siebrand Mazeland	6b010ac79c	Update/add translator documentation.	2010-09-12 17:27:38 +02:00
Siebrand Mazeland	a9fad9a7ac	Add translator hint.	2010-09-12 17:08:49 +02:00
Evan Prodromou	76788d9790	note what 0 means for shorteners	2010-09-11 16:23:41 -04:00
Evan Prodromou	76c0e3169b	move othersettings to urlsettings	2010-09-11 16:22:03 -04:00
Evan Prodromou	fca7ea664b	move view designs setting to user design tab	2010-09-11 16:16:38 -04:00
Evan Prodromou	4419e43f7f	Merge branch '0.9.x' into 1.0.x ... Conflicts: EVENTS.txt plugins/TwitterBridge/daemons/twitterstatusfetcher.php plugins/TwitterBridge/twitterbasicauthclient.php	2010-09-09 15:01:03 -04:00
Evan Prodromou	255e96d3b5	add a hook for when someone deletes their own notice	2010-09-08 16:37:12 -04:00
Craig Andrews	8d54809c35	move xrd and hostmeta out of the OStatus plugin and into core ... add event for setting up hostmeta, and use them in the OStatus plugin	2010-09-07 13:45:52 -04:00
Craig Andrews	3dd734b2c3	Remove CSRF protection from username/password login and from OpenID login.	2010-09-07 13:45:52 -04:00
Evan Prodromou	a319b40c97	common_cache_key() -> Cache::key()	2010-09-06 10:07:43 -04:00
Evan Prodromou	8f81762d68	common_memcache() => Cache::instance()	2010-09-06 09:56:45 -04:00
Craig Andrews	b05ab5fc85	daemon_screenname -> daemonScreenname	2010-09-03 17:50:28 -04:00
Brion Vibber	0cfaae48a3	Merge branch '0.9.x' into 1.0.x	2010-08-16 16:56:27 -07:00
Evan Prodromou	21bf50bad6	Merge branch 'noticetitle' into 0.9.x	2010-08-14 12:03:25 -07:00
Evan Prodromou	1dadb8efc0	Merge branch '0.9.x' into 1.0.x	2010-08-13 14:51:51 -07:00
Evan Prodromou	7dd46222a8	add StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices	2010-08-13 11:21:07 -07:00
Brion Vibber	d9942a558a	Fix regression in replies made from web (was saving reply_to value in wrong array key)	2010-08-12 15:18:16 -07:00
Brion Vibber	6ee3f35302	work in progress: prettier attachment mode for tinymce?	2010-08-11 15:56:40 -07:00
Brion Vibber	527561cd93	TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text	2010-08-11 14:41:31 -07:00
Brion Vibber	3a85318bd0	First stab redoing argument loading for TinyMCE (to avoid hacking checks for all notice saves everywhere)	2010-08-10 16:55:03 -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
Zach Copley	0faa988e91	Fix for issue ID 2290: make sure errors are returned in the right ... format, and use callback for errors when the request is JSONP	2010-07-29 20:31:22 +00:00
Zach Copley	4e8e77f6b0	Return HTTP 403 instead of 400 when silenced users try to post via API	2010-07-29 18:47:28 +00:00
Eric Helgeson	9b899eea75	Make some messages gender neutral.	2010-07-19 21:09:09 -05:00
Zach Copley	923d9ef71c	- Fix bugs with block and friendship API methods ... - Friendship API methods now use a Profile instead of User for target	2010-06-28 16:54:39 -07:00
Brion Vibber	00e129b013	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-06-26 10:18:03 -04:00
Brion Vibber	696e4ba393	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: plugins/OpenID/openidserver.php (cleaned up mismatched comment)	2010-06-26 10:17:36 -04:00
Brion Vibber	d9e56e15cc	Merge branch 'master' into testing	2010-06-26 10:16:27 -04:00
Zach Copley	9eb5a976b0	Have API methods for search subclass ApiPrivateAuthAction	2010-06-24 18:11:50 -07:00
Brion Vibber	9d890e2be0	Catch a couple of missing XML namespace declarations on API XML output. Missing NS declarations were breaking XML parsing for some clients since beaecb18d5	2010-06-18 09:59:11 -07:00
Zach Copley	d3d499879c	- More useful group info from api/statusnet/group/show ... - Add statusnet:group_info tag to group Atom feeds	2010-06-16 14:29:24 -07:00
Craig Andrews	1a62d1b493	Use presence of IM plugins to decide if "IM" options should be available	2010-06-16 16:00:54 -04:00
Brion Vibber	004200f958	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-06-11 12:09:55 -07:00
Brion Vibber	7f3b3620af	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x	2010-06-11 12:05:53 -07:00
Brion Vibber	47665e845a	Merge branch 'testing' of gitorious.org:statusnet/mainline into testing	2010-06-11 12:04:03 -07:00
Brion Vibber	b1a68e15b7	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x ... Conflicts: lib/default.php lib/util.php plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)	2010-06-10 15:37:06 -07:00
Brion Vibber	352a3edfb3	Ticket #2350: fix for incorrect FOAF sioc:follows entries for users who are followed by, but don't themselves follow the user whose FOAF we're displaying.	2010-06-10 11:42:58 -07:00
Brenda Wallace	5afd07e5e8	added missing author	2010-06-08 16:46:32 +12:00
Brenda Wallace	4617545ece	added missing authors	2010-06-08 16:34:16 +12:00
Brenda Wallace	dc0f7189f2	added missing authors	2010-06-08 16:32:53 +12:00
Brion Vibber	09208f8d65	Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base. ... Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory. Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced. Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default. Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled']. Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over) Can set $config['local']['dir'] etc; not currently exposed in the admin panels. Per-site directories on a separate themes server could be set up such as: $config['local']['dir'] = '/path/to/themes/local/' . $_nickname; $config['local']['server'] = 'themes.example.com'; $config['local']['path'] = '/local/' . $_nickname; $config['local']['ssl'] = 'never';	2010-06-07 18:14:16 -07:00
Brion Vibber	8e33cdd36a	break up the giant form function in design admin panel into individual sections to make it a little more manageable	2010-06-07 18:14:15 -07:00
Brion Vibber	d88b208edc	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: plugins/OpenID/openid.php	2010-06-07 10:19:40 -07:00
Evan Prodromou	135b398d4b	Merge branch 'master' of gitorious.org:statusnet/mainline	2010-06-03 14:50:52 -04:00
Zach Copley	4bbb259baf	- Fix bad argument being passed (error code) when invalid format specified ... - Reformat whitespace	2010-06-03 10:52:16 -07:00
Evan Prodromou	a5de215267	Merge branch 'master' of gitorious.org:statusnet/mainline	2010-06-01 13:51:41 -07:00
Brion Vibber	3ba165cfab	Merge branch 'master' into testing	2010-05-28 16:18:40 -07:00
Zach Copley	cef302cacd	Bugfix: api/statuses/destroy.:format was outputting deleted notice ... twice, causing parsers to fail.	2010-05-28 06:24:10 +00:00
Craig Andrews	6317f7d92b	Assigning my copyrights to the Free Software Foundation	2010-05-27 18:27:33 -04:00
Brion Vibber	696aeea113	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: lib/language.php plugins/OpenID/finishaddopenid.php	2010-05-27 14:57:32 -07:00
Brion Vibber	2f2fa10071	Merge branch 'master' of gitorious.org:statusnet/mainline into testing	2010-05-27 14:54:43 -07:00
Zach Copley	c5b61078e1	Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag)	2010-05-27 13:49:23 -07:00
Evan Prodromou	6d8e01ad13	Merge branch 'master' of gitorious.org:statusnet/mainline	2010-05-21 16:47:57 -04:00
Brion Vibber	6eae5d6a7e	Merge branch 'testing' into 0.9.x	2010-05-21 13:15:08 -07:00
Brion Vibber	87b8a89aa7	Merge branch 'master' of gitorious.org:statusnet/mainline into testing	2010-05-21 13:12:25 -07:00
Brion Vibber	68305d4b68	Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger. ... Fixed typo in RedirectingAction when no return-to data provided in form submission. RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated. More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.	2010-05-20 14:24:44 -07:00
Brion Vibber	c4203be9a4	Merge branch '0.9.x' into 1.0.x	2010-05-19 12:52:23 -07:00
Brion Vibber	7005ef6661	Merge branch 'testing' into 0.9.x ... Conflicts: plugins/OpenID/openidlogin.php	2010-05-19 12:51:25 -07:00
Brion Vibber	a39a934dd4	Merge branch 'master' of gitorious.org:statusnet/mainline into testing	2010-05-19 10:59:14 -07:00
Zach Copley	5ea019c41a	Remove errant double HTML entity encoding in API source attribution	2010-05-18 15:16:23 -07:00
Zach Copley	0dfef88cac	HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them	2010-05-18 15:15:52 -07:00
Zach Copley	c78f67aa73	Refactor and centralize notice source link calculation	2010-05-18 15:15:27 -07:00
Brion Vibber	14a76926a2	Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in. ... The forms would already submit to SSL, but people are happier if they start on a secure page! Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo!	2010-05-18 21:52:17 +00:00
James Walker	6da59fab58	invalid mbox_sha1sum in the case where users don't have an email address ... (reported by pedantic-web.org)	2010-05-18 10:09:16 -04:00
Brion Vibber	91367dbc21	Merge branch '0.9.x' into 1.0.x	2010-05-14 12:15:13 -07:00
Brion Vibber	065ecc5573	Merge branch 'testing' into 0.9.x	2010-05-14 12:14:02 -07:00
Brion Vibber	2e808fdc82	More direct text for registration licensing/tos checkbox for private and all-rights-reserved sites.	2010-05-13 16:47:58 -07:00
Zach Copley	da18701394	Fix for repeats from the API having null source attribution	2010-05-07 17:22:16 -07:00
Zach Copley	fba140f4e0	Fix for repeats from the API having null source attribution	2010-05-08 00:07:42 +00:00
Zach Copley	3c9686e80f	Fix for repeats from the API having null source attribution	2010-05-07 16:32:24 -07:00
Zach Copley	06a63b0404	Finish api/statusnet/groups/update	2010-05-07 10:10:30 -07:00
Zachary Copley	b407665b98	Initial work on API method for updating a group's profile info	2010-05-07 10:10:30 -07:00
Brion Vibber	d9c1ac9053	Merge branch '0.9.x' into 1.0.x	2010-05-06 18:49:01 -07:00
Zach Copley	869bc32d0d	Remove errant double HTML entity encoding in API source attribution	2010-05-06 21:48:12 +00:00
Zach Copley	209fd12cd0	HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them	2010-05-06 21:48:12 +00:00
Zach Copley	22fde00def	Refactor and centralize notice source link calculation	2010-05-06 21:48:11 +00:00
Brion Vibber	173778eab1	Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x ... Conflicts: lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)	2010-05-05 17:11:23 -07:00
Brion Vibber	e05415f621	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: locale/ca/LC_MESSAGES/statusnet.po locale/de/LC_MESSAGES/statusnet.po locale/statusnet.pot	2010-05-05 17:07:50 -07:00
Zach Copley	b50f300566	Implement since_id and max_id param handling for /api/favorites	2010-05-05 14:46:36 -07:00
Brion Vibber	5414396a2e	IM cleanup on 1.0.x branch: ... * Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups	2010-04-30 15:29:05 -07:00
Brion Vibber	cae1329f3b	Merge branch '0.9.x' into 1.0.x ... Conflicts: lib/util.php	2010-04-30 13:16:13 -07:00
Evan Prodromou	3f2c805652	Merge branch 'master' of gitorious.org:statusnet/mainline	2010-04-30 15:00:55 -04:00
Evan Prodromou	5c05cd2b1a	Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x	2010-04-26 02:43:33 -04:00
Evan Prodromou	14adb7cc41	Give users more control over URL shortening ... Users and administrators can set how long an URL can be before it's shortened, and how long a notice can be before all its URLs are shortened. They can also turn off shortening altogether. Squashed commit of the following: commit d136b39011 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:39:00 2010 -0400 use site and user settings to determine when to shorten URLs commit 1e1c851ff3 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:38:40 2010 -0400 add a method to force shortening URLs commit 4d29ca0b91 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:37:41 2010 -0400 static method for getting best URL shortening service commit a9c6a3bace Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:37:11 2010 -0400 allow 0 in numeric entries in othersettings commit 767ff2f7ec Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:36:46 2010 -0400 allow 0 or blank string in inputs commit 1e21af42a6 Author: Evan Prodromou <evan@status.net> Date: Mon Apr 26 02:01:11 2010 -0400 add more URL-shortening options to othersettings commit 869a6be0f5 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:22:51 2010 -0400 move url shortener superclass to lib from plugin commit 9c0c9863d5 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:20:28 2010 -0400 documentation and whitespace on UrlShortenerPlugin commit 7a1dd5798f Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 14:05:46 2010 -0400 add defaults for URL shortening commit d259c37ad2 Author: Evan Prodromou <evan@status.net> Date: Sat Apr 24 13:40:10 2010 -0400 Add User_urlshortener_prefs Add a table for URL shortener prefs, a corresponding class, and the correct mumbo-jumbo in statusnet.ini to make everything work.	2010-04-26 02:40:36 -04:00
Zach Copley	f852a1931b	Add docs for public_timeline	2010-04-22 15:48:58 -07:00
Zach Copley	1b561065b0	Some initial Doxygen-based documentation for the API	2010-04-22 13:11:49 -07:00
Evan Prodromou	beaecb18d5	Add statusnet: prefix for API to JSON and XML output ... I added the statusnet: prefix to the xml output. This prefix should be declared on the root element of all relevant XML output. I also added two StatusNet-specific fields: * statusnet:html - rendered HTML. Clients shouldn't have to guess at the correct HTML rendering for notices, especially since some of the links depend on context. * statusnet:profile_url - profile URL for a user. You can't count on a user being a local user in a distributed microblogging world. So, this shows the explicit profile_url.	2010-04-22 08:49:33 -07:00
Brion Vibber	fee6b78e28	Merge branch 'testing' into 0.9.x	2010-04-19 18:47:56 +02:00
Brion Vibber	369885f04f	Merge branch 'master' into testing	2010-04-19 18:47:11 +02:00
Brion Vibber	e547a2f54c	Fix ticket #2289: registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used.	2010-04-19 18:45:50 +02:00
Craig Andrews	39392e03a7	Merge branch '0.9.x' into 1.0.x ... Conflicts: actions/confirmaddress.php actions/imsettings.php	2010-04-18 19:21:15 -04:00
Siebrand Mazeland	7ace3156ca	Add translator documentation. ... Fixed a few inconsistencies in the process. Confused about the e-mail related messages in the code.	2010-04-11 23:24:38 +02:00
Siebrand Mazeland	97ee2c2f12	Fix a typo and small error in translator documentation	2010-04-11 23:22:36 +02:00
Siebrand Mazeland	76d3fdacae	Add translator documentation. ... Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.	2010-04-11 22:37:03 +02:00
Siebrand Mazeland	69eebc1ec8	Add translator documentation for uses of 'Yes' and 'No' in the interface.	2010-04-11 21:04:07 +02:00
Brion Vibber	1eeb23e1e3	Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x ... Conflicts: actions/confirmaddress.php	2010-04-10 17:56:11 -07:00
Siebrand Mazeland	19b86da426	Lower case "Web"	2010-04-11 01:03:06 +02:00
Siebrand Mazeland	518832da28	Document messages for which clarification was requested.	2010-04-10 01:48:16 +02:00
Siebrand Mazeland	c15549ff5a	Fix double space in message	2010-04-10 01:47:27 +02:00
Siebrand Mazeland	166c1edba9	Fix inconsistencies in clientError() messages ... * use correct punctuation * single quotes when replace was possible * wording updated when needed	2010-04-09 16:11:20 -07:00
Siebrand Mazeland	8dda28d374	Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x	2010-04-10 00:59:21 +02:00
Siebrand Mazeland	3656a2cb13	Fix inconsistencies in clientError() messages ... * use correct punctuation * single quotes when replace was possible * wording updated when needed	2010-04-10 00:58:57 +02:00
Siebrand Mazeland	5c6c9b6f5f	Update message formatting for serverError to use a starting capital and a leading period.	2010-04-09 15:29:41 -07:00
Brion Vibber	58d5d7baee	Clean up badly formatted strings in OembedAction	2010-04-09 15:29:25 -07:00
Brion Vibber	7303acf7ad	Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x	2010-04-09 15:20:14 -07:00
Brion Vibber	ae4ade53a8	Fix E_NOTICE and use of limit on userrss	2010-04-09 15:19:04 -07:00
Siebrand Mazeland	47eed2c999	Update message formatting for serverError to use a starting capital and a leading period.	2010-04-10 00:07:20 +02:00
Brion Vibber	85fb32a359	Ticket #946: annotate use of singular 'them' in invite mail messages to aid translators	2010-04-09 14:02:01 -07:00
Brion Vibber	f4ad0acd84	Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing	2010-04-09 12:01:53 -07:00
Evan Prodromou	4e3fad4f0d	fix attributes on homepage output	2010-04-09 14:11:18 -04:00
Brion Vibber	756dd15515	i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form. ... Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.	2010-04-09 10:12:23 -07:00
Brion Vibber	4b20d68c48	i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form. ... Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.	2010-04-09 10:11:11 -07:00
Brion Vibber	f115c52d90	Clean up badly formatted strings in OembedAction	2010-04-09 09:56:19 -07:00
Brion Vibber	b76b0d3a5f	Cleanup bad i18n format for page title on bookmarklet posting window	2010-04-09 09:44:30 -07:00
Brion Vibber	f13bf37e11	Cleanup bad i18n format for page title on bookmarklet posting window	2010-04-09 09:43:34 -07:00
Brion Vibber	1f8451f4aa	Merge branch 'testing' into 0.9.x	2010-04-09 08:40:15 -07:00
Brion Vibber	7baf671570	Avoid E_NOTICE spew when listing group members who aren't admins	2010-04-09 08:38:42 -07:00
Christopher Vollick	a93d0dc16a	Undefined Variable in foafgroup.php ... Probably just left over from the past.	2010-04-09 08:38:34 -07:00
Brion Vibber	2be04e2a63	Avoid E_NOTICE spew when listing group members who aren't admins	2010-04-09 08:37:24 -07:00
Christopher Vollick	eefde36fcf	Undefined Variable in foafgroup.php ... Probably just left over from the past.	2010-04-09 08:35:13 -07:00
Brion Vibber	5dbaaed4e6	Maintain 'page' parameter for block from subscribers list, block & make-admin from group members list. ... Refactored some of the returnto handling code. It looks like we have several different ways of handling this in the software, icky! Marked the session-based functions with fixmes (they'll stomp on other forms when multiple tabs/windows are used) and combined some commonish bits of code between ProfileFormAction and the group block & makeadmin actions where they're using hidden form parameters. Extended that to allow passing dynamic parameters (eg 'page') as well as static ones (action, target user/group).	2010-04-08 19:06:55 -07:00
Evan Prodromou	727ea5a516	Merge branch '0.9.x' into 1.0.x	2010-04-07 10:47:29 -04:00
Brion Vibber	5dc169260d	Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x	2010-04-06 15:22:23 -07:00
Siebrand Mazeland	5f7b7d7509	* move TRANS comment from ea99855b35 down to right before the line with the message, otherwise gettext does not pick it up. ... * add another TRANS comment	2010-04-05 20:53:53 +02:00
Zach Copley	ea99855b35	The translators were having trouble with the wording of the subtitle ... for the list of groups a user is a member of. I've changed the wording and added a // TRANS: comment to hopefully make it more clear.	2010-04-05 11:31:41 -07:00
Brion Vibber	b71f276ed5	Merge branch 'master' into testing	2010-04-05 10:42:41 -07:00
Evan Prodromou	2a489018b1	use nofollow for subscribers list	2010-04-05 11:18:03 -04:00
Evan Prodromou	16827a66ba	use nofollow for group members list	2010-04-05 11:17:51 -04:00
Evan Prodromou	95229bc7a0	use homepage link attributes method for peopletaglist	2010-04-05 11:17:36 -04:00
Evan Prodromou	0b30230b5a	Merge branch 'nofollow'	2010-04-05 11:04:47 -04:00
Evan Prodromou	2882e40540	nofollow for peopletag pages	2010-04-05 11:03:14 -04:00
Evan Prodromou	96761c14ea	override linkAttributes() method for groupmembersminilist	2010-04-05 10:47:07 -04:00
Evan Prodromou	ffc1ac02c3	add an event for group members minilist	2010-04-05 10:12:27 -04:00
Brion Vibber	d4940fe148	Ticket #2272: Block confirmation form should let enter trigger the 'yes' button ... Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.	2010-04-03 10:29:24 -07:00
Brion Vibber	f2b60b78b6	Ticket #2272: Block confirmation form should let enter trigger the 'yes' button ... Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.	2010-04-03 10:26:43 -07:00