2538 Commits

Author SHA1 Message Date
Zach Copley
87ae90c903 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-29 06:20:50 +00:00
Zach Copley
c02e8a4687 Fix error in log msg format specifier 2009-08-29 06:20:19 +00:00
Evan Prodromou
a44c064397 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-28 13:35:48 -07:00
Evan Prodromou
b562ff1f2c change version to 0.8.2dev 2009-08-28 13:35:28 -07:00
Craig Andrews
3368452ebf Add % and ~ as valid characters in the path, querystring, and fragment parts of URLs 2009-08-28 16:18:45 -04:00
Craig Andrews
6e570a8440 Added 2 new events: StartApiRss and StartApiAtom 2009-08-28 14:42:51 -04:00
Evan Prodromou
b4ca06edb2 fix 'callback_helper' 2009-08-28 08:43:28 -07:00
Evan Prodromou
e04e009ddb stutuses -> statuses 2009-08-28 06:13:47 -07:00
Zach Copley
ca30cc2d59 Merge branch 'twitter-basic-auth' into 0.8.x 2009-08-28 07:03:32 +00:00
Zach Copley
36c104fb34 Make SyncTwitterFriends and TwitterStatusFetcher daemons use both HTTP Basic Auth as well as OAuth 2009-08-28 07:02:27 +00:00
Zach Copley
36b6ef8d05 Abstract the Twitter basic auth stuff into its own client class 2009-08-28 06:00:30 +00:00
Zach Copley
51adf00bd8 Renable basic auth posting to Twitter for users who already have a bridge setup 2009-08-28 04:36:47 +00:00
Evan Prodromou
c0d03fc279 make URL analyzer save new info on URLs 2009-08-27 20:23:31 -07:00
Evan Prodromou
34ce75c71d remove duplicate save of Notice and streamline attachment detection 2009-08-27 20:09:07 -07:00
Evan Prodromou
0056b635c6 reformat curry() to make my editor happy 2009-08-27 20:06:03 -07:00
Craig Andrews
6ff00c9404 Implement the is_member and membership group api's 2009-08-27 22:55:32 -04:00
Evan Prodromou
a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
Conflicts:
	classes/laconica.ini
2009-08-27 14:52:32 -07:00
Evan Prodromou
bbb830e14c Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-27 14:18:51 -07:00
Evan Prodromou
5d09b6b3f0 Merge branch '0.8.x' into 0.9.x
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
2009-08-27 11:16:45 -07:00
Evan Prodromou
a84c4e3518 add api/laconica for backwards compatibility 2009-08-27 09:34:32 -07:00
Craig Andrews
2dd5a5f86d Do not used named capturing groups
I'm not sure all php 5.2's are compiled with a PCRE library that supported named captures.
2009-08-27 12:06:45 -04:00
Evan Prodromou
089148d286 update version in, and add codename to, lib/common 2009-08-27 08:02:41 -07:00
Evan Prodromou
f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Craig Andrews
eb667d09d9 allow oEmbed resources to be facebook attachments 2009-08-26 22:09:46 -04:00
Craig Andrews
3e362233ee Merge commit 'laconica/0.8.x' into 0.9.x 2009-08-26 21:56:59 -04:00
Craig Andrews
b7beac36c2 Support multiple attachments per facebook update 2009-08-26 21:54:57 -04:00
Craig Andrews
6d60d74093 Display linked oembed resources as enclosures if they are of non-html mime types 2009-08-26 15:40:51 -04:00
Evan Prodromou
b04bc29c3a change hidden label for site content license link 2009-08-26 10:51:44 -04:00
Evan Prodromou
6d0a26a407 define LACONICA_VERSION for backwards compatibility 2009-08-26 10:43:44 -04:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Zach Copley
937a05fb5d Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-26 14:35:25 +00:00
Evan Prodromou
434abed511 add back in /etc/laconica/* for compatibility 2009-08-26 10:34:50 -04:00
Zach Copley
cbdf8e51aa Facebook app wasn't loading the theme css 2009-08-26 14:34:41 +00:00
Evan Prodromou
379c80e26e add *Laconica* events back in for backwards compatibility 2009-08-26 10:33:04 -04:00
Evan Prodromou
c5cf2c4c94 Merge branch '0.8.x' into testing 2009-08-26 10:27:53 -04:00
Evan Prodromou
fd53fba114 more logging in xmppqueuehandler 2009-08-26 05:50:20 -04:00
Evan Prodromou
e1b5ca85f9 more log output in queue handlers 2009-08-26 05:46:41 -04:00
Evan Prodromou
e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Zach Copley
5efe588174 Moved the rest of the Twitter stuff into the TwitterBridge plugin 2009-08-26 00:59:06 +00:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -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
4737563b95 a distributed -> the distributed 2009-08-25 18:14:12 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Evan Prodromou
d0baab6978 Merge branch '0.8.x' into testing 2009-08-25 18:01:46 -04:00
Craig Andrews
a2117961be Allow ({['" to preceded #tags 2009-08-25 17:54:08 -04:00
Zach Copley
9b9d80cd97 Pluginized Twitter settings stuff 2009-08-25 14:52:25 -07:00
Sarven Capadisli
ada615d3ca Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-25 21:50:38 +00:00
Sarven Capadisli
fc89c345ed userdesign.go.js was incorrectly removed in commit
304db1d30b4ad96f8a2ca500d224bb1609588fed
2009-08-25 21:48:55 +00:00