Commit Graph

2778 Commits

Author SHA1 Message Date
Brion Vibber d5f5f76947 durrrr s/textValue/textContent/ 2011-03-11 12:45:55 -08:00
Brion Vibber e1136bacae Update PollPlugin Atom input 2011-03-11 12:41:11 -08:00
Brion Vibber a9d589dbdc Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware!
Input not yet updated.
2011-03-11 12:28:15 -08:00
Evan Prodromou 487b3be198 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 13:27:11 -06:00
Siebrand Mazeland 69e11bb45e Localisation updates from http://translatewiki.net. 2011-03-11 19:33:52 +01:00
Siebrand Mazeland 843ace580d i18n/L10n updates
Translator documentation added
2011-03-11 19:05:28 +01:00
Siebrand Mazeland a70914cd57 i18n fixes: plugins should use _m(), not _(). 2011-03-11 18:33:19 +01:00
Siebrand Mazeland 76bffe1a64 * Superfluous whitespace removed
* Small L10n updates
2011-03-11 18:31:22 +01:00
Luke Fitzgerald 43db20ca98 Merge in upstream protocol change
"passport response message changed, it might return Compact2 instead of PPToken2 since 2011/2/14."
2011-03-11 17:23:14 +00:00
Evan Prodromou 5976a8542b Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 08:37:05 -06:00
Zach Copley 08018a1f7b Merge branch '1.0.x' into profile-fixups 2011-03-10 17:16:54 -08:00
Zach Copley 78ecb17ba1 User directory - fix nav 2011-03-10 17:15:56 -08:00
Zach Copley 302f0236bd Make correct nav menus show 2011-03-10 17:13:34 -08:00
Zach Copley 8efd2cf04d Make phone number save and display from DB 2011-03-10 16:57:41 -08:00
Zach Copley 78dc4f3a3d Merge branch '1.0.x' into profile-fixups 2011-03-10 14:22:41 -08:00
Zach Copley 24d0094192 User Directory - set class current on "All" if there is no selected filter 2011-03-10 14:20:35 -08:00
Zach Copley c456e998c7 Make phone numbers save 2011-03-10 14:14:21 -08:00
Brion Vibber eccadb4a7b cleanup... Poll main & response events seem to sorta work over ostatus now 2011-03-10 13:56:54 -08:00
Brion Vibber 6416f5ea41 fix 2011-03-10 13:47:44 -08:00
Brion Vibber 97df2f394f typo.... maybe that coffee's wearing off? 2011-03-10 13:46:20 -08:00
Brion Vibber e54eb9117f backwards 2011-03-10 13:45:31 -08:00
Brion Vibber d6c8c61076 AS output/input for poll responses 2011-03-10 13:41:23 -08:00
Brion Vibber e085ef5ef5 Work on turning poll responses into activities so we can send them over ostatus bridge. Not yet bridging. 2011-03-10 12:38:25 -08:00
Brion Vibber 0511800351 Provisional tweak for polls to go through atom feeds / ostatus
Had to fix some calls to MicroAppPlugin->saveNoticeFromActivity() which passed an OStatus_profile instead of a Profile...
Imported polls don't get data from upstream or send it back currently.
2011-03-10 11:35:04 -08:00
Brion Vibber 2567474ddd Work in progress: fixing Poll posting URLs, working on AS input 2011-03-10 11:22:08 -08:00
Evan Prodromou 39f8d2c728 date picker for event form 2011-03-10 11:25:34 -06:00
Evan Prodromou 39b308bf90 reformatting on RSVP.php 2011-03-10 10:14:09 -06:00
Zach Copley 5203fa7151 Make all simple fields save 2011-03-09 19:31:37 -08:00
Zach Copley adcda00e76 * Remove evil transaction
* Fix text value retrieval method
2011-03-09 19:27:21 -08:00
Brion Vibber b653b2fb64 Update TinyMCE plugin for reusable thingies; doesn't quite arrange properly in the layout, we'll have to figure that out still. 2011-03-09 18:29:10 -08:00
Zach Copley 3d61d003bc Fix property declaration 2011-03-09 18:16:02 -08:00
Brion Vibber 662ad0f7bb Update DirectionDetector for reusable notice forms.
Also tweaked it to trigger on cut/paste, and to reset when the form resets.
2011-03-09 18:11:08 -08:00
Brion Vibber 4915b0cb9e Update Autocomplete plugin for reusable notice forms in 1.0.x. It's fun!
Now pulls the fetch API URL from a dedicated <span> with a data attribute ('data-url', should pass HTML 5 validators for our future overlords)
2011-03-09 18:01:41 -08:00
Zach Copley c6f9baf78c Merge branch '1.0.x' into profile-fixups 2011-03-09 18:01:36 -08:00
Zach Copley 0429a52c6e Update to use new Managed_dataobject 2011-03-09 18:00:24 -08:00
Brion Vibber ec828a094c Update LinkPreview plugin for multiple notice forms.
* main notice form setup now encapsulated into SN.Init.NoticeForm(form) -- this can be monkeypatched by plugins to append their own setup code, as LinkPreview does
* LinkPreview now supports debugging with non-minified JS source when $config['site']['minify'] is false
* tweaked core & neo styles so 'notice-status' class gets same styles as attach-status, so we can more easily add mroe statusy things. (needs more consolidation with geo-status, etc)
* tweaked LinkPreview's preview area to use that style
2011-03-09 17:43:31 -08:00
Brion Vibber 4ea35f339d Fixes for Event plugin:
* RSVP cancel/delete now works
* caching fix for RSVP insert and delete (compound unique keys aren't properly handled for pkeyGet's caching right now; hacked it for this class for the moment)
* div nesting fix
* missing name/avatar on RSVP responses
2011-03-09 14:10:26 -08:00
Brion Vibber e9cab215fe Event: fix for display problem -- need to leave this div open for now 2011-03-09 13:31:22 -08:00
Zach Copley 65f9b5d954 Attempt to save field (doesn't work right yet) 2011-03-09 11:27:29 -08:00
Evan Prodromou 1d29ba8315 Merge branch 'event' into 1.0.x 2011-03-09 12:56:06 -05:00
Evan Prodromou 35429c28e5 updates to make RSVPs work 2011-03-09 12:28:25 -05:00
Evan Prodromou 728869e311 show RSVPs for an event 2011-03-09 10:40:49 -05:00
Evan Prodromou a4b3edaf40 Login actions don't show the notice form 2011-03-09 10:11:59 -05:00
Evan Prodromou f00f5f20b8 add url to events 2011-03-09 10:07:30 -05:00
Evan Prodromou 53e67b5ed5 make new event work, sort of 2011-03-09 02:48:14 -05:00
Evan Prodromou ca36dfecf9 more fixes for events 2011-03-09 02:37:55 -05:00
Evan Prodromou f715821cf0 Kinda complete and kinda working-ish events 2011-03-09 02:37:55 -05:00
Evan Prodromou 0b30fb3971 Make event-specific stuff in EventPlugin 2011-03-09 02:37:55 -05:00
Evan Prodromou 24fd39d6ab new Event plugin 2011-03-09 02:37:55 -05:00
Zach Copley 794cb5609b Save basic profile data to the right place 2011-03-08 19:20:43 -08:00
Brion Vibber 1413ed911f Hackaround for http caching problem on poll pages; the notice doesn't change, but the results do, so don't use the notice's last-modifeid time as a caching epoch. 2011-03-08 16:06:30 -08:00
Brion Vibber 921eb1eb23 quickie bar chart for poll results 2011-03-08 16:04:32 -08:00
Brion Vibber d990357be9 fix off-by-one error in poll results display 2011-03-08 15:44:51 -08:00
Brion Vibber cbf16a4974 Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.

Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
Zach Copley 3bbe481695 Merge branch '1.0.x' into profile-fixups 2011-03-08 14:10:06 -08:00
Zach Copley 8ffae63b38 Merge branch '1.0.x' into profile-fixups 2011-03-08 14:03:40 -08:00
Brion Vibber 28809035d0 Replace explicit FormXHR setup for a bunch of simple AJAX form submissions with adding the 'ajax' class on them.
This avoids having to add extra custom JS bits just to initialize forms using the common AJAX submission path.
2011-03-08 13:58:28 -08:00
Brion Vibber 90f1cfcfc0 Poll plugin: make the polling response form submit via AJAX and return the results.
Now, any form marked with 'ajax' class will get the simple FormXHR treatment. Should help cut down on code that just adds that into individual forms.
2011-03-08 13:45:51 -08:00
Brion Vibber ba1ada2880 de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Zach Copley cfe3e83293 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
  Localisation updates from http://translatewiki.net.
  More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
  Doc comments for MicroAppPlugin
  mailboxes were wrongly overriding global menu
2011-03-07 21:35:48 -08:00
Zach Copley 99bd8c670c Fix a couple things 2011-03-07 21:34:57 -08:00
Brion Vibber 3438a78c02 Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
This version is fairly basic; votes do not (yet) show a reply, they just got in the table. No pretty graphs for the results yet, just text.
The ActivityStream output is temporary and probably should be replaced; the current structures for adding custom data aren't really ready yet (especially since we need to cover JSON and Atom formats, probably pretty differently)

Uses similar system as Bookmark for attaching to notices -- saves a custom URI for an alternate action, which we can then pass in and hook back up to our poll object. This can probably do with a little more simplification in the parent MicroAppPlugin class.

Currently adds two tables:
- poll holds the main poll info: id and URI to associate with the notice, then the question and a text blob with the options.
- poll_response records the selections picked by our nice fellows.

Hopefully no off-by-one bugs left in the selection, but I give no guarantees. ;)
Some todo notes in the README and in doc comments.
2011-03-07 21:28:36 -08:00
Zach Copley be53b94bfd - Fix table name; add comments 2011-03-07 17:26:19 -08:00
Siebrand Mazeland b9e2c72740 Localisation updates from http://translatewiki.net. 2011-03-08 02:18:32 +01:00
Zach Copley 68a3246f1c Fixup sphinx plugin to have additional sort orders 2011-03-07 17:18:30 -08:00
Brion Vibber 541613ce69 More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out 2011-03-07 15:15:21 -08:00
Zach Copley b431a3b216 Rearrange alphanav to better fit 3CL 2011-03-07 14:32:14 -08:00
Brion Vibber 9a837ee33b Doc comments for MicroAppPlugin 2011-03-07 13:36:15 -08:00
Zach Copley 4b24f09ab4 Merge branch '1.0.x' into directory
* 1.0.x: (68 commits)
  Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
  Fix bad reference
  lost a </div> in input_forms
  neo is the default
  First version of 3cl theme neo.
  cleaner is the new default theme (for now)
  store reply_to notices as comment activity objects
  fix object errors with bookmark notices
  save the object type when saving a new bookmark notice
  ActivityObject uses Notice's object_type by default
  Notice saves its object type
  show correct notice in output
  UR FACE
  wrapper div for primary nav
  Revert "abstraction for starting and ending a menu"
  Revert "primarynav uses menustart and menuend"
  primarynav uses menustart and menuend
  abstraction for starting and ending a menu
  remove adminpanelnav from adminpanelaction module
  Input form switcher works
  ...
