Tim Almdal 612bc3f091 Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev ...

Conflicts:
	modules/gallery/helpers/block_manager.php
	modules/gallery/libraries/Theme_View.php
	modules/image_block/helpers/image_block_block.php
	modules/image_block/helpers/image_block_theme.php
	modules/info/helpers/info_block.php
	modules/info/helpers/info_installer.php

2009-09-30 07:48:19 -07:00

..

akismet

Change the module installer so that you don't need to provide your own

2009-09-05 13:39:30 -07:00

comment

Merge branch 'master' into talmdal_dev

2009-09-30 07:37:14 -07:00

digibug

Rename mark_safe() to mark_clean()

2009-08-31 00:42:18 -07:00

exif

Replaced gButtonLink with g-button.

2009-09-30 08:04:49 -06:00

forge/libraries

XSS escape in form helper and forge where missing.

2009-09-01 01:17:39 -07:00

g2_import

Replaced gButtonLink with g-button.

2009-09-30 08:04:49 -06:00

gallery

Merge branch 'master' into talmdal_dev

2009-09-30 07:37:14 -07:00

gallery_unit_test

Run 'graphics::choose_default_toolkit();' to pick a toolkit, which we

2009-09-02 11:53:10 -07:00

image_block

Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev

2009-09-30 07:48:19 -07:00

info

Merge branch 'talmdal_dev' of git@github.com:gallery/gallery3 into talmdal_dev

2009-09-30 07:48:19 -07:00

notification

Convert a couple of instances of Item_Model::url(array(), true) to Item_Model::abs_url()

2009-09-10 21:33:04 -07:00

organize

Replaced gButtonLink with g-button.

2009-09-30 08:04:49 -06:00

recaptcha

Change the module installer so that you don't need to provide your own

2009-09-05 13:39:30 -07:00

rss

Use the block_manager to manage site sidebar panels. Fixes ticket #110.

2009-09-30 07:31:12 -07:00

search

Remove the update code introduced with 9d7d79. In addition, captialize MyISAM correctly.

2009-09-17 12:38:59 -07:00

server_add

Change the fix for ticket #775 to always add the Add menu, but not add any items if the album directory is not writable.

2009-09-19 09:34:27 -07:00

slideshow

Change the module installer so that you don't need to provide your own

2009-09-05 13:39:30 -07:00

tag

Merge branch 'master' into talmdal_dev

2009-09-30 07:37:14 -07:00

unit_test

Update Kohana to r4374

2009-05-29 12:00:49 -07:00

user

Merge branch 'master' into talmdal_dev

2009-09-30 07:37:14 -07:00

watermark

Replaced gButtonLink with g-button.

2009-09-30 08:04:49 -06:00