Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
|
|
* whitespace and indentation updates
|
|
|
|
Connect
|
|
|
|
|
|
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
|
|
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
|