5685 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	6c3149334c	Merge commit 'mainline-write/0.8.x' into 0.8.x	2009-08-26 10:02:07 +12:00
Evan Prodromou	d0baab6978	Merge branch '0.8.x' into testing	2009-08-25 18:01:46 -04:00
Brenda Wallace	3400f6f431	renamed to plural, for consitency	2009-08-26 10:00:29 +12:00
Evan Prodromou	077955cb1d	merge problem with scripts/twitterstatusfetcher	2009-08-25 17:58:44 -04:00
Evan Prodromou	c87e1de017	Rename Laconica to StatusNet	2009-08-25 17:56:10 -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	8cd474e985	Correct the hash tag test	2009-08-25 16:06:04 -04:00
Zach Copley	ec83890bc2	Take token field out of foreign_link ... This undoes patch a49272d448	2009-08-25 15:48:06 -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
Brenda Wallace	9ec3911020	Merge commit 'mainline/0.8.x' into 0.8.x	2009-08-25 19:01:29 +12:00
Brenda Wallace	3ff67b3bc1	beginning of hashtag tests	2009-08-25 18:44:32 +12:00
Craig Andrews	9fd3a41576	ftps protocol should be handled the same way as ftp ... Canon urls that have a protocol followed by a host (and no path) automatcally get a trailing slash by the canon function - make the unit test match that	2009-08-24 20:44:06 -04:00
Evan Prodromou	ab2f6fb860	Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x	2009-08-24 17:49:31 -04:00
Evan Prodromou	add42759c9	change class to rel in unit tests for URL check	2009-08-24 17:48:24 -04:00
Evan Prodromou	ce442c049b	remove some merge cruft from the end of twitter.php	2009-08-24 17:44:19 -04:00
Brenda Wallace	eceffc4c01	ignore the local folder	2009-08-25 09:23:09 +12:00
Brenda Wallace	008a4898c8	moved template folder into it's own method, so can be overridden	2009-08-25 09:18:59 +12:00
Brenda Wallace	6bae2ad03a	fix up tpl/index.php so doesn't throw errors on hosts with php shorttags on	2009-08-25 09:14:43 +12: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
Evan Prodromou	f3cdc7f272	Add unit test directory and first test	2009-08-24 15:46:12 -04:00
Evan Prodromou	27aeba01dd	Better (hopefully) database connection management for child processes ... Conflicts: scripts/twitterstatusfetcher.php	2009-08-24 11:55:46 -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	590f21c6a9	Allow removal of Twitter account. Deleted dead code.	2009-08-24 11:53:09 -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
Zach Copley	5d5b9f7022	Add new Foreign_link col to store OAuth access token	2009-08-24 11:52:06 -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
Evan Prodromou	657ffa7dee	Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x	2009-08-24 11:23:30 -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	209486d3be	add OpenID doc menu item and doc page	2009-08-21 17:01:48 -04:00
Evan Prodromou	fbe99bbd18	remove openid menu item from help menu	2009-08-21 17:01:18 -04:00
Evan Prodromou	c9f9b011c8	use array for events	2009-08-21 16:58:02 -04:00
Evan Prodromou	9aa39c7573	add hooks to allow loading custom help documentation	2009-08-21 16:54:35 -04:00
Evan Prodromou	8e21e37d70	move openid docs to OpenID plugin dir	2009-08-21 16:46:47 -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	a645d0468b	Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x	2009-08-21 16:17:45 -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
Craig Andrews	a809c200a6	Merge commit 'brion/searchfix' into 0.9.x	2009-08-21 16:05:40 -04:00