3612 Commits

Author	SHA1	Message	Date
Björn Schießle	aa3eb6bb5b	don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead	2013-05-13 17:40:57 +02:00
Björn Schießle	d1e2e47592	generate random key name for share key to avoid name conflicts	2013-05-13 15:15:35 +02:00
Florin Peter	dc8164a3f0	fix for accessing non object	2013-05-11 00:22:58 +02:00
Florin Peter	1f464a7113	fix for accessing non object	2013-05-09 23:21:39 +02:00
Sam Tuke	28866de44b	Added pre_share hook ... Switched it for post_share hook in encryption hooks Stop a file from being shared if the encryption procedure fails for any users	2013-05-08 16:22:08 +02:00
Florin Peter	cdf4bec6a1	fix for tearDownFS, after filesystem::tearDown() the root is not mounted	2013-05-07 22:19:48 +02:00
Florin Peter	d3df80a078	merge my fix from master b464970142	2013-05-06 21:14:59 +02:00
Florin Peter	ee083c20e6	improved pre_unshare and post_unshare hook	2013-05-05 23:41:04 +02:00
Florin Peter	3c100af132	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
Florin Peter	b2da07fe95	Merge branch 'master' into files_encryption to get the latest files_trashbin app ... Conflicts: apps/files/l10n/bn_BD.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/hr.php apps/files/l10n/ms_MY.php apps/files/l10n/ro.php apps/files/l10n/si_LK.php apps/files/l10n/sl.php apps/files/l10n/ta_LK.php apps/files_external/l10n/de_DE.php apps/files_external/l10n/et_EE.php apps/user_ldap/l10n/tr.php core/l10n/bg_BG.php l10n/af_ZA/files.po l10n/af_ZA/files_external.po l10n/ar/core.po l10n/ar/files.po l10n/ar/files_external.po l10n/be/files.po l10n/be/files_external.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/files_external.po l10n/bg_BG/files_trashbin.po l10n/bg_BG/files_versions.po l10n/bg_BG/settings.po l10n/bn_BD/core.po l10n/bn_BD/files.po l10n/bn_BD/files_external.po l10n/ca/core.po l10n/ca/files.po l10n/ca/files_external.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/files_external.po l10n/cs_CZ/lib.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_external.po l10n/cy_GB/settings.po l10n/da/core.po l10n/da/files.po l10n/da/files_external.po l10n/de/core.po l10n/de/files.po l10n/de/files_external.po l10n/de_DE/core.po l10n/de_DE/files.po l10n/de_DE/files_external.po l10n/el/core.po l10n/el/files.po l10n/el/files_external.po l10n/eo/core.po l10n/eo/files.po l10n/eo/files_external.po l10n/es/core.po l10n/es/files.po l10n/es/files_external.po l10n/es_AR/core.po l10n/es_AR/files.po l10n/es_AR/files_external.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/files_external.po l10n/eu/core.po l10n/eu/files.po l10n/eu/files_external.po l10n/fa/core.po l10n/fa/files.po l10n/fa/files_external.po l10n/fi/files.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/files_external.po l10n/fr/core.po l10n/fr/files.po l10n/fr/files_external.po l10n/gl/core.po l10n/gl/files.po l10n/gl/files_external.po l10n/he/core.po l10n/he/files.po l10n/he/files_external.po l10n/hi/files.po l10n/hi/files_external.po l10n/hr/core.po l10n/hr/files.po l10n/hr/files_external.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hy/files.po l10n/hy/files_external.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_external.po l10n/id/core.po l10n/id/files.po l10n/id/files_external.po l10n/is/core.po l10n/is/files.po l10n/is/files_external.po l10n/it/core.po l10n/it/files.po l10n/it/files_external.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/files_external.po l10n/ka/files.po l10n/ka/files_external.po l10n/ka_GE/core.po l10n/ka_GE/files.po l10n/ka_GE/files_external.po l10n/kn/files.po l10n/kn/files_external.po l10n/ko/core.po l10n/ko/files.po l10n/ko/files_external.po l10n/ku_IQ/files.po l10n/ku_IQ/files_external.po l10n/lb/core.po l10n/lb/files.po l10n/lb/files_external.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/files_external.po l10n/lv/core.po l10n/lv/files.po l10n/lv/files_external.po l10n/mk/core.po l10n/mk/files.po l10n/mk/files_external.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/files_external.po l10n/my_MM/files.po l10n/my_MM/files_external.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/files_external.po l10n/ne/files.po l10n/ne/files_external.po l10n/nl/core.po l10n/nl/files.po l10n/nl/files_external.po l10n/nn_NO/files.po l10n/nn_NO/files_external.po l10n/oc/core.po l10n/oc/files.po l10n/oc/files_external.po l10n/pl/core.po l10n/pl/files.po l10n/pl/files_external.po l10n/pl_PL/files.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/files_external.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/ro/core.po l10n/ro/files.po l10n/ro/files_external.po l10n/ru/core.po l10n/ru/files.po l10n/ru/files_external.po l10n/ru_RU/core.po l10n/ru_RU/files.po l10n/si_LK/core.po l10n/si_LK/files.po l10n/si_LK/files_external.po l10n/sk/files.po l10n/sk/files_external.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/files_external.po l10n/sl/core.po l10n/sl/files.po l10n/sl/files_external.po l10n/sq/core.po l10n/sq/files.po l10n/sq/files_external.po l10n/sr/core.po l10n/sr/files.po l10n/sr/files_external.po l10n/sr@latin/files.po l10n/sr@latin/files_external.po l10n/sv/core.po l10n/sv/files.po l10n/sv/files_external.po l10n/sw_KE/files.po l10n/sw_KE/files_external.po l10n/ta_LK/core.po l10n/ta_LK/files.po l10n/ta_LK/files_external.po l10n/te/files.po l10n/te/files_external.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/files_external.po l10n/tr/core.po l10n/tr/files.po l10n/tr/files_external.po l10n/tr/user_ldap.po l10n/uk/core.po l10n/uk/files.po l10n/uk/files_external.po l10n/ur_PK/files.po l10n/ur_PK/files_external.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/core.po l10n/zh_CN.GB2312/files.po l10n/zh_CN.GB2312/files_external.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/files_external.po l10n/zh_HK/core.po l10n/zh_HK/files.po l10n/zh_HK/files_external.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_external.po lib/base.php lib/files/mount/mount.php	2013-04-30 20:53:56 +02:00
FlorinPeter	b464970142	Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache ... fix for infinite loop causing on files_encryption branch when testing	2013-04-29 17:05:41 -07:00
Jenkins for ownCloud	5764bf088e	[tx-robot] updated from transifex	2013-04-30 01:59:18 +02:00
Florin Peter	f55aaad858	fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent	2013-04-29 15:43:48 +02:00
Frank Karlitschek	1f194b7bdc	Merge pull request #3154 from owncloud/fix_3153 ... Change app identifier for core api routes	2013-04-28 03:51:21 -07:00
Jenkins for ownCloud	901e0c598d	[tx-robot] updated from transifex	2013-04-28 02:01:38 +02:00
Florin Peter	d32bf993fa	removed previous added post rename FileProxy hook	2013-04-27 20:23:30 +02:00
Lukas Reschke	51a1f41225	Merge pull request #3121 from owncloud/ocs_fix_api_response ... Fix the api response when a shipped and third party app both fail.	2013-04-27 10:05:06 -07:00
Tom Needham	d33f6b9af6	Use correct variable when checking auth	2013-04-27 17:45:23 +01:00
Morris Jobke	0e5eccbdbc	Merge pull request #3146 from owncloud/restart-hint ... web_server_restart needs to be true to display the hint	2013-04-27 08:19:08 -07:00
Morris Jobke	86455d6ac3	Merge pull request #3145 from owncloud/magic_quotes_gpc-check ... Add check for Magic Quotes	2013-04-27 08:14:40 -07:00
Raghu Nayyar	2bcb64e781	Merge pull request #3114 from owncloud/update-notification ... Add an update notification	2013-04-26 21:12:38 -07:00
Jenkins for ownCloud	7b2c64236c	[tx-robot] updated from transifex	2013-04-27 02:24:29 +02:00
Robin Appelman	8a838e0e03	Code style	2013-04-26 17:30:55 +02:00
Bart Visscher	7db5ec30c3	Add check for Magic Quotes	2013-04-26 16:32:58 +02:00
Bart Visscher	f5b0d904fb	web_server_restart needs to be true to display the hint	2013-04-26 16:21:56 +02:00
icewind1991	5474fea1f6	Merge pull request #3136 from owncloud/mount-cleanup ... Separation of mount management	2013-04-26 06:55:21 -07:00
Bart Visscher	686f836736	Merge pull request #3026 from owncloud/cli-no-session ... Don't start the session when in cli mode	2013-04-26 06:20:39 -07:00
Bart Visscher	948e3d5b7c	Merge pull request #3028 from owncloud/simplyfy-resource-locating ... Simplify resource locating in templatelayout	2013-04-26 05:56:09 -07:00
Robin Appelman	172499d5f3	Don't start the session when in cli mode	2013-04-26 14:53:59 +02:00
Bart Visscher	7e89a017bf	Merge pull request #2955 from owncloud/displaynames-numeric ... Fix OC_User::getDisplaynames when using numeric user id's	2013-04-26 05:51:07 -07:00
Bart Visscher	b46f6e4f97	Simplify app js locating for layout pages	2013-04-26 14:21:51 +02:00
Bart Visscher	ea4ae857a1	Simplify app css locating for layout pages	2013-04-26 14:21:50 +02:00
Bart Visscher	710acde9a1	Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy ... Overwrite host and webroot when forcessl is enabled	2013-04-26 05:10:49 -07:00
Robin Appelman	809b5f81f6	Further seperation of mount management logic	2013-04-26 00:01:36 +02:00
Robin Appelman	bcd9a69033	Cache: seperate handing of numeric storage id's to it's own class	2013-04-26 00:00:18 +02:00
Florin Peter	672d177f10	added post rename proxy	2013-04-25 22:43:15 +02:00
icewind1991	80e91e1ac6	Merge pull request #3132 from owncloud/mount-setupfs ... Make sure the filesystem is initialized when searching for mounts	2013-04-25 08:07:07 -07:00
Robin Appelman	cea56df59e	Have the filecache updater testcase clean the filesystem properly	2013-04-25 16:56:48 +02:00
Robin Appelman	31d7f4df2a	Make sure the filesystem is initialized when searching for mounts	2013-04-25 16:11:48 +02:00
Florin Peter	fac288a4ad	added unencrypted file size to file cache ... improved file size calculation and speeds	2013-04-25 15:20:06 +02:00
Lukas Reschke	632221bed0	Correct the parameter description ... Thanks @kabum	2013-04-25 14:27:08 +03:00
Lukas Reschke	2d4af5dfca	Correct function description ... $password is not supported	2013-04-25 14:20:32 +03:00
Bernhard Posselt	c9c1e483c5	use utf-8 encoding for json	2013-04-25 11:36:41 +02:00
Tom Needham	b3e7485612	Correct the api response when both a shipped app and/or a third party app fail	2013-04-25 01:08:11 +01:00
Thomas Tanghus	c84281990c	Merge pull request #2993 from owncloud/resolve_apps_lib_path ... Let autoloader resolve paths under apps lib directory.	2013-04-24 13:33:05 -07:00
Lukas Reschke	d41b600725	Add an update notification on every page for admin users	2013-04-24 18:47:38 +02:00
icewind1991	dd1c876009	Merge pull request #3112 from owncloud/markdown-mimetype ... Add markdown to mimetype list	2013-04-24 08:18:10 -07:00
icewind1991	3b576c5f77	Merge pull request #3111 from owncloud/csp-audio ... Allow loading of external media ressources	2013-04-24 08:17:42 -07:00
Lukas Reschke	a34350c803	Merge pull request #3106 from IMM0rtalis/xframe_restriction_config ... - xframe restriction configurable now	2013-04-24 08:02:12 -07:00
Robin Appelman	3d42d49d14	Add markdown to mimetype list	2013-04-24 16:54:34 +02:00