2011-03-07 12:37:51 -08:00
Evan Prodromou 095e2a74d4 fix object errors with bookmark notices 2011-03-07 14:25:37 -05:00
Evan Prodromou f5782e9e56 save the object type when saving a new bookmark notice 2011-03-07 14:25:05 -05:00
Evan Prodromou 7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Evan Prodromou 52952d13c0 first (non-working) move to microapp structure for bookmarks 2011-03-07 03:34:20 -05:00
Zach Copley 00c14ffa88 Better instructions, and better empty search results messages. 2011-03-06 22:08:19 -08:00
Zach Copley b3e3264a4d Merge branch '1.0.x' into directory
* 1.0.x:
  Localisation updates from http://translatewiki.net.
  * fix i18n and L10n issues. * update translator documentation. * remove superfluous whitespace.
2011-03-06 20:35:06 -08:00
Siebrand Mazeland 7a9b989349 Localisation updates from http://translatewiki.net.
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
2011-03-06 02:52:28 +01:00
Zach Copley 1256181d36 Merge branch '1.0.x' into directory
* 1.0.x:
  * translator documentation updated. * superfluous whitespace removed. * small refactoring in noticeform.php to allow proper translator hints.
  * translator documntation updated * superfluous whitespace remove * minor L10n and i18n updates
  Cleanup & minification for migration to reusable notice form in inline replies. Yay!
  Work in progress: inline reply form reusing the main reply form now inserts the successful result more or less right
  style fixes for new notice form being reused in reply area
  Reusable notice form fixes for geolocation
  Loading the original form instead of faking up our own. Sorta works but not pretty :D
  Kill some more hardcoded ids...
  More hardcoded id cleanup in notice form...
  'link' to 'links' in feed document
