Zach Copley
ba2bffa76e
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 16:37:15 -07:00
Siebrand Mazeland
6d237abe44
Localisation updates from http://translatewiki.net
2010-06-17 00:28:05 +02:00
Zach Copley
d3d499879c
- More useful group info from api/statusnet/group/show
...
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07: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
Luke Fitzgerald
6dd221957e
Add comma to end of list and small cosmetic change
2010-06-16 20:58:27 +01:00
Brion Vibber
9684cbe3c6
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidserver.php
2010-06-16 12:38:35 -07:00
Brion Vibber
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
Luke Fitzgerald
d69aa725f7
Remove callback method as we're not using status changes
2010-06-16 20:35:46 +01:00
Brion Vibber
ce7176d987
Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 12:30:37 -07:00
Luke Fitzgerald
6dbf0ab1fe
Add callback for status changes
2010-06-16 18:05:29 +01:00
Luke Fitzgerald
b313bc3cde
Remove any existing switchboard sessions when we (re)signon
2010-06-16 17:12:20 +01:00
Luke Fitzgerald
50610c2611
Added some more error handling and commenting
2010-06-16 14:15:08 +01:00
Luke Fitzgerald
a665739283
Added error reporting to SB socket writes and call endSBSession if socket is dead when we try to send a message
2010-06-16 02:31:51 +01:00
Luke Fitzgerald
6f388a8b50
Use correct array index access for switchBoardSessions in sendMessageToSBSession
2010-06-16 02:28:13 +01:00
Luke Fitzgerald
7b998f4b2a
Reduced if statements used in sendOtherNetworkMessage
2010-06-16 02:25:09 +01:00
Luke Fitzgerald
47bc0ae4c4
Implemented error checking in sendOtherNetworkMessage
2010-06-16 02:23:19 +01:00
Luke Fitzgerald
242e8905cd
Fix indentation
2010-06-16 02:16:29 +01:00
Luke Fitzgerald
3d36f24b49
Return true if OIM is sent successfully
2010-06-16 02:11:39 +01:00
Luke Fitzgerald
392ea6fd32
Correctly access length constants
2010-06-16 02:03:31 +01:00
Luke Fitzgerald
0b2bbd20aa
Added Phergie PHP IRC library
2010-06-16 01:55:39 +01:00
Luke Fitzgerald
62a7f10275
$killsession parameter not needed - we'll kill the session later anyway
2010-06-16 01:43:55 +01:00
Luke Fitzgerald
956b24f05d
Access constants and static methods properly ;)
2010-06-16 01:30:44 +01:00
Luke Fitzgerald
d52f6d5aea
Removed unnecessary else statement
2010-06-16 01:24:28 +01:00
Luke Fitzgerald
2d883eed89
Reordered methods and changed properties to constants as needed
2010-06-16 01:22:52 +01:00
Luke Fitzgerald
d41298950b
Added validate regexp and a few more comments
2010-06-16 00:04:59 +01: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
Luke Fitzgerald
27e8cfd360
Adaptation of library almost complete.
...
Bot now signs in correctly when launched using startdaemons.sh
2010-06-15 20:51:04 +01:00
Evan Prodromou
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
Luke Fitzgerald
0a4738a806
Lots more work on adapting library. Added more commenting and fixed some stuff on the integration side.
2010-06-14 19:53:43 +01:00
Brion Vibber
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
Luke Fitzgerald
2ef01c5b74
Removed Run method as all code has been moved into new methods
2010-06-14 04:54:03 +01:00
Luke Fitzgerald
d1c9908282
Added better error handling to signon method
2010-06-14 04:26:41 +01:00
Luke Fitzgerald
3d6bb5a597
More work on adapting phpmsnclass
2010-06-14 03:47:44 +01:00
Evan Prodromou
bfbebe5977
admin panel for setting site-claim metadata
2010-06-13 15:23:23 -04:00
Evan Prodromou
4b750b75da
show site claim keys on top page
2010-06-13 14:58:06 -04:00
Luke Fitzgerald
f3c1e9da9a
Added some more event handlers and corrected aADL scope
2010-06-13 04:14:29 +01:00
Luke Fitzgerald
0083e58db3
- Corrected PhotoSticker bug in phpmsnclass
...
- Update time till next ping when a command is sent
2010-06-13 03:42:21 +01:00
Luke Fitzgerald
dc66503f33
Added callback for pong (to update time till next ping required)
2010-06-13 01:54:09 +01:00
Luke Fitzgerald
4007bce9aa
Added in missing properties
2010-06-12 21:21:09 +01:00
Luke Fitzgerald
52cfc0866c
Merged in changes to phpmsnclass
2010-06-12 21:19:08 +01:00
Luke Fitzgerald
89808a86d5
More work on adapting the phpmsnclass to work with the IM architecture (far from finished still)
2010-06-12 19:49:28 +01:00
Luke Fitzgerald
d97b598214
Removed phpmsnclass sample
2010-06-12 17:34:25 +01:00
Luke Fitzgerald
0264f66d76
Initial commit of msn-plugin work
2010-06-12 17:30:11 +01:00
Brion Vibber
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07:00
Brion Vibber
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
Brion Vibber
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
Brion Vibber
ec15546476
Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json').
...
Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11 11:52:06 -07:00
Siebrand Mazeland
e81f17e911
Localisation updates from http://translatewiki.net
2010-06-11 00:55:14 +02:00
Brion Vibber
b1a68e15b7
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
