Evan Prodromou
721ba6c88f
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-07-01 12:58:49 -04:00
Evan Prodromou
f61645aef8
take out session handler notification
2009-07-01 11:38:10 -04:00
Zach Copley
ccbc5c447d
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
...
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Evan Prodromou
14575fe6fc
better output for common error handler
2009-06-28 19:24:14 -04:00
Evan Prodromou
9f079764aa
extract log-line formatting to its own function
2009-06-28 16:38:27 -04:00
Evan Prodromou
495c85544a
don't canonicalize people's text into URLs
2009-06-28 15:21:15 -04:00
Evan Prodromou
70521d55a8
log IP for API auth errors
2009-06-27 07:37:58 -07:00
Evan Prodromou
7af94dc125
some debugging code for sessions
2009-06-27 07:09:21 -07:00
Evan Prodromou
71dad1ff62
use the session class to store sessions
2009-06-27 06:20:24 -07:00
Evan Prodromou
0ca22cf6e2
a memcached_dataobject class for saving sessions
2009-06-27 05:48:22 -07:00
Evan Prodromou
ce76d61957
marker in sessions
2009-06-27 05:07:14 -07:00
Jeffery To
612a107e09
Merge branch '0.8.x' into small-fixes
2009-06-26 15:44:31 +08:00
Zach Copley
2707622762
Return clippy to his rightful place next to attachments
2009-06-25 12:52:10 -07:00
Evan Prodromou
63f12c48a8
make stomp server work with username and password
2009-06-24 19:17:41 -07:00
Jeffery To
280f8faab4
Merge branch '0.8.x' into small-fixes
...
Conflicts:
lib/peoplesearchresults.php
lib/profilelist.php
2009-06-24 01:25:55 +08:00
Evan Prodromou
a21a9f26c5
append uploads to content rather than showing them double
2009-06-23 07:29:43 -07:00
Evan Prodromou
aec6456c91
Update copyright dates in files modified in 2009
2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155
change Controlez-Vous to Control Yourself
2009-06-20 16:00:04 -07:00
Evan Prodromou
fd290fc3f9
allow a configured base for cache keys
2009-06-15 16:09:40 -07:00
Evan Prodromou
1b6b00a6d0
Link and distribute notices tagged for a group alias
...
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
2009-06-14 23:43:47 -07:00
Jeffery To
e2b20bd1e6
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
2009-06-12 19:58:30 +08:00
Evan Prodromou
5469e46ef5
merge error in util.php
2009-06-10 09:14:48 -07:00
Evan Prodromou
adfb79a9bb
Merge branch '0.7.x' into 0.8.x
...
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00
Evan Prodromou
76ee1fd5da
Removing inbox and memcached daemon handling
2009-05-30 04:40:47 -04:00
Evan Prodromou
3532cd0490
Only enqueue inbox-dependent transports after inboxes have been filled
2009-05-28 18:19:22 -04:00
Robin Millette
ed1e1d9f44
Handles local aliases (redirection) for file uploads attached to notices.
2009-05-27 03:47:45 -04:00
Robin Millette
84edf12791
Display thumbnail on hover over links in notices when appropriate.
2009-05-25 11:13:13 -04:00
Robin Millette
5f3acc2527
Removed big clip and replaced with smaller inline one next to each URL (in a notice) that's actually an attachment. Overlay (popup) on click.
2009-05-24 21:13:42 -04:00
Robin Millette
9261e48ef0
Removed dead code.
2009-05-18 19:23:18 -04:00
Robin Millette
3b7ee5a5f9
rewrote short url stuff to handle new file/url classes (redirections, oembed, mimetypes, etc.)
2009-05-13 14:27:32 -04:00
Robin Millette
d010d811ba
db stuff for URLs: redirections, oembed, etc.
2009-05-11 13:45:00 -04:00
Sarven Capadisli
d30df07908
Merge branch '0.7.x' into 0.8.x
...
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
2009-05-01 00:16:25 +00:00
Evan Prodromou
1c0d82de3b
8-char limit on transports
2009-04-23 10:09:08 +00:00
Evan Prodromou
ece70bf326
incorrect config setting for inboxes
2009-04-23 09:35:10 +00:00
Evan Prodromou
85c7b8df71
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-23 05:24:13 -04:00
Evan Prodromou
aee45ea91d
Add an inbox queue handler
...
Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
2009-04-23 05:08:48 -04:00
Evan Prodromou
640628de2d
A queuehandler for blowing caches offline
...
We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
2009-04-23 05:03:19 -04:00
CiaranG
ec5e06a542
Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310
2009-04-21 23:36:15 +01:00
Adrian Lang
558fa2743e
Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.
2009-04-20 12:15:12 +02:00
Tobias Diekershoff
7196410bb0
shortening links in notices from XMPP
...
This patch enables shortening of links, that where send from XMPP.
The problem was, that in util.php common_current_user() is not
finding the user account from which is posted, so the service to
shorten is not known, so no shortening at all...
This patch cleans up the xmppdaemon a little bit and hard codes ur1.ca
as shortening service _if_ the user is not set. Ugly but working.
2009-04-18 19:00:20 +02:00
Robin Millette
e5094c3359
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
2009-04-17 17:04:05 +00:00
Robin Millette
21873b806d
cosmetic fixes.
2009-04-17 16:46:49 +00:00
Sarven Capadisli
3b9f235e42
Trimming the accept header parts for better content type comparison.
...
e.g., ' text/xml' != 'text/xml'
2009-04-10 17:40:45 +00:00
Sarven Capadisli
dcee7f2f62
Merge branch '0.7.x' into 0.8.x
2009-04-08 22:58:21 +00:00
CiaranG
85873b1f2b
Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master
2009-04-08 22:11:58 +01:00
Sarven Capadisli
e21844c7e4
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-04-03 21:48:23 +00:00
Zach Copley
590cc0c9a4
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
2009-04-03 13:24:01 -07:00
Zach Copley
ab2946047c
Only kill control and surrogates, leave UTF-8 formatting chars alone.
2009-04-03 13:19:33 -07:00
Evan Prodromou
68ae282198
Merge branch '0.7.x' into 0.8.x
2009-04-03 15:36:16 -04:00
Evan Prodromou
e2898db087
add finishaddopenid to list of sensitive pages to use with ssl
2009-04-03 12:51:43 -04:00