Luke Fitzgerald
4b12b8f396
Cosmetic comment change
2010-08-07 13:28:11 -07:00
Luke Fitzgerald
bee5084072
Merge remote branch 'statusnet/1.0.x' into irc-plugin
2010-08-07 13:25:56 -07:00
Luke Fitzgerald
e23ad0bdb3
Commands can now be whitelisted to allow response to the channel
2010-08-07 13:25:05 -07:00
Eric Helgeson
edb62db613
Locale error message, clean up {}, Verified under 1.0.x && php 5.3
2010-08-06 23:07:34 -05:00
Eric Helgeson
422a6ef518
Fixed PHP 5.3 by & value
...
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Luke Fitzgerald
a6e865c47a
Use nick length instead
2010-08-05 11:12:36 -07:00
Luke Fitzgerald
1f3dbe1198
Bot responds to channel commands via PM
2010-08-05 10:48:41 -07:00
Luke Fitzgerald
cb34d95197
Merge in Phergie changes
2010-08-04 16:02:24 -07:00
Luke Fitzgerald
65a741cce2
Messages with new lines split at plugin stage for reliability
2010-08-04 09:10:57 -07:00
Luke Fitzgerald
2250273942
Only attempt callback if non-null
2010-08-04 08:46:04 -07:00
Luke Fitzgerald
4cfe04a68f
Remove old debugging code
2010-08-03 20:07:59 -07:00
Evan Prodromou
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
Evan Prodromou
2ba36fc242
Merge branch 'activityhooks' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc
Merge branch 'testing' into 0.9.x
2010-08-03 15:57:05 -07:00
Evan Prodromou
f83171824f
correctly show <source> for atom feeds
2010-08-03 15:50:21 -07:00
Luke Fitzgerald
678911af24
Revert "Merged in Phergie changes"
...
This reverts commit a3df3b6367
2010-08-03 11:45:55 -07:00
Luke Fitzgerald
c71319419b
Cosmetic whitespace change
2010-08-03 10:02:47 -07:00
Luke Fitzgerald
a3df3b6367
Merged in Phergie changes
2010-08-03 09:42:02 -07:00
James Walker
5fa19a0384
Merge branch '2429' into 0.9.x
2010-08-02 16:45:23 -04:00
James Walker
8120842780
Fix for #2429 - move OStatus XML writing to XMLStringer
2010-08-02 16:42:28 -04:00
Brion Vibber
c56939d596
Remove the 'Enable Twitter import' checkbox from Twitter admin panel by default; can be re-added with setting:
...
addPlugin('TwitterBridge', array('adminImportControl' => true, ....));
Added a note on the label that it requires manual daemon setup. (Note that by default the admin panel won't be shown, so it's no biggie to be hiding this for now.)
2010-08-02 13:00:50 -07:00
James Walker
56294016a7
fix #2478 - ensure all XRD documents get proper content-type headers
2010-08-02 14:47:13 -04:00
James Walker
517c7483d1
move to rel="salmon" (per latest spec)
2010-08-02 13:24:38 -04:00
Brion Vibber
84726791d3
Fix for ticket #2286 : [mobile] Text extends beyond border of repeat confirmation dialog floater box on iPhone
...
http://status.net/open-source/issues/2286
This bit of CSS was constricting the vertical size of the popup form for repeats:
.notice-options form {
width:16px;
height:16px;
}
I can only assume this was originally meant to constrain the mini inline AJAX forms to the size of the clickable buttons, but it doesn't make a difference to how those are displayed on iPhone, Android, or Opera Mini.
Removing the statement lets the popup form go to its natural size, covering the button.
2010-07-30 14:12:37 -07:00
Evan Prodromou
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
Evan Prodromou
659e8b26ac
add admin panel for Adsense
2010-07-28 17:50:36 -04:00
Luke Fitzgerald
9b9a36e492
Introduce error checking when calling handleEvents
2010-07-28 11:56:15 -07:00
Luke Fitzgerald
2fe1b12804
Merge in Phergie changes
2010-07-28 10:42:01 -07:00
Luke Fitzgerald
dd882be803
Merge in Phergie fixes and remove some whitespace
2010-07-27 09:14:07 -07:00
Luke Fitzgerald
3c1d7d81cf
Remove some testing/debugging code
2010-07-26 12:25:23 -07:00
Luke Fitzgerald
742b302739
More Irc plugin work
2010-07-26 11:13:00 -07:00
Luke Fitzgerald
950685a466
Merged in Phergie changes
2010-07-25 16:04:12 -07:00
Luke Fitzgerald
2645133c43
Use non-statusnet class
2010-07-24 20:04:00 -07:00
Luke Fitzgerald
3b9d720df5
Change ircmanager to not use unnecessary class
2010-07-24 20:03:16 -07:00
Luke Fitzgerald
c0214ac0a4
Merged in Phergie change (Allow sec/usec = 0)
2010-07-24 11:26:20 -07:00
Luke Fitzgerald
007d9ec8ce
Updated commenting
2010-07-24 10:01:37 -07:00
Luke Fitzgerald
9f0eea69ff
Handle the case where confirmation is cancelled
2010-07-24 07:54:09 -07:00
Luke Fitzgerald
be0fb03560
Cosmetic: Rearrange code
2010-07-23 14:13:37 -07:00
Luke Fitzgerald
4dcf2a1f51
Another comment
2010-07-23 13:57:39 -07:00
Luke Fitzgerald
13c63d554d
Added some missing comments
2010-07-23 13:40:11 -07:00
Luke Fitzgerald
f1f78b3142
Remove Phergie diff file
2010-07-23 13:34:39 -07:00
Luke Fitzgerald
c4640c50d3
Lots more work - Implemented nickname checking
2010-07-23 13:33:41 -07:00
Luke Fitzgerald
f818182a37
Update classname in ircmanager too!
2010-07-21 07:39:28 -07:00
Luke Fitzgerald
3cb51e182b
Rename Phergie_Plugin_Statusnet_Callback to Phergie_Plugin_StatusnetCallback
2010-07-21 07:39:19 -07:00
Luke Fitzgerald
2e9da023c0
Rename Phergie_ExtendedBot to Phergie_StatusnetBot
2010-07-21 07:33:43 -07:00
Luke Fitzgerald
af5ecb88b1
Corrected UTF8 to UTF-8
2010-07-21 05:21:37 -07:00
Luke Fitzgerald
a34e55e1a3
Change default encoding to UTF-8
2010-07-20 11:32:09 -07:00
Luke Fitzgerald
efdf9b6d4e
Code now functional - lots of error checking and extras missing still though
2010-07-20 11:16:59 -07:00
Luke Fitzgerald
1e5198645c
Weaken send scope to protected
2010-07-20 06:26:51 -07:00
Luke Fitzgerald
2550971450
ircmanager.php almost complete - Need to add exception catching
2010-07-18 12:45:28 -07:00
