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
Evan Prodromou
1b204fde39
Revert "Return a 404 when a page is request that has no notices"
...
An empty list still exists; we shouldn't return a 404.
This reverts commit c29892c875
.
2009-08-14 13:05:29 -07:00
Jeffery To
75a0a3e18b
Fixed OpenID appearing in primary nav when OpenID is enabled but not OpenID-only
2009-08-15 00:17:00 +08:00
Evan Prodromou
2cf50ea432
whitespace in error.php
2009-08-14 08:04:03 -07:00
Jeffery To
7dc3a90d12
Added a configuration option to disable OpenID.
...
If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.
If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only.
2009-08-13 22:18:06 +08:00
Evan Prodromou
a0f6b4f078
ServerErrorAction always logs
2009-08-12 11:16:57 -07:00
Evan Prodromou
347f74d650
ServerErrorAction always logs
2009-08-12 11:16:31 -07:00
Evan Prodromou
7d33478e86
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
2009-08-12 10:50:46 -07:00
Craig Andrews
853b6d38b3
Define the member variable N
...
N is defined in the DB_DataObject class, which this class kind of extends. So to keep a consistent interface for consumers, we need to have N defined here.
2009-08-12 11:53:46 -04:00
Brett Taylor
3243612e76
Prevents redirect URLs that have canonical URLs longer than 255 chars from being written to the database as their canonical. Redirecting URLs will instead be saved to the database as given.
...
The reason for this is that table 'file' column 'url' is a VARCHAR(255) in MySQL and it silently truncates URLs longer than 255 characters, breaking the url.
The proper fix for this is to improve this column, making its type TEXT, but there are no database changes for 0.8.x, so this is the next best thing for data integrity. A migration script for 0.9.x could be written to audit the database checking for redirects and updating these urls to their proper canonical url.
2009-08-12 16:17:02 +12:00
Craig Andrews
2260cf20f5
Corrected the Infinite Scroll CSS Selectors
...
Thanks dcostalis for making me aware of the issue!
2009-08-11 23:05:46 -04:00
Craig Andrews
c29892c875
Return a 404 when a page is request that has no notices
2009-08-11 22:48:35 -04:00
Craig Andrews
355effe631
Return a 404 when a page is request that has no notices
2009-08-11 22:09:02 -04:00
Craig Andrews
7eda7295e4
oEmbed provider does not use the twitter api library classes any more
2009-08-11 21:15:42 -04:00
Craig Andrews
4f751563c7
Make notice attachment lightbox work after an infinite scroll happens
2009-08-11 16:36:34 -04:00
Evan Prodromou
01dccefccc
reformat newnotice.php
2009-08-11 11:18:24 -04:00
Craig Andrews
091152b6a5
Merge commit 'jeff-themovie/0.8.x-private-returnto' into 0.8.x
2009-08-11 10:42:04 -04:00
Craig Andrews
76d2a71fb0
Merge commit 'jeff-themovie/0.8.x-jcrop-0.9.8' into 0.8.x
2009-08-11 10:41:17 -04:00
Craig Andrews
b93df1ccbc
Merge commit 'jeff-themovie/0.8.x-private-search' into 0.8.x
2009-08-11 10:39:44 -04:00
Evan Prodromou
2d29800b6f
Merge branch 'master' into 0.8.x
...
Conflicts:
lib/mail.php
lib/rssaction.php
lib/twitterapi.php
2009-08-11 10:23:11 -04:00