Tim Almdal 1f9d45861d Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/gallery/helpers/gallery_block.php
	modules/gallery/helpers/gallery_theme.php
	modules/gallery/helpers/user.php
	modules/user/helpers/user_event.php

2009-10-13 12:53:33 -07:00

..

config

If the Identity backend is not writable don't display the "Forgot Your Password" link

2009-10-08 06:26:12 -07:00

controllers

Merge branch 'master' into talmdal_dev

2009-10-13 11:48:42 -07:00

css

Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.

2009-10-04 00:27:22 -06:00

helpers

Merge branch 'master' into talmdal_dev

2009-10-13 12:53:33 -07:00

hooks

Create a gallery error handler that traps php errors and rethrows them as Exceptions. This fixes ticket #763

2009-09-22 14:25:52 -07:00

images

Swap Jakob's placeholder in for mine.

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

js

Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features.

2009-10-04 00:27:22 -06:00

libraries

Merge branch 'master' into talmdal_dev

2009-10-13 11:48:42 -07:00

models

Make the slug field required for all items.

2009-10-11 11:16:07 -07:00

tests

update the Access_Helper_Test to use the user::lookup_by_name API method.

2009-10-09 01:27:27 -07:00

views

If the Identity backend is not writable don't display the "Forgot Your Password" link

2009-10-08 06:26:12 -07:00

module.info

Correct version numbers for image_block and info modules, they inadvertently got set to 2, they should be 1

2009-09-30 18:04:30 -07:00