Tim Almdal 28aee01130 Merge branch 'master' into talmdal_dev

2010-05-14 06:32:26 -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

Add page_title to admin views. Closes #1038.

2010-04-30 00:08:37 -06: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

Merge branch 'master' into talmdal_dev

2010-05-14 06:32:26 -07: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

Fix a bug introduced when we patched the "disallowed global data"

2010-04-10 17:01:48 -07:00

models

Merge bharat_dev rest implementation

2010-04-07 08:07:41 -07:00

tests

Merge branch 'master' into talmdal_dev

2010-05-14 06:32:26 -07:00

views

Oops, somehow the update to flowplayer 3.1.5 was missing a few files. Here they are...

2010-04-30 16:25:16 -07:00

module.info

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

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