Commit graph

727 commits

Author SHA1 Message Date
Morris Jobke
f54f203e56 mark test as incomplete because I can't reproduce jenkins failure 2013-07-21 11:28:06 +02:00
Jenkins for ownCloud
ae82f7fd17 [tx-robot] updated from transifex 2013-07-19 02:03:14 -04:00
Jenkins for ownCloud
279a71acb3 [tx-robot] updated from transifex 2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
Frank Karlitschek
ccb3c5b428 Removed the preview warning. This is only a simple text change 2013-07-13 13:31:55 +02:00
Jenkins for ownCloud
3fbf7ab189 [tx-robot] updated from transifex 2013-07-12 02:12:25 +02:00
Jenkins for ownCloud
f74659f3f6 [tx-robot] updated from transifex 2013-07-11 02:26:22 +02:00
Jenkins for ownCloud
439cad07b5 [tx-robot] updated from transifex 2013-07-09 02:12:22 +02:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Jenkins for ownCloud
096d7674fc [tx-robot] updated from transifex 2013-07-07 02:06:06 +02:00
Jenkins for ownCloud
c8ad3df1fa [tx-robot] updated from transifex 2013-07-06 02:08:38 +02:00
Björn Schießle
87063918f2 remove wrong closing bracket 2013-07-05 16:05:05 +02:00
Björn Schießle
9575c2f37c added helper function to escape glob pattern
Conflicts:

	apps/files_encryption/lib/helper.php
2013-07-05 16:03:20 +02:00
Björn Schießle
ec6350079f fix getUidAndFilename() test 2013-07-05 16:00:43 +02:00
Björn Schießle
15cb8e4efd only check for external mount points if the external storage app is enabled 2013-07-05 16:00:34 +02:00
Björn Schießle
f9c337dd21 only escape glob pattern 2013-07-05 16:00:17 +02:00
Björn Schießle
93730a090b del share keys from correct location 2013-07-05 16:00:08 +02:00
Björn Schießle
af2cd6f541 always return normalized path 2013-07-05 15:59:57 +02:00
Björn Schießle
3043dbfb95 delete file keys from the correct location 2013-07-05 15:59:46 +02:00
Björn Schießle
abc2ee2e07 handle rename correctly for system wide mounts 2013-07-05 15:59:38 +02:00
Björn Schießle
eb2587a08f move isSystemWideMountPoint() to util.php 2013-07-05 15:59:29 +02:00
Björn Schießle
f2de4cb342 some performance improvements, check for system wide mounts only once while writing share keys 2013-07-05 15:59:19 +02:00
Björn Schießle
2e56f0e2f8 fix path to OC_Mount_Config 2013-07-05 15:59:06 +02:00
Björn Schießle
3e4dcafa89 handle system wide mount points 2013-07-05 15:58:55 +02:00
Jenkins for ownCloud
955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
VicDeo
f67fc78531 Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
2013-07-04 06:53:17 -07:00
Björn Schießle
f30dd1557e more verbose error message 2013-07-04 14:50:07 +02:00
Jenkins for ownCloud
51cfacd789 [tx-robot] updated from transifex 2013-07-04 09:33:58 +02:00
Jenkins for ownCloud
811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02:00
Björn Schießle
4c1820a2a1 Merge pull request #3858 from owncloud/more_ssl_error_messages
add openssl_error_string() output to the owncloud.log
2013-07-02 07:58:22 -07:00
Björn Schießle
4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
Jenkins for ownCloud
cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Björn Schießle
3fc5b34247 Merge branch 'master' into encryption_check_php_version
Conflicts:
	apps/files_encryption/files/error.php
2013-07-02 13:54:31 +02:00
Björn Schießle
38ed00398f Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version 2013-07-02 13:49:49 +02:00
Björn Schießle
40e6ede6a2 improved error message 2013-07-02 10:14:33 +02:00
Björn Schießle
29dd7eda2d improved error message 2013-07-02 10:11:42 +02:00
Thomas Müller
3b1018ec00 no ?> at the end of a file
missing .
2013-07-01 21:13:04 +02:00
Thomas Müller
a7f2563990 typo 2013-07-01 21:12:21 +02:00
Björn Schießle
d5c4854708 cast result to bool 2013-07-01 17:18:16 +02:00
Björn Schießle
9512382ae0 fix error string 2013-07-01 12:24:21 +02:00
Björn Schießle
16a719173f add correct php version 2013-07-01 12:23:26 +02:00
Björn Schießle
adcee5b695 check php version, the encryption app needs php >= 5.3.3 2013-07-01 12:16:36 +02:00
Jenkins for ownCloud
d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00
Bart Visscher
b1a2ddd149 Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Jenkins for ownCloud
6127fee5aa [tx-robot] updated from transifex 2013-06-28 02:04:58 +02:00
Björn Schießle
2e6ebe1ab4 fix function documentation 2013-06-27 14:14:25 +02:00
Björn Schießle
c4aef89278 introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-06-27 14:09:22 +02:00
Jenkins for ownCloud
29caae3491 [tx-robot] updated from transifex 2013-06-27 02:12:00 +02:00
Björn Schießle
5a20c8b66f add openssl_error_string() output to the owncloud.log 2013-06-26 15:51:22 +02:00
Jenkins for ownCloud
afc3d9314a [tx-robot] updated from transifex 2013-06-26 02:07:04 +02:00