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
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
b2664e1ae2
Merge branch '0.8.x' into 0.9.x
...
Conflicts:
actions/updateprofile.php
actions/userauthorization.php
classes/User_group.php
index.php
install.php
lib/accountsettingsaction.php
lib/logingroupnav.php
2009-08-21 15:42:11 -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
Evan Prodromou
888ed474a1
new class for configuration settings
2009-08-21 15:22:02 -04:00
Evan Prodromou
c944edfb50
Add table for configuration settings
...
Add a table for configuration settings.
2009-08-21 15:10:01 -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
Evan Prodromou
c78772b274
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
...
Conflicts:
actions/postnotice.php
2009-08-21 08:29:51 -04:00
Evan Prodromou
cb2184ed44
api update correctly checks max length of notices
2009-08-21 08:27:21 -04:00
Evan Prodromou
d1cc159a04
facebook action correctly checks max notice length
2009-08-21 08:23:52 -04:00
Evan Prodromou
1285c11d0a
maildaemon correctly checks max notice length
2009-08-21 08:21:55 -04:00
Evan Prodromou
a94a5fb51a
correctly check for max notice length in xmppdaemon
2009-08-21 08:19:09 -04:00
Evan Prodromou
35bf388204
url-shortening check correctly checks max notice length
2009-08-21 08:16:08 -04:00