Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
Bart Visscher
|
eb97818519
|
Merge pull request #4483 from owncloud/compare-true-false
Compare result are already true/false
|
2013-08-18 03:26:35 -07:00 |
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
Björn Schießle
|
d3e2f31ada
|
Merge pull request #4352 from owncloud/encryption_clean_up
crypt.php clean up
|
2013-08-17 04:10:15 -07:00 |
Bart Visscher
|
29b6dd53a0
|
Compare result are already true/false
|
2013-08-17 12:58:10 +02:00 |
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
Andreas Fischer
|
75e9015b54
|
Merge pull request #4393 from owncloud/fix_4326
provide correct path for require_once
* owncloud/fix_4326:
use __DIR__ instead of realpath
provide correct path for require_once
|
2013-08-14 21:20:53 +02:00 |
Bjoern Schiessle
|
7d0e9cc685
|
use __DIR__ instead of realpath
|
2013-08-14 17:15:01 +02:00 |
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
Bjoern Schiessle
|
eb0fdc8380
|
provide correct path for require_once
|
2013-08-12 17:38:57 +02:00 |
Bjoern Schiessle
|
7b1067c2a0
|
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
|
2013-08-12 16:19:08 +02:00 |
Jenkins for ownCloud
|
5ebff8cfc4
|
[tx-robot] updated from transifex
|
2013-08-11 08:11:03 -04:00 |
Bjoern Schiessle
|
44d201a526
|
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
|
2013-08-09 15:57:07 +02:00 |
Bjoern Schiessle
|
5ba8d38b7f
|
remove old comments, TODos, etc.
|
2013-08-09 15:55:17 +02:00 |
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
Thomas Müller
|
c458e785a1
|
fixing typos and PHPDoc
|
2013-08-08 15:08:58 +02:00 |
Bjoern Schiessle
|
512f98cac9
|
remove todo item
|
2013-08-08 13:38:15 +02:00 |
Bjoern Schiessle
|
023121aed0
|
adapt tests to the changes in crypt.php
|
2013-08-08 13:35:01 +02:00 |
Bjoern Schiessle
|
b39d2d1938
|
more error messages which might be useful for the user to debug his server config
|
2013-08-08 08:39:11 +02:00 |
Bjoern Schiessle
|
7ce03ba37c
|
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
|
2013-08-08 08:39:01 +02:00 |
Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
Bjoern Schiessle
|
97e910e087
|
make methods private which are not used from outside
|
2013-08-08 08:37:39 +02:00 |
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
Jenkins for ownCloud
|
0fce89308e
|
[tx-robot] updated from transifex
|
2013-08-05 07:54:38 -04:00 |
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 -04:00 |
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
Bjoern Schiessle
|
69173c2a6b
|
fix test and make warning translatable
|
2013-08-01 14:19:33 +02:00 |
Bjoern Schiessle
|
9253627327
|
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 13:04:55 +02:00 |
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04:00 |
Jenkins for ownCloud
|
a94c55be98
|
[tx-robot] updated from transifex
|
2013-07-23 02:03:19 -04:00 |
Thomas Müller
|
6e2418141d
|
Merge branch 'master' into parallel-autotest.sh-master
|
2013-07-22 11:39:27 +02:00 |
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 -04:00 |
Morris Jobke
|
f54f203e56
|
mark test as incomplete because I can't reproduce jenkins failure
|
2013-07-21 11:28:06 +02:00 |
Thomas Müller
|
20ee9945d1
|
don't rely on admin user but create a test user for Test_Encryption_Keymanager
|
2013-07-19 14:54:10 +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 |