Mariano Iglesias 388bca4acd Fixing syntax error generated by last merge conflict		2010-04-13 15:46:12 -03:00
..
elements	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
errors	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
helpers	Fixing syntax error generated by last merge conflict	2010-04-13 15:46:12 -03:00
layouts	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
pages	Updating version numbers to 1.3.0-RC4	2010-04-12 22:27:18 -04:00
scaffolds	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
helper.php	Updating HtmlHelper + JavascriptHelper to call assetTimestamp() after webroot(). This allows theme files in webroot/theme to be correctly timestamped.	2010-04-08 23:36:04 -04:00
media.php	Chaging array_push call for array_merge, as the first one would produce worng nested arrays in MediaView. closes #391	2010-03-17 16:45:39 -04:30
theme.php	Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329	2010-02-11 22:57:24 -05:00
view.php	Adding and correcting doc blocks.	2010-03-28 12:53:57 -04:00