2011-03-05 01:57:50 -08:00
Zach Copley 5d22f969a1 * Integrate search input box
* Fix ordering
2011-03-05 01:55:52 -08:00
Zach Copley 7d76b55da1 fixup comments 2011-03-04 17:55:56 -08:00
Zach Copley 52df926b8d Only show profiles of local users 2011-03-04 17:25:58 -08:00
Brion Vibber 5358f78e82 Reusable notice form fixes for geolocation 2011-03-04 14:27:55 -08:00
Zach Copley b89f390b33 Merge branch '1.0.x' into directory 2011-03-03 21:13:21 -08:00
Zach Copley f157c523fd * Reformat list of profiles in a table
* Make table sortable
2011-03-03 21:12:24 -08:00
Brion Vibber cd20190ba5 Remove hardcoded #notice_action-submit from JS/CSS (prep for reusable notice forms) 2011-03-03 17:48:16 -08:00
Brion Vibber b58aa29168 Notice form cleanup: removing hardcoded id from counter references; prep for reusable notice forms. 2011-03-03 17:15:17 -08:00
Siebrand Mazeland 5fd9767e80 Localisation updates from http://translatewiki.net.
* Fix previous commit. Pot files were built against master instead of 1.0.x.
2011-03-03 18:39:12 +01:00
Siebrand Mazeland 0210b765ad Localisation updates from http://translatewiki.net.
Looks like some documentation patches from 0.9.x didn't make it into 1.0.x (see statusnet.pot diff). Have to check with Brion what went wrong there.
2011-03-03 18:21:17 +01:00
Zach Copley 3b186e1bae * Fix pagination
* Add some more elements for styling
* Add initial CSS
2011-03-02 20:21:15 -08:00
Zach Copley 09c90edbb5 Merge branch '1.0.x' into directory 2011-03-01 19:36:11 -08:00
Zach Copley cb49ea88d3 Initial go at a site directory plugin 2011-03-01 19:35:20 -08:00
Brion Vibber 764d069ccd Clean up threaded notices vs replies classes, and fixed realtime's threaded behavior to only run on threaded lists 2011-03-01 16:08:37 -08:00
Brion Vibber 9fd2ee86f3 Inline reply work for threaded lists in realtime 2011-03-01 16:04:11 -08:00
Brion Vibber 5d6b9936c2 Partial update of Realtime for threaded view; can now place replies into the proper subtimeline if it's already present, but not if it wasn't shown yet. 2011-03-01 15:45:44 -08:00
Brion Vibber dfbbeb67c8 Makefile for Realtime's min.js 2011-03-01 15:33:10 -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 babdc430f9 Switch Twitter bridge settings page to be a ProfileSettingsAction, as ConnectSettingsAction is gone 2011-02-28 12:22:21 -08:00
Brion Vibber 061c8d959b Merge branch 'extprofile' into 0.9.x 2011-02-28 10:45:53 -08:00
Brion Vibber 2bd9532ebe Merge branch 'master' into 0.9.x 2011-02-28 10:18:18 -08:00
Siebrand Mazeland 78eed32781 Localisation updates from http://translatewiki.net. 2011-02-26 00:34:44 +01:00
Brion Vibber 9ec395b07a Workaround for reply timeline since_id issue: save the notice.created value into reply.modified, so we can key off it as expected.
As a hack this removes the mysql_timestamp bit from the field settings on reply.modified so that our value actually gets saved. This *should* work ok as long as system timezone is set correctly, which we now set to UTC to match when connecting.
2011-02-25 13:22:13 -08:00
Evan Prodromou 1508193df4 fix layout of form with magic hoohaw 2011-02-25 13:18:28 -08:00
Evan Prodromou 62a5f270d6 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2011-02-25 12:56:40 -08:00
Evan Prodromou 2b995c943f allow access to confirm first for not-logged-in users 2011-02-25 12:56:21 -08:00
Brion Vibber 880b1b666e Merge branch 'master' into 0.9.x 2011-02-25 12:24:18 -08:00
Brion Vibber 59a413cf5e Merge branch 'master' into 0.9.x 2011-02-25 10:16:00 -08:00
Evan Prodromou 7c192dabe2 Let users who aren't allowed to login confirm their email separately 2011-02-25 08:01:41 -08:00
Zach Copley 77c280a48b Revert "FacebookBridge - Add lots of debug output (revert me)"
This reverts commit c44a622449.
2011-02-24 14:21:50 -08:00
Zach Copley 7d50189ec2 FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set 2011-02-24 13:57:21 -08:00
Zach Copley de6d46ea4b FacebookBridge - dequeue messages that aren't bound for Facebook 2011-02-24 13:29:56 -08:00
Zach Copley c44a622449 FacebookBridge - Add lots of debug output (revert me) 2011-02-24 12:59:37 -08:00
Zach Copley 65dbf485e4 FacebookBridge - make a huge fuss if we can't create a valid Facebookclient 2011-02-24 12:52:31 -08:00
Brion Vibber 8eca1b8dac Fix ticket #3057: apply HTML escaping on special characters in Twitter import
Changes the replacement of Twitter "entities" from in-place reverse ordering ('to preserve indices') to a forward-facing append-in-chunks that pulls in both the text and link portions, and escapes them all.
This unfortunately means first *de*-escaping the &lt; and &gt; that Twitter helpfully adds for us.... and any literal &blah;s that get written. This seems to match Twitter's web UI, however horrid it is.
2011-02-21 16:36:39 -08:00
Brion Vibber 2a42dac72a Partial implementation for ticket #2442: MobileProfile plugin should allow manual switching between regular and mobile rendering modes
http://status.net/open-source/issues/2442

Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers
2011-02-21 16:10:07 -08:00
Brion Vibber 3fb4b92cd6 Fix ticket #3001: Twitter bridge was replacing original form of @-mentions with canonical form unexpectedly
Now using the original text form of @-mentions and #-tags, as in Twitter's own HTMLification.
Canonical forms are still used in generating links, where it's polite to match the canonical form.
2011-02-21 15:01:57 -08:00
Evan Prodromou bf8a3c1931 disallow login for users without validated email 2011-02-21 16:20:10 -05:00
Samantha Doherty e9184dd775 HTML and style cleanup for EmailSummary plugin. 2011-02-18 13:49:29 -05:00
Siebrand Mazeland 3e7e6138a8 Localisation updates from http://translatewiki.net. 2011-02-17 12:27:14 +01:00
Evan Prodromou 07bc802867 argument to send email summary to all users on all sites 2011-02-16 11:58:35 -05:00
Evan Prodromou 10bb94807b fix indentation in siteemailsummaryhandler 2011-02-15 16:28:20 -05:00
Evan Prodromou f31db669b0 fix indentation in sendemailsummary.php 2011-02-15 16:27:51 -05:00
Evan Prodromou 845b1cff72 fix indentation in Email_summary_status.php 2011-02-15 16:26:44 -05:00
Evan Prodromou 59afc4aa56 fix indentation in EmailSummaryPlugin.php 2011-02-15 16:26:15 -05:00
Evan Prodromou 128bfd7011 fix indentation in usermailsummaryhandler.php 2011-02-15 16:25:37 -05:00
Evan Prodromou ff502bb148 Get correct size for default avatar in email summary 2011-02-15 12:53:02 -05:00
Siebrand Mazeland a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Brion Vibber c92358fa7b add --all and --suspicious options for update-profile-data.php 2011-02-11 12:23:03 -08:00
Brion Vibber f30744c7c5 refactor for multi.... 2011-02-11 12:13:33 -08:00
Brion Vibber f7b431d60b woops 2011-02-11 12:08:35 -08:00
Brion Vibber 91535365b3 Work in progress: update-profile-data.php to update ostatus profile info from the current feed 2011-02-11 11:55:23 -08:00
Evan Prodromou dc424ab63a Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-10 22:23:06 -05:00
Brion Vibber b09276635c Merge branch 'master' into 0.9.x 2011-02-10 12:04:13 -08:00
Brion Vibber 2bf8a68908 Fix for ticket #3039: TwitterBridge was incorrectly sending repeats of Twitter-bound messages if the repeater has sending of things to Twitter disabled.
A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications.
2011-02-10 10:53:24 -08:00
Zach Copley 857e35c175 Merge branch 'master' of gitorious.org:statusnet/mainline
* 'master' of gitorious.org:statusnet/mainline:
  Show aside primary on settings pages for all themes.
  correct error in README on default for deletion
