Thomas Müller b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled ... don't remember login if the encrypion app is enabled		2013-09-30 10:53:41 -07:00
..
ajax	Merge master into oc_preview	2013-08-30 18:11:18 +02:00
avatar	Base defaultavatar text on displayname	2013-09-28 16:46:53 +02:00
command	Add copyright, remove starting blank line	2013-09-19 19:12:16 +02:00
css	followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation	2013-09-29 01:46:23 -04:00
doc	fix difference between packaged version and master	2013-08-17 10:33:11 +02:00
img	Optimize triangle-e.png and triangle-e.svg	2013-09-08 15:18:23 +02:00
js	Base defaultavatar text on displayname	2013-09-28 16:46:53 +02:00
l10n	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
lostpassword	Merge branch 'master' into rename-lostpassword-controller	2013-09-04 20:46:32 +02:00
templates	introduce OC_Util::rememberLoginAllowed()	2013-09-24 18:01:34 +02:00
minimizer.php	Clean up \OC\Util	2013-08-15 15:57:32 +02:00
register_command.php	Use appinfo/register_command.php to add commands to the console command	2013-09-13 18:10:04 +02:00
routes.php	Merge branch 'master' into oc_avatars	2013-09-12 07:41:44 +02:00
setup.php	Fix some naming and spacing in lib/util.php	2013-08-18 10:33:09 +02:00
strings.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00