Commit Graph

3434 Commits

Author SHA1 Message Date
Federico Marani 4b3f022fc2 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/jabber.php
2009-03-28 13:52:01 +00:00
Evan Prodromou 8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Evan Prodromou 14afe2d268 show subscribe button and block form again 2009-03-23 15:44:17 -04:00
Evan Prodromou 3070a9597c Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-22 17:06:19 -04:00
Evan Prodromou 3ef4f251ac One function for producing Atom entry for a Notice
Took the various places that we create an atom entry for a notice, and
jammed them together into one function of the notice class, and then
used that function. Also, added Atom threading extension and
categories for hashtags.
2009-03-22 16:58:38 -04:00
Sarven Capadisli fadae96a74 Password recover and change form markup updated. 2009-03-22 20:21:32 +00:00
Evan Prodromou e947d9fdd1 variable name error 2009-03-22 15:23:40 -04:00
Evan Prodromou 92da8a59cb add Mobidentica 2009-03-22 10:51:00 -04:00
CiaranG d64be5108d Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 2009-03-21 14:24:19 +00:00
CiaranG c4072ef7c9 RSS 1.0 actions were reading the stream from the database twice. Inefficient, but more importantly made notice search RSS fail with a DB error due to double search on a DB_DataObject instance 2009-03-21 14:18:38 +00:00
CiaranG 8ba43f18cd Changes to router setup to make notice search RSS feed work 2009-03-21 14:16:54 +00:00
CiaranG a9a71297f4 Use correct page information for notice search. See ticket #1333 2009-03-20 22:02:35 +00:00
CiaranG b4c273113c A couple more 'Join Now' messages that need disabling when the site is closed or invite only 2009-03-19 21:55:03 +00:00
CiaranG 94271293ce Remove 'Register' from login group nav when site is closed or inviteonly. See ticket #1335 2009-03-19 21:07:31 +00:00
CiaranG 0e1186dfd0 Get rid of 'Join now...' message if site is closed or invite only. See ticket #1335 2009-03-19 18:08:49 +00:00
Evan Prodromou 3d8a8aa03c redirect to original URL or URI for remote notices 2009-03-19 11:36:24 -04:00
Evan Prodromou 739bb522fd Merge branch 'master' into 0.7.x 2009-03-19 11:03:07 -04:00
Evan Prodromou d1b2a9d708 Somewhat better behaviour with mixed caps in search
Deal somewhat better with mixed caps in people and notice search.
2009-03-19 11:01:58 -04:00
Evan Prodromou 5dc913f589 ping handler returns proper boolean response
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
2009-03-19 09:39:19 -04:00
Evan Prodromou e7c57b4307 ping handler returns proper boolean response
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
2009-03-19 09:21:50 -04:00
Evan Prodromou 0e93b638b5 fix bug in profile list owner check 2009-03-18 16:35:03 -04:00
Evan Prodromou f1041a3b4e fix bug in profile list owner check 2009-03-18 16:34:41 -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
Meitar Moscovitz 91b0fb8028 Add `apple-touch-icon.png` support; favicons for the iPhone OS. 2009-03-16 18:04:27 -04:00
Meitar Moscovitz 85d61475aa Output code to explicitly reference favicons.
This makes favicons work when Laconica is not installed at a web
server's DOCUMENT_ROOT. I've also added the capability to override the
Laconica default favicon.ico file with a theme-specific one simply by
dropping a themed favicon.ico in the appropriate theme directory.
2009-03-16 17:42:24 -04:00
Evan Prodromou 227514d525 Merge branch 'master' into 0.7.x 2009-03-14 23:26:20 -04:00
Evan Prodromou 3eff673a0f Add Adium to notice sources 2009-03-14 23:25:43 -04:00
Adrian Lang 221c61a499 Fix typo in the the newmessage route. 2009-03-14 02:37:53 -04:00
Adrian Lang 40073120b9 Fix typo in the the newmessage route. 2009-03-13 22:06:02 +01:00
Evan Prodromou aa909fad0a Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-13 08:56:04 -04:00
Tobias Diekershoff 0d880d0d14 Piwik analytics plugin
Piwik (http://piwik.org/) is an Open Source analytics engine. This
plugin lets you include Piwik in your Laconica installation.
2009-03-13 08:52:01 -04:00
CiaranG 78519c43b9 Fixed an error in the README - path setting for installed in root is '', not '/' 2009-03-12 17:58:20 +00:00
Evan Prodromou 0b436ec997 update version number to 0.7.2.1 2009-03-12 12:45:03 -04:00
Evan Prodromou 75f2095a00 update q-factors for new translations 2009-03-12 12:39:57 -04:00
root 6d7c106a23 Update from Pootle on 12 Mar 2009
Automated update from Pootle on 12 Mar 2009
2009-03-12 16:28:27 +00:00
Evan Prodromou b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04: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
Evan Prodromou 93030ae7b6 add missing PEAR_Exception file 2009-03-12 00:02:25 -04:00
Evan Prodromou 745cdd206c fixup config errors 2009-03-11 23:43:03 -04:00
Evan Prodromou 4a41dbcdc4 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-11 22:43:55 -04:00
Evan Prodromou 254e5e5020 Update README and version number
Update the README and the version number for this release.
2009-03-11 22:28:42 -04:00
CiaranG 2fa6d42977 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-11 23:47:06 +00:00
CiaranG c08e4d904e PostgreSQL - a few more query compatibility issues (submitted by oxygene) 2009-03-11 23:46:23 +00:00
Evan Prodromou dfd9e31859 Add initial trackback support 2009-03-11 19:42:53 -04:00
Evan Prodromou 70d5fc4684 Document the site-logo configuration option
The configuration option for site logo wasn't well documented, so I
added it to the README file, config.php.sample, and common.php.
2009-03-11 16:21:10 -04:00
CiaranG e6a3e6d451 Updated update_pot.sh to point to renamed file and generated new laconica.po with all the latest translatable text included 2009-03-11 16:37:03 +00:00
Adrian Lang 2cbb67c21e Define undefined variable. 2009-03-11 10:40:24 +01:00
Adrian Lang 048bc77077 Add nullcheck for foreign profile. 2009-03-11 10:40:14 +01:00
Adrian Lang c0f44ca44d Check if that $_SERVER param is set before accessing. 2009-03-11 10:39:43 +01:00
Adrian Lang c0db74dcfb Another undefined object member. 2009-03-11 10:39:06 +01:00