eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,294 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

2118 Commits

Author SHA1 Message Date
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 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
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
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
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 
304db1d30b
 2009-08-25 21:48:55 +00:00
Craig Andrews 31329c33ae Handle grouping symbols ()[]{} correctly. Now passing all tests! 2009-08-25 16:41:44 -04:00
Craig Andrews ff836eb38a Add UTF-8 encodings of the IDN TLDs 2009-08-25 14:19:05 -04:00
Craig Andrews 210bc4248b All tests pass except for those that require matching parens or brackets 2009-08-25 14:12:31 -04:00
Craig Andrews 6a3a25b5a2 Improved the URL tests, and improve the matcher so more tests are passed. The remaining failing tests I believe are incorrect. 2009-08-25 11:21:45 -04:00
Evan Prodromou ce442c049b remove some merge cruft from the end of twitter.php 2009-08-24 17:44:19 -04:00
Evan Prodromou ff87732053 Merge branch '0.8.x' into testing 
Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php
 2009-08-24 16:55:49 -04:00
Zach Copley aa4066bac6 Use ssl for fetching frinds_timeline from Twitter since it requires auth and is a protected resource 2009-08-24 11:54:35 -04:00
Zach Copley fd9d653eb3 Make TwitterStatusFetcher daemon work with OAuth 2009-08-24 11:53:43 -04:00
Zach Copley ee006dbb0e Moved some stuff to a base class 2009-08-24 11:53:21 -04:00
Zach Copley 500f0c7072 Make the TwitterQueuehandler post to Twitter using OAuth 2009-08-24 11:52:28 -04:00
Zach Copley e9edaab358 Twitter OAuth server dance working 2009-08-24 11:52:15 -04:00
Evan Prodromou 77f303c2be Merge branch 'master' into testing 
Conflicts:
	lib/rssaction.php
	lib/twitterapi.php
 2009-08-24 11:28:16 -04:00
Craig Andrews 86ba7b13c2 Finally got the IPv6 regex right in the url finder 2009-08-21 22:58:43 -04:00
Craig Andrews 579a41b56f Improve url finding more. Properly end urls when a space is caught. 2009-08-21 21:11:23 -04:00
Craig Andrews 0615fda25e URLs surrounded by (),{}, and [] are correctly handled now! 2009-08-21 20:01:33 -04:00
Evan Prodromou 59beff6b46 Revert "Added configuration option to only allow OpenID logins." 
This reverts commit 14b46e2183.

This functionality will need to be rewritten to work with the new
OpenIDPlugin.

Conflicts:

	index.php
	lib/logingroupnav.php
 2009-08-21 16:45:42 -04:00
Evan Prodromou bacef32aac Revert "Added a configuration option to disable OpenID." 
This reverts commit 7dc3a90d12.

Conflicts:

	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php
 2009-08-21 16:38:39 -04:00
Evan Prodromou 9f356b55c6 Merge branch '0.9.x' into openidplugin 
Conflicts:
	actions/login.php
	actions/register.php
 2009-08-21 16:27:43 -04:00
Evan Prodromou 8236037bf0 Merge branch 'dbconfig' into 0.9.x 
Conflicts:
	lib/common.php
 2009-08-21 16:17:06 -04:00
Evan Prodromou 538dcf2eef load configuration options from database at runtime 2009-08-21 16:14:32 -04:00