2011-02-10 10:26:36 -08:00
Zach Copley d9ace57625 FacebookBridge - remove unnecessary warning and noisy debugging statement 2011-02-10 10:24:38 -08:00
Samantha Doherty 8a87e9869f Show aside primary on settings pages for all themes. 2011-02-10 13:23:20 -05:00
Evan Prodromou 8fa44e58f9 Try not to wipe out good data with empty values in Ostatus_profile::updateProfile()
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.

This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.

Bug: 3028
2011-02-10 09:39:40 -05:00
Brion Vibber a76f067631 Partial revert of 073f3e99: restores the original non-hashbang URLs for twitter users as the remote profile.
Should fix issue #3027: twitter user avatars not getting imported.

Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
2011-02-09 13:46:48 -08:00
Evan Prodromou c273876298 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-09 03:09:24 -05:00
Evan Prodromou 10500e7f85 ensure*() functions throw exceptions for errors 2011-02-09 03:08:52 -05:00
Brion Vibber 75bf756111 LOG_WARN -> LOG_WARNING 2011-02-08 23:34:37 -08:00
Zach Copley 98af8d2a19 FacebookBridge plugin - allow Facebook app ID and secret to be
initialized via config.php
2011-02-09 04:49:39 +00:00
Evan Prodromou 399977aebf Merge remote branch 'origin/pluginstatic' into testing 2011-02-08 13:39:17 -05:00
Brion Vibber 1c3fabbc27 Add a brief explanation of what group inbox is at the top of the page (instructions section), plus a message to show when there are no private messages in the inbox. 2011-02-07 12:39:40 -08:00
Brion Vibber ac5e7b727a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-02-07 12:20:12 -08:00
Brion Vibber 4883069177 Fix group regexes that got missed in Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not actual delivery, when using _underscores_ in the !group_name 2011-02-07 12:18:41 -08:00
Evan Prodromou dbd496f901 hide feeds from group page if it's private-only 2011-02-07 14:24:35 -05:00
Evan Prodromou 204b5e8a63 Show a little indicator for private-only groups 2011-02-07 14:21:54 -05:00
Evan Prodromou 1d439ef5d8 Force notices to DMs when privacy = always 2011-02-07 12:58:42 -05:00
Evan Prodromou 80a4b9c76f Change category and copyright year 2011-02-07 12:28:58 -05:00
Evan Prodromou e759b15a92 pagination for group inbox 2011-02-07 12:08:18 -05:00