Brion Vibber
|
59119482ca
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
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
|
2010-10-04 12:54:36 -07:00 |
|
Siebrand Mazeland
|
b9177f5e2e
|
* i18n/L10n and translator documentation updates.
* whitespace and indentation updates
|
2010-09-29 00:39:45 +02:00 |
|
Craig Andrews
|
1a62d1b493
|
Use presence of IM plugins to decide if "IM" options should be available
|
2010-06-16 16:00:54 -04:00 |
|
Craig Andrews
|
4ee2c12507
|
Use presence of IM plugins to decide if "IM" menu option should be shown in Connect
|
2010-06-15 17:04:15 -04:00 |
|
Zach Copley
|
f802542885
|
Reorganized the OAuth app URLs and more work on the register app workflow
|
2010-01-14 02:41:04 +00:00 |
|
Zach Copley
|
5bff6651ba
|
Started work on interface for displaying connected OAuth apps
|
2010-01-14 02:41:04 +00:00 |
|
Zach Copley
|
9d87313eae
|
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
|
2009-09-08 16:02:57 -07:00 |
|
Evan Prodromou
|
df86aa7214
|
define LACONICA and accept LACONICA for backwards compatibility
|
2009-08-26 10:41:36 -04:00 |
|
Evan Prodromou
|
865b716f09
|
change LACONICA to STATUSNET
|
2009-08-25 18:42:34 -04:00 |
|
Evan Prodromou
|
ae883ceb9b
|
change controlyourself.ca to status.net
|
2009-08-25 18:19:04 -04:00 |
|
Evan Prodromou
|
d35b2d3f3c
|
change laconi.ca to status.net
|
2009-08-25 18:16:46 -04:00 |
|
Evan Prodromou
|
c8b8f07af1
|
change Laconica and Control Yourself to StatusNet in PHP files
|
2009-08-25 18:12:20 -04:00 |
|
Zach Copley
|
9b9d80cd97
|
Pluginized Twitter settings stuff
|
2009-08-25 14:52:25 -07:00 |
|
Jeffery To
|
93f585446e
|
Added configuration options to enable/disable SMS and Twitter integration.
This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options.
|
2009-08-07 01:18:17 +08:00 |
|
Evan Prodromou
|
97c98cf59a
|
Break up settings into two tabset
Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
|
2009-01-17 22:30:44 +00:00 |
|