martin a20e279840 Merge branch 'master' of dev.sourcefabric.org:airtime ...

Conflicts:
	application/configs/conf.php
	install/airtime-install.php

2011-02-22 16:32:04 -05:00

..

configs

Merge branch 'master' of dev.sourcefabric.org:airtime

2011-02-22 16:32:04 -05:00

controllers

Merged Naomi's change for CC-1955

2011-02-22 18:26:51 +01:00

forms

can make show as many hours long in duration as wanted.

2011-02-12 18:40:17 -05:00

layouts/scripts

-fixed UI freeze on some very special occasions

2011-02-13 13:29:16 -05:00

models

Merge branch 'master' of dev.sourcefabric.org:airtime

2011-02-22 16:32:04 -05:00

validate

CC-1971

2011-02-22 18:22:31 +01:00

views

CC-1971

2011-02-22 18:22:31 +01:00

Bootstrap.php

-small fixes

2011-02-10 20:48:26 -05:00