Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ...

Conflicts:
	apps/files_encryption/tests/keymanager.php

2013-08-17 13:15:22 +02:00

..

ajax

improved error handling

2013-07-30 09:48:30 +02:00

css

Merge pull request #3912 from owncloud/css_cleanup_kondou

2013-08-08 07:31:01 -07:00

img

show 'More apps' link to app administration directly in app navigation

2013-08-07 18:18:09 +02:00

js

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

l10n

remove ru_RU - fixes #3135

2013-08-17 11:43:37 +02:00

templates

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

admin.php

Merge branch 'master' into disable-anon-upload-master

2013-07-22 11:55:20 +02:00

apps.php

Use !== and === in settings.

2013-07-21 13:55:25 +02:00

help.php

fix difference between packaged version and master

2013-08-17 10:33:11 +02:00

languageCodes.php

remove ru_RU - fixes #3135

2013-08-17 11:43:37 +02:00

personal.php

check if some encrypted files are left after the app was disabled and warn the user

2013-08-12 17:25:27 +02:00

routes.php

register decrypt all route

2013-07-29 13:39:37 +02:00

settings.php

Enhanced auth is totally unmaintained and broken

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

users.php

Use !== and === in settings.

2013-07-21 13:55:25 +02:00