Björn Schießle
|
cb79169cf5
|
Merge branch 'master' into files_encryption
|
2013-05-23 11:11:57 +02:00 |
Jenkins for ownCloud
|
698862519d
|
[tx-robot] updated from transifex
|
2013-05-23 02:00:27 +02:00 |
Florin Peter
|
46c784ccdf
|
added trash bin tests
|
2013-05-22 23:51:35 +02:00 |
|
Florin Peter
|
842d0608f1
|
added static function registerHooks() for better unit tests handling
|
2013-05-22 23:50:45 +02:00 |
Michael Gapczynski
|
9b622bdeed
|
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
|
2013-05-22 15:02:11 -04:00 |
|
Björn Schießle
|
80dea1a8c5
|
settings clean-up; There is no blacklist in the new encryption app
|
2013-05-22 18:05:12 +02:00 |
|
Björn Schießle
|
15a3ae6db1
|
improved error messages
|
2013-05-22 18:01:18 +02:00 |
|
Björn Schießle
|
ee53bd1aa3
|
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
|
2013-05-22 15:29:22 +02:00 |
Morris Jobke
|
9fd2be0757
|
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
|
2013-05-22 03:00:04 -07:00 |
|
Jenkins for ownCloud
|
d590064fdf
|
[tx-robot] updated from transifex
|
2013-05-22 02:19:52 +02:00 |
|
Florin Peter
|
c6722581f9
|
fix pgsql error
|
2013-05-22 02:02:42 +02:00 |
|
Florin Peter
|
afbfa742d7
|
improved tests
|
2013-05-22 01:11:55 +02:00 |
|
Florin Peter
|
9ca9a22c6a
|
fixed finding encrypted files in subfolders and removed unused code
|
2013-05-22 00:54:47 +02:00 |
|
Florin Peter
|
095fc790ac
|
added webdav test
|
2013-05-21 21:09:39 +02:00 |
|
Florin Peter
|
1deeec93b7
|
fixed postFileSize
|
2013-05-21 21:09:25 +02:00 |
|
Björn Schießle
|
5cd14425f9
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
|
2013-05-21 15:30:19 +02:00 |
|
Björn Schießle
|
9d324db054
|
fix path to 3rdparty apps
|
2013-05-21 12:33:32 +02:00 |
|
Björn Schießle
|
4c27c7e199
|
fix path, needs to be relative to data/
|
2013-05-21 12:22:03 +02:00 |
|
Björn Schießle
|
64591cf754
|
move 3rdparty dependencies to app
|
2013-05-21 10:30:24 +02:00 |
|
Florin Peter
|
c9e862ccba
|
fix broken tests
|
2013-05-21 07:19:23 +02:00 |
|
Jenkins for ownCloud
|
afdad5c74d
|
[tx-robot] updated from transifex
|
2013-05-21 02:04:52 +02:00 |
|
Florin Peter
|
4bf840e2ca
|
cleanup unused code optimize tests
|
2013-05-21 00:00:55 +02:00 |
|
Florin Peter
|
f2b1158add
|
improved tests
|
2013-05-20 23:44:10 +02:00 |
|
Florin Peter
|
1c8e5d6873
|
added test for failed sharing
|
2013-05-20 21:46:28 +02:00 |
|
Florin Peter
|
1fa2f19ee4
|
removed dead code for delShareKey
|
2013-05-20 21:24:39 +02:00 |
|
Florin Peter
|
8e0540d0e4
|
key creation should never override a private or public key
|
2013-05-20 21:22:03 +02:00 |
|
Florin Peter
|
171b9a4702
|
added legacy encryption test
|
2013-05-20 21:19:28 +02:00 |
|
Florin Peter
|
31037241e1
|
Merge branch 'master' into files_encryption
|
2013-05-20 02:25:56 +02:00 |
|
Jenkins for ownCloud
|
6609de28d8
|
[tx-robot] updated from transifex
|
2013-05-20 02:10:11 +02:00 |
|
Florin Peter
|
3b850a2524
|
reformat code added and changed phpdoc
|
2013-05-20 01:24:36 +02:00 |
|
Florin Peter
|
dc39ef378e
|
changed recovery_enabled and migration_status columns to integer and fix tests
|
2013-05-20 00:38:23 +02:00 |
|
Florin Peter
|
5d572c3449
|
update phpdoc
|
2013-05-19 22:31:00 +02:00 |
|
Florin Peter
|
bdd2127f19
|
cleanup tests
|
2013-05-19 22:28:48 +02:00 |
|
Florin Peter
|
ddda2a1f79
|
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
|
2013-05-19 07:04:31 +02:00 |
|
Jenkins for ownCloud
|
694f42dfd5
|
[tx-robot] updated from transifex
|
2013-05-19 02:01:55 +02:00 |
|
Florin Peter
|
2a038baee0
|
updated authors info
|
2013-05-18 22:33:31 +02:00 |
|
Florin Peter
|
227b122947
|
fixed again key-manager tests
|
2013-05-18 22:25:47 +02:00 |
|
Florin Peter
|
681252669a
|
changed migrationStatus to migration_status for pgsql
|
2013-05-18 22:10:00 +02:00 |
|
Florin Peter
|
e0e89602a2
|
fixed key-manager tests
|
2013-05-18 22:00:35 +02:00 |
|
Florin Peter
|
80f9c5bb6d
|
removed mockery from tests and changed class names
|
2013-05-18 21:37:00 +02:00 |
|
Florin Peter
|
6980f59b2f
|
fixed typos
|
2013-05-18 21:12:53 +02:00 |
|
Jenkins for ownCloud
|
9428d813ba
|
[tx-robot] updated from transifex
|
2013-05-18 02:03:28 +02:00 |
|
Florin Peter
|
41165afa59
|
improved tests
|
2013-05-17 22:45:09 +02:00 |
|
Florin Peter
|
3aa48616a6
|
remove unused code
|
2013-05-17 22:44:45 +02:00 |
|
Florin Peter
|
b6572cedac
|
added folder move test
|
2013-05-17 22:16:56 +02:00 |
|
Florin Peter
|
cea9208cec
|
fix broken legacy tests
|
2013-05-17 21:59:53 +02:00 |
|
Björn Schießle
|
e7d1fe82aa
|
fix path to class
|
2013-05-17 18:01:32 +02:00 |
|
Björn Schießle
|
eaa61b8539
|
fix migration to new encryption
|
2013-05-17 17:29:32 +02:00 |
|
Björn Schießle
|
002445e23d
|
some typo fixed
|
2013-05-17 14:49:54 +02:00 |
|
Björn Schießle
|
93771f735b
|
gremove unused code
|
2013-05-17 14:13:05 +02:00 |