Tim Almdal f2ed1eeab2 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/rest/controllers/rest.php

2010-03-31 07:14:06 -07:00

..

akismet

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

comment

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

digibug

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

exif

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

forge/libraries

Fix lots of warnings that pop up when we're in E_STRICT mode. They're

2010-01-31 16:07:41 -08:00

g2_import

Move G2_Import_Exception into libraries because it's not a helper class.

2010-03-30 13:18:05 -07:00

gallery

Merge branch 'master' into talmdal_dev

2010-03-31 07:14:06 -07:00

gallery_unit_test

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

image_block

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

info

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

kohana23_compat

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

notification

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

organize

Checkpoint the organize flex source. Not production ready, but worth checkpointing.

2010-03-30 08:08:30 -07:00

recaptcha

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

rest

Merge branch 'master' into talmdal_dev

2010-03-31 07:14:06 -07:00

rss

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

search

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

server_add

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

slideshow

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

tag

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -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

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00

watermark

Update the copyright to 2010. It's only 3 months into the year :-)

2010-03-03 10:15:34 -08:00