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

Conflicts:
	modules/user/views/admin_users.html.php

2009-10-19 06:27:18 -07:00

..

akismet

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

comment

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

digibug

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

exif

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

forge/libraries

XSS escape in form helper and forge where missing.

2009-09-01 01:17:39 -07:00

g2_import

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

gallery

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

gallery_unit_test

Run 'graphics::choose_default_toolkit();' to pick a toolkit, which we

2009-09-02 11:53:10 -07:00

image_block

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

info

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

notification

Remove all non Identity API methods from Identity.php. Created an MY_Session class to provide the user state changes in the session and a login.php helper that has the login form.

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

organize

Consolidated the rest of the base message styles into lib/gallery.common.css and applied updates to views. Moved over draggable/droppable styles. Use g-target consistently for drag/drop interactions. Minor re-ordering of selectors in gallery.common.css. Updates to css comments.

2009-10-07 00:21:23 -06:00

recaptcha

Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's.

2009-10-18 20:22:10 -06:00

rss

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

search

Remove all non Identity API methods from Identity.php. Created an MY_Session class to provide the user state changes in the session and a login.php helper that has the login form.

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

server_add

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

slideshow

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

tag

Resolve merge conflict.

2009-10-18 22:45:13 -06:00

unit_test

Update Kohana to r4374

2009-05-29 12:00:49 -07:00

user

Merge branch 'master' into talmdal_dev

2009-10-19 06:27:18 -07:00

watermark

Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's.

2009-10-18 20:22:10 -06:00