Brion Vibber
|
5519da95fd
|
Merge branch 'master' into 0.9.x
|
2011-03-01 17:11:29 -08:00 |
|
Brion Vibber
|
3eb900e31f
|
More fixes for 'fav' IM command: don't die with a fatal error if the notice has already been favored, and don't spew a warning when checking for user ID match.
|
2011-03-01 17:09:41 -08:00 |
|
Brion Vibber
|
4c09c1dc47
|
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:04:05 -08:00 |
|
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 |
|
Evan Prodromou
|
5bbcededa7
|
move inbox/outbox to object menu
|
2011-03-01 16:48:20 -05:00 |
|
Evan Prodromou
|
815a9a0c3e
|
fixup link to your profile
|
2011-03-01 16:37:21 -05:00 |
|
Evan Prodromou
|
c4b53b4aef
|
don't show full profile menu all the time
|
2011-03-01 16:35:25 -05: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 |
|
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
|
0fef2cb66d
|
personal group nav uses current user
|
2011-03-01 16:04:36 -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 |
|
Evan Prodromou
|
c925a4d181
|
search actions show the search menu in object area
|
2011-03-01 15:54:43 -05:00 |
|
Evan Prodromou
|
805d14577d
|
subscriber actions show the profile menu in object area
|
2011-03-01 15:54:32 -05:00 |
|
Evan Prodromou
|
0e1a221423
|
add object menu to actions, default empty
|
2011-03-01 15:52:46 -05:00 |
|
Evan Prodromou
|
7d77bdcc48
|
move top-level navigation to default local navigation
|
2011-03-01 06:30:51 -05:00 |
|
Evan Prodromou
|
dba2aaa59f
|
new mega-menu for default local navigation
|
2011-03-01 06:30:27 -05:00 |
|
Evan Prodromou
|
d8cbc20a79
|
method to show submenus
|
2011-03-01 06:29:24 -05:00 |
|
Evan Prodromou
|
a64c6c5015
|
all nav menus use menu superclass
|
2011-03-01 06:00:03 -05:00 |
|
Evan Prodromou
|
d6d3dfda81
|
AdminPanelNav has own module, uses Menu
|
2011-03-01 05:51:00 -05:00 |
|
Evan Prodromou
|
903053caec
|
primary and secondary nav use menu superclass
|
2011-03-01 05:46:03 -05:00 |
|