Commit Graph

12370 Commits

Author SHA1 Message Date
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
Evan Prodromou c8d6a77d8a common superclass for menu widgets 2011-03-01 05:45:38 -05: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