Commit Graph

603 Commits

Author SHA1 Message Date
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
Evan Prodromou
6be15dfcac Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x 2009-04-02 06:23:50 -04:00
Evan Prodromou
3bec08c878 Merge branch '0.7.x' of git@gitorious.org:laconica/dev
Conflicts:
	README
	lib/router.php
2009-04-01 14:40:58 -04:00
CiaranG
e7381493ad Return redirect code correctly as HTTP status, not a header. Fixes ticket #1371 2009-04-01 18:11:02 +01:00
Evan Prodromou
1fbf9a042e give the correct root url when SSL enabled 2009-03-31 10:09:11 -04:00
Evan Prodromou
e149f3d64b Support SSL for some, all, or no pages
Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others.
2009-03-30 17:12:02 -04:00
Evan Prodromou
7b02d9d2e1 Merge branch 'master' into 0.7.x 2009-03-30 11:11:33 -04:00
Evan Prodromou
d5ac986b80 add titles to group links in notices 2009-03-30 10:26:36 -04:00
Evan Prodromou
3af6680716 add a title to attention notice links 2009-03-30 10:17:10 -04:00
Federico Marani
5e9ff6ae97 Testing JMS message selectors for notice tags-based routing 2009-03-28 17:55:20 +00:00
Evan Prodromou
07eae0ce4d Support SSL for some, all, or no pages
Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others.
2009-03-26 15:03:59 -04:00
Federico Marani
420c361304 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x 2009-03-16 22:43:51 +00:00
Brenda Wallace
18c8a55ba6 use common_database_tablename instead of repeating that if structure everywhere 2009-03-17 10:36:12 +13:00
Evan Prodromou
e185c0395a Revert "trac #201 Add flowplayer to enable multimedia playback capability."
This reverts commit 9c9b6790ce.

This code wasn't ready for release, so I've reverted it for now.

Conflicts:

	lib/action.php
	lib/util.php
2009-03-12 00:13:28 -04:00
Eric Helgeson
c6cd87c106 Changed all $config[][] calls to common_config() 2009-03-09 20:01:35 -05:00
Evan Prodromou
e55808698b use call_user_func for callbacks 2009-03-08 11:49:34 -07:00
CiaranG
2133d5a4e7 PostgreSQL - some more fixes to make queries compatible with both databases. (submitted by oxygene) 2009-03-08 16:16:10 +00:00
Federico Marani
bab3e1b858 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/util.php
2009-03-07 13:54:54 +00:00
Federico Marani
a389f157ba tests with Apache ActiveMQ topics (pubsub) 2009-03-07 13:48:39 +00:00
Evan Prodromou
16a6aa5390 Some fixes for OpenID and OMB URLs 2009-03-06 17:18:21 -08:00
Evan Prodromou
eaac9350dd Merge branch 'ping' of /var/www/mublog.corrupt into corrupt/ping
Conflicts:

	lib/util.php
