Andy Staudacher e7f5e0a9a3 Merge commit 'upstream/master' ...

Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php

2009-08-30 18:27:40 -07:00

..

controllers

Merge commit 'upstream/master'

2009-08-29 14:17:48 -07:00

helpers

Merge commit 'upstream/master'

2009-08-30 18:27:40 -07:00

js

Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue.

2009-08-18 05:18:41 +08:00

models

Rework server_add. It's smaller and leaner now, storing the list of

2009-07-07 21:20:24 -07:00

views

Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly.

2009-08-29 22:54:20 -07:00

module.info

Add quotes around all values that contain spaces in them, and add a

2009-07-13 10:36:55 -07:00