Brion Vibber
d09aa9c947
Workaround for bug causing fatal error during favoriting; Profile::getCurrentNotice() was returning an ArrayList instead of a Notice directly due to pulling through Profile::getNotices(). This caused failure in Fave::addNew() which specifies it wants a Notice. Caused failure of the 'fav' IM command.
2011-03-01 17:01:35 -08:00
Brion Vibber
8cacecb6dc
Use threaded replies in group inbox view
2011-03-01 16:29:11 -08:00
Brion Vibber
018b11a883
Fix for realtime vs threaded reply fix
2011-03-01 16:29:00 -08:00
Brion Vibber
4f41af7179
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-01 16:18:24 -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
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
c6521db620
Fix for timeline insert on primary AJAX post: only insert on the first, primary timeline. Don't insert on sub-timelines for replies!
2011-03-01 15:24:44 -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
Brion Vibber
db4ab2cd92
When canceling out of inline reply field and there are no other replies, drop the section
2011-03-01 14:26:11 -08:00
Brion Vibber
e6c972ebcb
Inline replies: drop the box if tabbing out and no text
2011-03-01 14:24:06 -08:00
Brion Vibber
c0dcd73379
Inline replies: fix replies on repeats, placeholder re-add when replying to a reply
2011-03-01 13:49:13 -08:00
Brion Vibber
35ce314bfb
Hide context entries in threaded lists; it's redundant (and if there's more than a few messages, we have the context link still :D)
...
Also hides them via CSS for new ajax additions
2011-03-01 13:30:38 -08:00
Brion Vibber
082ddf365e
Cut repeats out of the magic handling
2011-02-28 17:23:01 -08:00
Brion Vibber
407cc851cc
Collapse long threaded displays with a link to the convo view (todo: turn it into an ajax loader for inline expansion)
2011-02-28 17:13:54 -08: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
d01648248e
Inline replies now do ajaxy submit. Neat! Not 100% perfect though
2011-02-28 16:38:44 -08:00
Zach Copley
22c2695c22
Merge commit 'refs/merge-requests/153' of git://gitorious.org/statusnet/mainline into merge-requests/153
2011-02-28 16:36:59 -08:00
Brion Vibber
f109d15c28
avoid hardcoding action & session token; pull them from the main posting form for now
2011-02-28 16:24:51 -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
Brion Vibber
62712b794a
More interactive magic for inline replies: placeholder at the end of list
2011-02-28 16:13:16 -08:00
Zach Copley
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -08:00
Brion Vibber
3b456b4ffe
Paging fix for threaded notice lists
2011-02-28 15:40:43 -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
e89bffc3f1
Work in progress: setting up inline reply mini-form in js
2011-02-28 15:38:54 -08:00
Brion Vibber
fb9418b99d
some quick visual tweaks
2011-02-28 12:50:26 -08:00
Brion Vibber
2370208540
quickie inline reply posting form
2011-02-28 12:41:03 -08:00
Brion Vibber
934ae38acd
Merge branch '1.0.x' into inline-comments
2011-02-28 12:25:42 -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
2c03dd569c
visual tweaks for convo view
2011-02-28 12:20:47 -08:00
Brion Vibber
31bf2cd6b9
quick hack -- switch order on inline convo view (comments in forward chron)
2011-02-28 11:59:37 -08:00
Brion Vibber
d806907b81
Initial test threaded convo view inline on public, all timelines
2011-02-28 11:53:48 -08:00
Brion Vibber
8cdf8cf33e
Fix for schema_version checksum table when checking schemas before the table's been added. :)
2011-02-28 11:19:47 -08:00
Brion Vibber
836f4ea6ea
fix - Notice: Undefined variable: action in /Library/WebServer/Documents/mublog/lib/action.php on line 521
2011-02-28 11:02:38 -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
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
6a6584741f
Fix for ticket #2248 : flickr etc URLs that contain @ in the paths etc no longer accidentally trip the mailto: thingy
2011-02-25 15:46:35 -08:00
Brion Vibber
e00483d703
Test case for ticket #2248 : flickr URLs with @ in the path get misinterpreted as mailto
2011-02-25 15:38:24 -08:00
Siebrand Mazeland
4e3537a12b
* add support for Friulian
...
* move a line around for sorting reasons
2011-02-26 00:34:46 +01: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
