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
9fd2ee86f3
Inline reply work for threaded lists in realtime
2011-03-01 16:04:11 -08:00
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
dfbbeb67c8
Makefile for Realtime's min.js
2011-03-01 15:33:10 -08:00
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
babdc430f9
Switch Twitter bridge settings page to be a ProfileSettingsAction, as ConnectSettingsAction is gone
2011-02-28 12:22:21 -08:00
061c8d959b
Merge branch 'extprofile' into 0.9.x
2011-02-28 10:45:53 -08:00
2bd9532ebe
Merge branch 'master' into 0.9.x
2011-02-28 10:18:18 -08:00
78eed32781
Localisation updates from http://translatewiki.net .
2011-02-26 00:34:44 +01:00
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
1508193df4
fix layout of form with magic hoohaw
2011-02-25 13:18:28 -08:00
62a5f270d6
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-25 12:56:40 -08:00
2b995c943f
allow access to confirm first for not-logged-in users
2011-02-25 12:56:21 -08:00
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
7c192dabe2
Let users who aren't allowed to login confirm their email separately
2011-02-25 08:01:41 -08:00
77c280a48b
Revert "FacebookBridge - Add lots of debug output (revert me)"
...
This reverts commit c44a622449
2011-02-24 14:21:50 -08:00
7d50189ec2
FacebookBridge - Don't hinder autoloading if the Facebook ID and secret aren't set
2011-02-24 13:57:21 -08:00
de6d46ea4b
FacebookBridge - dequeue messages that aren't bound for Facebook
2011-02-24 13:29:56 -08:00
c44a622449
FacebookBridge - Add lots of debug output (revert me)
2011-02-24 12:59:37 -08:00
65dbf485e4
FacebookBridge - make a huge fuss if we can't create a valid Facebookclient
2011-02-24 12:52:31 -08:00
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 < and > 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
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
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
bf8a3c1931
disallow login for users without validated email
2011-02-21 16:20:10 -05:00
e9184dd775
HTML and style cleanup for EmailSummary plugin.
2011-02-18 13:49:29 -05:00
3e7e6138a8
Localisation updates from http://translatewiki.net .
2011-02-17 12:27:14 +01:00
07bc802867
argument to send email summary to all users on all sites
2011-02-16 11:58:35 -05:00
10bb94807b
fix indentation in siteemailsummaryhandler
2011-02-15 16:28:20 -05:00
f31db669b0
fix indentation in sendemailsummary.php
2011-02-15 16:27:51 -05:00
845b1cff72
fix indentation in Email_summary_status.php
2011-02-15 16:26:44 -05:00
59afc4aa56
fix indentation in EmailSummaryPlugin.php
2011-02-15 16:26:15 -05:00
128bfd7011
fix indentation in usermailsummaryhandler.php
2011-02-15 16:25:37 -05:00
ff502bb148
Get correct size for default avatar in email summary
2011-02-15 12:53:02 -05:00
a86d293c93
Localisation updates from http://translatewiki.net .
2011-02-14 19:43:16 +01:00
c92358fa7b
add --all and --suspicious options for update-profile-data.php
2011-02-11 12:23:03 -08:00
f30744c7c5
refactor for multi....
2011-02-11 12:13:33 -08:00
f7b431d60b
woops
2011-02-11 12:08:35 -08:00
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
dc424ab63a
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-10 22:23:06 -05:00
b09276635c
Merge branch 'master' into 0.9.x
2011-02-10 12:04:13 -08:00
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
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
d9ace57625
FacebookBridge - remove unnecessary warning and noisy debugging statement
2011-02-10 10:24:38 -08:00
8a87e9869f
Show aside primary on settings pages for all themes.
2011-02-10 13:23:20 -05:00
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
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
c273876298
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-02-09 03:09:24 -05:00
10500e7f85
ensure*() functions throw exceptions for errors
2011-02-09 03:08:52 -05:00
75bf756111
LOG_WARN -> LOG_WARNING
2011-02-08 23:34:37 -08:00
Brion Vibber
Zach Copley
Siebrand Mazeland
Evan Prodromou
Samantha Doherty