Andreas Fischer 5754b0b9e7 Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command ... * owncloud/master: (238 commits) Change visibility of scanner internals [tx-robot] updated from transifex remove legacy OC_Filesystem being used in a hook callback add title property to share dialog forgotten infobox messages translations reverts 188c543 and translates only mail fix warning text and margin Adjust core apps to use "requiremin" instead of "require" Added requiremin/requiremax fields for apps [tx-robot] updated from transifex unwrapped strings fix allow resharing of files with only share permissions don't lose file size during rename drop superflous statement in phpdoc add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook [tx-robot] updated from transifex fix grammar make user_ldap fully translatable [tx-robot] updated from transifex fix typo ... Conflicts: core/register_command.php		2014-05-28 22:57:33 +02:00
..
lastseen.php	print time in 24h format	2014-05-23 19:12:51 +02:00
report.php	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
resetpassword.php	Move resetpassword into user: command space.	2014-05-28 22:53:44 +02:00