Tim Almdal 3060a6f662 Merge branch 'master' into talmdal_dev ...

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

2009-12-26 11:24:50 -08:00

..

admin_advanced_settings.php

Update a few more occurrences of ORM/Database -> Database_Builder

2009-11-29 02:48:42 -08:00

admin_dashboard.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

admin_graphics.php

Don't call dirname() on the toolkit dir, it's already a directory! (Thanks Kaare)

2009-08-18 13:48:00 -07:00

admin_identity.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

admin_languages.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

admin_maintenance.php

Convert more database calls over to the new format

2009-12-02 00:34:34 -08:00

admin_modules.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

admin_sidebar.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

admin_theme_options.php

Make the rendering of the Theme Options page consistent between the first request and any errors

2009-12-04 13:48:52 -08:00

admin_themes.php

Don't call theme::get_info() on themes that don't have a theme.info. Fixes #896.

2009-11-20 21:23:11 -08:00

admin.php

Convert a bunch of leftover kohana::show_404 calls to throw

2009-12-23 20:51:33 -08:00

albums.php

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

combined.php

The html helpers no longer forces .js and .css suffixes to urls it generates (yay!)

2009-11-25 16:26:10 -08:00

file_proxy.php

Convert a bunch of leftover kohana::show_404 calls to throw

2009-12-23 20:51:33 -08:00

items.php

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

2009-12-01 19:44:29 -08:00

l10n_client.php

Convert some database calls.

2009-12-16 09:24:38 -08:00

login.php

Rename the login helper to auth. Create a login and logout helper function to allow for programmically login in and out.

2009-10-30 09:32:18 -07:00

logout.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

maintenance.php

Restructure things so that the application is now just another module.

2009-05-27 15:07:27 -07:00

move.php

Updates for the latest version of Kohana 2.4:

2009-12-21 21:27:43 -08:00

movies.php

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

packager.php

Convert some more database queries.

2009-12-17 21:16:37 -08:00

permissions.php

Preliminary work to cut over to Kohana 2.4

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

photos.php

Merge branch 'master' into talmdal_dev

2009-12-26 11:24:50 -08:00

quick.php

Show the right edit form for movies.

2009-12-16 09:37:28 -08:00

simple_uploader.php

Preliminary work to cut over to Kohana 2.4

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

upgrader.php

Tweak upgrader html and css so that we set opacity properly for rows

2009-11-15 16:14:30 -08:00

welcome_message.php

Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class

2009-10-22 13:11:03 -07:00