Commit Graph

4 Commits

Author SHA1 Message Date
François KUBLER 7faf852561 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
Conflicts:
	admin/templates/index.php
	templates/layout.admin.php
	templates/layout.user.php

All conflicts are fixed.
2011-03-09 22:46:17 +01:00
François KUBLER bf815b3390 Fixed PHP syntax in template files.
* Full PHP tags
  * Alternative syntax for control structures
  * Semi-colon at the end of instructions
2011-03-09 21:57:00 +01:00
Jakob Sack f7f957abb9 Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
Jakob Sack 66ac355f78 Getting rid of Smarty, using our own template system 2011-03-02 11:56:48 +01:00