Tim Almdal 3060a6f662 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

2009-12-26 11:24:50 -08:00

..

akismet

Updated for K24

2009-12-21 11:30:34 -08:00

comment

Add missing execute() call -- tests ftw!

2009-12-21 15:58:22 -08:00

digibug

Convert a bunch of leftover kohana::show_404 calls to throw

2009-12-23 20:51:33 -08:00

exif

Update database query.

2009-12-06 21:34:48 -08:00

forge/libraries

Updated for K2.4. This is a fork from the main-line, but we're going to replace this with Formio anyway.

2009-12-06 21:34:35 -08:00

g2_import

Don't treat objects like strings.

2009-12-24 03:08:06 -08:00

gallery

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

gallery_unit_test

Fix some function definitions (they should be static)

2009-12-22 15:41:47 -08:00

image_block

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

info

Revert "Simplify the maintenance of the xss golden file by having each module contibute its own golden file to a consolidated one. This will make it easier for -contrib modules or themes to be included in the xss security test w/o having to keep modifying a central golden file."

2009-11-18 10:54:01 -08:00

kohana23_compat

Convert tabs to spaces. Enough to get the file structure test to

2009-12-22 15:36:36 -08:00

notification

Update database queries.

2009-12-06 21:38:09 -08:00

organize

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

recaptcha

Revert "Simplify the maintenance of the xss golden file by having each module contibute its own golden file to a consolidated one. This will make it easier for -contrib modules or themes to be included in the xss security test w/o having to keep modifying a central golden file."

2009-11-18 10:54:01 -08:00

rest

When normalizing the rest request don't assume that the additional arguments are acutall a path. Leave it up to the handler to determine.

2009-12-23 13:13:03 -08:00

rss

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

search

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

server_add

Fix uses of count_records() and use ORM to count instead.

2009-12-25 12:39:09 -08:00

slideshow

Fix the arguments to Item_Model::descendants_count()

2009-11-26 19:25:09 -08:00

tag

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

unit_test

Fix the translation keys to not require "unit_test." as a prefix.

2009-12-21 12:07:20 -08:00

user

Convert a bunch of leftover kohana::show_404 calls to throw

2009-12-23 20:51:33 -08:00

watermark

Revert "Simplify the maintenance of the xss golden file by having each module contibute its own golden file to a consolidated one. This will make it easier for -contrib modules or themes to be included in the xss security test w/o having to keep modifying a central golden file."

2009-11-18 10:54:01 -08:00