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

Conflicts:
	modules/rest/controllers/rest.php

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

..

config

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

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

controllers

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

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

css

Add more padding to the top of the add-photos-canvas to avoid overlap with selected photos.

2010-03-16 23:10:15 -06:00

helpers

Changes to the example client to test updating the members of an album.

2010-03-13 23:12:40 -08:00

hooks

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

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

images

Swap Jakob's placeholder in for mine.

2009-06-16 19:50:26 -07:00

js

Additional fixes for plural handling when deleting translations / marking them as untranslated.

2010-02-27 20:06:37 -08:00

libraries

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

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

models

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

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

tests

Checkpoint

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

views

Apply ui-helper-clearfix to the breadcrumb in the upload dialog to ensure it clears the upload canvas in webkit-based browsers.

2010-02-28 22:09:40 -07:00

module.info

Fix for ticket #1027: Add index on cache key column.

2010-02-22 00:30:54 -08:00