Commit Graph

5264 Commits

Author SHA1 Message Date
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
Brion Vibber
8246977ef0 kill stupid Finder metadata file that made it into my checkin presumably due to 'git add php-gettext' deciding to find all hidden files in the directory for me :P 2009-08-21 16:02:07 -04:00
Brion Vibber
8bca90b8d2 Tweak to php-gettext stream reader; initialize local variable before appending data to it to avoid triggering an E_NOTICE message. 2009-08-21 16:01:59 -04:00
Brion Vibber
5c21a371d6 Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present.
This provides a pure PHP implementation of the gettext functions.

This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.

Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
2009-08-21 16:01:51 -04:00
Craig Andrews
871903a319 Linkifier support many more urls, and less mismatches 2009-08-21 15:56:15 -04:00
Evan Prodromou
9f07921b45 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-21 15:30:03 -04:00
Evan Prodromou
041d2d82d3 We don't need to re-distribute jquery-autocomplete demo 2009-08-21 15:29:28 -04:00
Craig Andrews
70ca03f336 Use currying to call the url callbacks, and use preg_replace_callback
This definitely looks neater than the string maniplation it replaces
2009-08-21 12:47:01 -04:00
Eric Helgeson
a8d3545182 var empty check did not function as expected.
made script executable
2009-08-20 14:25:50 -05:00
mEDI
0535b43944 add $config['attachments']['path'] to the config.php.sample 2009-08-20 13:24:46 -04:00
Marcel van der Boom
418a5a95ab Change the notice type defines all into class constants and adapt all files. 2009-08-20 13:11:22 -04:00
Craig Andrews
0d06055f40 Merge commit 'cvollick/resolveAliases' into 0.8.x 2009-08-20 13:08:10 -04:00
Francois Marier
986d95b31e Fix the default value of ['server']['path'] when running from command line scripts
The logic in _sn_to_path() doesn't make sense when not running via a remote server.

Default to the empty string if running from the command line and ['server']['path']
is not set manually in config.php
2009-08-20 17:46:26 +12:00
Christopher Vollick
b4c3453923 Resolve Group Aliases in showgroup.php
For Example, let's say 'alias' was an alias for the group 'group'.
Previously, if you went to '/group/group' it'd work, but '/group/alias' it'd say "No Such Group".
This was untrue.

Now it checks aliases when it can't find a group with a given name.
If it finds one it redirects you to the original group.
2009-08-19 09:37:27 -04:00
Zach Copley
d647483a27 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline:
  Removed all the redundant logic in common_replace_urls_callback
2009-08-18 18:00:48 -07:00
Zach Copley
d332603c2e Updated Twitter bridge section 2009-08-18 18:00:17 -07:00
Craig Andrews
f4e4a8dd8a Removed all the redundant logic in common_replace_urls_callback
Modified the regex so that strings such as /usr/share/perl5/HTML/Mason/ApacheHandler.pm as not turned into links
2009-08-18 20:42:06 -04:00
Zach Copley
8507017c24 Better logging 2009-08-18 23:46:24 +00:00
Zach Copley
c049931dc7 Return null if all columns in the compound primary key aren't specified 2009-08-18 23:46:08 +00:00
Zach Copley
486167ad8e Kick user out if she doesn't have FB cookies 2009-08-18 22:18:01 +00:00
Craig Andrews
ce004083d9 IPv4 and IPv6 addresses are picked up in URLs
Added ".onion" as a possible TLD
2009-08-18 14:15:55 -04:00
brion
84227dd4e1 Use spinner icon while performing AJAX submissions of favorite/unfavorite button so there's some visual feedback that something's happening. 2009-08-16 20:01:56 -04:00
Craig Andrews
136a69a387 Merge commit 'jeff-themovie/0.8.x-openid-enabled' into 0.8.x 2009-08-16 19:50:37 -04:00
brion
46c77b83b1 Fix bug bug 1563 "opensearch content type incorrectly set"
http://laconi.ca/trac/ticket/1563

OpenSearch description info is now sent with correct Content-Type: application/opensearchdescription+xml instead of text/html.
2009-08-16 19:46:44 -04:00
Evan Prodromou
b936a5166d Revert "Revert "Return a 404 when a page is request that has no notices""
This reverts commit 1b204fde39.
2009-08-16 10:37:15 -04:00
Evan Prodromou
e0815de960 Revert "Revert "Return a 404 when a page is request that has no notices""
This reverts commit 6c597eabec.
2009-08-16 10:37:04 -04:00
Evan Prodromou
6c597eabec Revert "Return a 404 when a page is request that has no notices"
An empty list still exists; we should not return a 404 for empty lists.

This reverts commit 355effe631.
2009-08-14 13:05:57 -07:00