Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption ...

Conflicts:
	apps/files_trashbin/l10n/nn_NO.php

2013-05-21 15:30:19 +02:00

..

ajax

display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password

2013-05-18 10:33:33 +02:00

css

allow admin to recover users files in case of password lost

2013-05-16 14:53:04 +02:00

img

new settings menu for new design

2013-01-17 12:45:33 +07:00

js

show nicer warning if the admin recovery password was wrong

2013-05-16 16:01:40 +02:00

l10n

[tx-robot] updated from transifex

2013-05-20 02:10:11 +02:00

templates

allow admin to recover users files in case of password lost

2013-05-16 14:53:04 +02:00

admin.php

remove log sort in admin section

2013-04-23 14:56:33 +02:00

apps.php

[core] From echo to p

2013-02-27 22:55:39 +01:00

help.php

Check if user is admin - bool

2013-01-14 19:45:17 +01:00

languageCodes.php

Modify zh_* language codes

2013-05-04 20:27:40 +08:00

personal.php

Fix #3251

2013-05-09 23:19:37 +02:00

routes.php

Whitespace fixes

2013-02-22 19:05:36 +01:00

settings.php

Enhanced auth is totally unmaintained and broken

2013-01-14 21:39:49 +01:00

users.php

allow admin to recover users files in case of password lost

2013-05-16 14:53:04 +02:00