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
Siebrand Mazeland
78eed32781
Localisation updates from http://translatewiki.net .
2011-02-26 00:34:44 +01:00
Siebrand Mazeland
a86d293c93
Localisation updates from http://translatewiki.net .
2011-02-14 19:43:16 +01:00
Brion Vibber
b09276635c
Merge branch 'master' into 0.9.x
2011-02-10 12:04:13 -08:00
Samantha Doherty
8a87e9869f
Show aside primary on settings pages for all themes.
2011-02-10 13:23:20 -05:00
Evan Prodromou
26f0a24ab6
Merge branch 'testing' into pluginstatic
2011-02-03 11:42:58 -05:00
Evan Prodromou
70cf37cb88
fix variable name in NewMenu
2011-02-03 11:42:36 -05:00
Evan Prodromou
9ae3d3de36
NewMenu uses Plugin::path()
2011-02-03 11:41:47 -05:00
Siebrand Mazeland
308e615a3f
Localisation updates from http://translatewiki.net .
2011-02-03 01:31:31 +01:00
Siebrand Mazeland
e6e402cefd
Localisation updates from http://translatewiki.net .
2011-01-29 23:10:15 +01:00
Evan Prodromou
c309bbae93
Merge remote branch 'gitorious/testing' into testing
2011-01-24 06:54:09 -07:00
Evan Prodromou
592e2be5e1
Make new menu the default menu
...
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.
This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.
Let's put that episode behind us.
The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Evan Prodromou
b72fe00ae3
remove boilerplate from NewMenuPlugin
2011-01-23 12:03:28 -05:00
Brion Vibber
6fa0bea76d
Merge branch '0.9.x' into testing
2011-01-20 15:12:57 -08:00
Siebrand Mazeland
03acf301ba
Localisation updates from http://translatewiki.net .
2011-01-20 21:12:51 +01:00
Brion Vibber
963e7576f2
Merge branch 'testing' into moveaccount
2011-01-19 10:41:14 -08:00
Brion Vibber
56e2bc10d9
Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us.
2011-01-18 12:34:27 -08:00
Siebrand Mazeland
89727549a6
Localisation updates from http://translatewiki.net .
2011-01-15 00:47:49 +01:00
Siebrand Mazeland
380ca7187c
Localisation updates from http://translatewiki.net .
2011-01-14 12:10:05 +01:00
Evan Prodromou
5d43923941
remove help link; Everyone => Public; Logo goes home
2011-01-07 19:27:59 -05:00
Evan Prodromou
16cf7d8d40
Show some menu fixup for settings for some themes
2011-01-07 19:22:27 -05:00
Evan Prodromou
66ed9c7f30
change 'Everyone' to 'Public'
2011-01-07 18:57:34 -05:00
Evan Prodromou
9af5040693
combine account and connect menus
2011-01-07 18:56:18 -05:00
Evan Prodromou
75dd361d29
move profile to subgroupnav
2011-01-05 11:24:24 -08:00
Evan Prodromou
b1e42115da
new menu layout plugin
2011-01-04 19:32:36 -08:00
