Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php		2013-11-27 15:08:09 +01:00
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	no longer enforce log out, but provide useful errors/warnings instead	2013-09-06 12:27:40 +02:00
appinfo	Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617	2013-10-04 02:28:18 -07:00
css	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
files	replacing ownCloud by theme-able name or avoid it's usage	2013-10-29 23:29:16 +01:00
hooks	backport of https://github.com/owncloud/core/pull/5513	2013-10-29 15:08:12 +01:00
js	add/remove specific CSS class - not all classes	2013-10-03 12:22:25 +02:00
l10n	[tx-robot] updated from transifex	2013-11-26 10:47:07 -05:00
lib	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
templates	Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines	2013-10-11 07:15:58 -07:00
tests	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
settings-admin.php	remove unused variable	2013-10-30 11:39:30 +01:00
settings-personal.php	improved documentation of the methods	2013-09-02 11:34:28 +02:00