Bharat Mediratta 7aac471b82 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch ...

Conflicts:
	modules/gallery/js/quick.js

2009-08-08 20:56:06 -07:00

..

config

Use TMPPATH in the purifier config instead of var/tmp

2009-07-04 09:10:03 -07:00

controllers

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

2009-08-08 20:56:06 -07:00

css

Combine the quick menu and the thumb menu into a single menu called

2009-08-03 21:45:54 -07:00

helpers

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

2009-08-08 20:56:06 -07:00

hooks

Update all references to the core application to now point to the

2009-05-27 16:17:29 -07:00

images

Swap Jakob's placeholder in for mine.

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

js

Forgot to save this one before committing the last two times... duh. Completes the conversion from using 1 to true for the immediate paramter to gallery_dialog

2009-08-08 16:18:33 -07:00

lib/HTMLPurifier

Stripped the trailing ?> without changing whitespace.

2009-07-16 10:45:06 -07:00

libraries

Merge branch 'master' of git@github.com:bharat/gallery3 into bharat_branch

2009-08-06 12:44:39 -07:00

models

Change the children and descendants APIs to be more consistent and to

2009-08-05 10:38:53 -07:00

tests

Change the children and descendants APIs to be more consistent and to

2009-08-05 10:38:53 -07:00

views

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

2009-08-08 20:56:06 -07:00

module.info

Fix for ticket #576

2009-07-30 01:59:07 +08:00