2009-03-05 14:34:53 -08:00
Evan Prodromou
b9781258bb @-links go to permalinks for local users 2009-03-05 11:03:42 -08:00
Evan Prodromou
f9babf6a7d Check for config file when running
When running the full system, check for a config file, and throw an
error if none is found.
2009-03-04 06:24:33 -08:00
Adrian Lang
120eb77400 Fixes #1258: A period in a hashtag leads to the tag being interpreted as url and hence breaking the tag. 2009-02-27 15:44:06 -08:00
Evan Prodromou
3a999af4d9 Change common_local_url() to take 4 arguments
I changed common_local_url() to take an additional optional argument
-- for query parameters. Being persnickety, I made it the third of
four, and moved the last one ($fragment) down a slot. That required
changing a couple of calls.
2009-02-20 17:30:09 -05:00
Federico Marani
2ac684f53d * implemented STOMP support for external message queueing systems
* (ticket-724)
* included PHP STOMP libraries (http://code.google.com/p/stompcli/)
2009-02-20 18:57:20 +00:00
Evan Prodromou
c8e71d359c error in hashtag link generation 2009-02-16 18:02:04 -05:00
Robin Millette
9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Evan Prodromou
47c5d508b3 remove debugging info from local_url 2009-02-13 10:47:22 -05:00
Zach Copley
4b7ee5455f We have a FacebookQueueHandler now. The update_facebook.php cron
script is totally deprecated.
2009-02-13 05:42:00 +00:00
Zach Copley
47e595b092 Merge branch 'queuehandlers' into 0.7.x 2009-02-12 14:41:27 -08:00
Zach Copley
f8e2ad0677 The fabled twitterqueuehandler 2009-02-12 14:39:21 -08:00
Evan Prodromou
ab8d27b8d1 don't over specialize URLs 2009-02-12 09:22:45 -05:00
Evan Prodromou
eaae456222 Add XMLStringer for building XML strings
We had a bunch of
2009-02-12 08:38:43 -05:00
Evan Prodromou
99773e3b5e wrap multiline regexp in quotes so it doesn't mess up my editor's indenting 2009-02-12 07:58:36 -05:00
Zach Copley
7155cf813d Move/reorg Twitter broadcast code to lib/twitter.php in prep for
making a twitterqueuehandler.
2009-02-11 17:46:53 -08:00
Evan Prodromou
27e23f2dd3 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-11 10:11:26 -05:00
Evan Prodromou
bba1dbdb40 Use a router singleton 2009-02-11 00:45:11 -05:00
Evan Prodromou
fbecbcb693 Build urls using Net_URL_Mapper, too 2009-02-10 22:49:25 -05:00
Sean Murphy
646fdea1bf Fixed 1174: schemeless URL auto-linking bug 2009-02-10 17:42:58 -05:00
Sean Murphy
cf29ef2bc4 Fixed remaining substr_replace with multibyte equivalent. 2009-02-09 19:15:30 -05:00
Sean Murphy
bdd9f6ce1d Merge commit 'upstream/0.7.x' into 0.7.x 2009-02-09 17:29:39 -05:00
Sean Murphy
f6705f06c0 Fixed #1170: Auto-linking bug when URL cotains special chars. 2009-02-09 17:29:27 -05:00
Sarven Capadisli
a64a888609 Using rel="external" instead of class="exlink" 2009-02-07 23:47:37 +00:00
Evan Prodromou
be6ce27538 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
Conflicts:

	lib/util.php
2009-02-06 14:28:17 -05:00
Evan Prodromou
adcbb48362 Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-06 14:27:06 -05:00
Sean Murphy
56d7348ec2 Fixed #1149: URL auto-linking bug when following colon. 2009-02-06 12:18:15 -05:00
Evan Prodromou
343cd6f205 Move common_avatar_* functions to Avatar
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Evan Prodromou
c47bfcef65 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-06 01:06:54 -05:00
Evan Prodromou
de4ed67b7a Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-06 01:05:30 -05:00
Sean Murphy
e08b7f7205 Fix for unicode string auto-linking bug 2009-02-05 17:29:58 -05:00
Robin Millette
9febe8ce39 trac #1142 fix tag rss 2009-02-05 18:10:47 +00:00
Evan Prodromou
7ea136ee1b Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
Conflicts:

	actions/avatarsettings.php
2009-02-05 12:04:06 -05:00
Sean Murphy
4090471ebe Forgot to replace URL shortening regex with new function. 2009-02-04 23:18:45 -05:00
Sean Murphy
8053adc60e Fixed #779 & #588; Better URL auto-linking. 2009-02-04 23:11:40 -05:00
Sean Murphy
0f12d6135e Fixed #732; Hashtags inside parens and brackets. 2009-02-04 20:02:50 -05:00
Meitar Moscovitz
3b6d2653fb Fixes ticket:1087; correctly paginate group members list in fancy URLs. 2009-02-04 04:02:30 +11:00
Evan Prodromou
ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Robin Millette
b6f0f72a09 trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls 2009-02-02 21:08:33 +00:00
Meitar Moscovitz
a381bff4da Link rtsp, mms & tel URI schemes, correct pseudo-protocol ones.
This patch builds on the work of user `candrews` at http://laconi.ca/trac/ticket/529#comment:2
2009-02-02 19:59:48 +11:00
Meitar Moscovitz
44162e07c3 Fix scrolling for groups 2009-01-26 16:16:51 +01:00
Adrian Lang
5b211271f9 Fix pagination on user groups page 2009-01-26 14:19:49 +01:00
Evan Prodromou
0d34cd24ab Update notice deletion
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
2009-01-24 19:38:40 +01:00
Evan Prodromou
32f81b3c0e Initial support for ping service
It makes sense to use the weblogs.com ping service to alert people to
changes on the site. So, we do. Includes an extra ping queue handler.
2009-01-24 18:38:12 +01:00
Evan Prodromou
db4271692a wrong action for groups 2009-01-24 11:26:28 +01:00
Evan Prodromou
4e44b0b8d7 Fix the group url (Closes #971) 2009-01-24 11:24:37 +01:00
Evan Prodromou
e7d5310a2f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:01:06 +01:00
Robin Millette
965d4db265 Group search 2009-01-23 07:50:55 +00:00
Evan Prodromou
50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
Robin Millette
fbd1cf4dfa use new error actions classes to display error 2009-01-23 05:57:08 +00:00
Evan Prodromou
8942e3a445 Add an action to show the list of the latest groups 2009-01-23 03:00:51 +01:00
Evan Prodromou
a2a2dd88b5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 12:35:25 +01:00