Bharat Mediratta f50dbd992d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev ...

Conflicts:
	modules/gallery/controllers/rest.php

2009-11-25 13:40:47 -08:00

..

config

K24 has separate log sinks, this configures the file based log sink

2009-11-24 19:25:14 -08:00

controllers

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

2009-11-25 13:40:47 -08:00

css

Address RTL issues reported in ticket #869. Placement of checkboxes and radio buttons and sidebar block management lists.

2009-11-17 22:32:25 -07:00

helpers

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

2009-11-25 13:40:47 -08:00

hooks

Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4

2009-11-24 19:24:02 -08: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

Preliminary work to cut over to Kohana 2.4

2009-11-25 13:22:24 -08:00

models

Preliminary work to cut over to Kohana 2.4

2009-11-25 13:22:24 -08:00

tests

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

2009-11-25 13:40:47 -08:00

views

Preliminary work to cut over to Kohana 2.4

2009-11-25 13:22:24 -08:00

module.info

Convert the Simple Uploader form over to Forge, and use the event

2009-11-20 19:41:45 -08:00