Robin Appelman
|
9c99048429
|
fix syntax error
|
2013-05-28 01:31:26 +02:00 |
Robin Appelman
|
44f9af5a7f
|
Use the new session wrapper
|
2013-05-28 01:04:09 +02:00 |
Florin Peter
|
e1e1c58969
|
changed to public log api
|
2013-05-27 20:51:52 +02:00 |
Florin Peter
|
7224fc98b2
|
replace == with === and replace != with !==
|
2013-05-27 20:44:38 +02:00 |
Florin Peter
|
6075aff687
|
changed basic auth to test user
|
2013-05-27 20:32:59 +02:00 |
Björn Schießle
|
2c3c60c1af
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
|
2013-05-27 18:09:35 +02:00 |
Björn Schießle
|
c81e34ef89
|
replace == with ===
|
2013-05-27 18:03:29 +02:00 |
Björn Schießle
|
4c05259ccf
|
legacyBlockDecryprt() needs to be public
|
2013-05-27 17:35:38 +02:00 |
Björn Schießle
|
df22a7c495
|
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
|
2013-05-27 17:35:28 +02:00 |
Björn Schießle
|
8b35578833
|
fix migration from old to new encryption
|
2013-05-27 17:35:06 +02:00 |
Florin Peter
|
5d32e214b7
|
reformat code
|
2013-05-27 17:26:58 +02:00 |
Florin Peter
|
690bf9b8c4
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-27 17:26:35 +02:00 |
Björn Schießle
|
f8d1c32112
|
Merge pull request #3506 from owncloud/fix_3320
fix https://github.com/owncloud/core/issues/3320
|
2013-05-27 08:04:55 -07:00 |
Georg Ehrke
|
841b420bc4
|
add event.preventDefault to undelete function
|
2013-05-27 16:37:43 +02:00 |
Björn Schießle
|
710e9c2d14
|
fix tests, after unused variables are removed
|
2013-05-27 15:34:57 +02:00 |
Björn Schießle
|
1a3f7891ea
|
remove unused varaibles
|
2013-05-27 15:31:26 +02:00 |
Georg Ehrke
|
d408cd7f37
|
fix https://github.com/owncloud/core/issues/3320
|
2013-05-27 15:24:37 +02:00 |
Florin Peter
|
80433fc4c4
|
Merge branch 'master' into file_encryption_util_is_error
Conflicts:
apps/files_encryption/lib/util.php
|
2013-05-27 14:41:53 +02:00 |
Björn Schießle
|
5e243b48bb
|
Merge pull request #3481 from owncloud/firsttime_enc
fix first time encryption after app was enabled
|
2013-05-27 05:17:31 -07:00 |
Florin Peter
|
8cf827ee9d
|
Merge branch 'master' into file_encryption_tests
|
2013-05-27 12:54:33 +02:00 |
Florin Peter
|
89f0c8f39d
|
added check by numRows()
changed to public api where it was possible
reformat code to comply with the coding guidelines
|
2013-05-27 12:41:55 +02:00 |
Jenkins for ownCloud
|
73e0b4c10a
|
[tx-robot] updated from transifex
|
2013-05-27 02:07:24 +02:00 |
Florin Peter
|
9dd277576a
|
added users for tests
reformat code to meet coding guidelines
|
2013-05-26 20:44:15 +02:00 |
Florin Peter
|
c7981abbc9
|
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
|
2013-05-26 03:22:16 +02:00 |
Jenkins for ownCloud
|
0c621ff6a9
|
[tx-robot] updated from transifex
|
2013-05-26 02:03:54 +02:00 |
Florin Peter
|
788c5940f0
|
fixed error rising from fetchRow
|
2013-05-25 23:20:55 +02:00 |
Florin Peter
|
9a6cd89a69
|
added OC_DB::isError and logging
|
2013-05-25 21:33:05 +02:00 |
Michael Gapczynski
|
dbb6a10364
|
Merge pull request #3478 from davidak/master
small typo fix: added 2 whitespaces
|
2013-05-25 11:21:21 -07:00 |
Frank Karlitschek
|
29c8cbf4d1
|
increase version and add warning
|
2013-05-25 12:08:18 +02:00 |
Arthur Schiwon
|
86d72b9a61
|
LDAP: fix possible recursion
|
2013-05-25 11:03:58 +02:00 |
Arthur Schiwon
|
bfa715768a
|
LDAP: fix handling when LDAP Host is offline
|
2013-05-25 11:02:51 +02:00 |
Jenkins for ownCloud
|
6a6c18dfab
|
[tx-robot] updated from transifex
|
2013-05-25 02:11:52 +02:00 |
Florin Peter
|
fba7200b05
|
improved trashbin test again
|
2013-05-24 23:12:16 +02:00 |
Florin Peter
|
b32823a96e
|
improved trashbin test
|
2013-05-24 23:12:07 +02:00 |
Björn Schießle
|
f56802a437
|
no use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 18:37:58 +02:00 |
Björn Schießle
|
5ce4149e75
|
fix first time encryption after app was enabled
|
2013-05-24 17:35:00 +02:00 |
davidak
|
56006ea852
|
small typo fix: added 2 whitespaces
|
2013-05-24 14:31:06 +02:00 |
Thomas Müller
|
4911305887
|
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
|
2013-05-24 02:21:19 -07:00 |
Michael Gapczynski
|
a98d6c4be6
|
Merge pull request #3425 from owncloud/move-storages
Support for moving/copying folders between storages
|
2013-05-23 17:35:11 -07:00 |
Jenkins for ownCloud
|
b47729c5fc
|
[tx-robot] updated from transifex
|
2013-05-24 02:02:43 +02:00 |
Florin Peter
|
6c8de5ae6d
|
fixes after review from @DeepDiver1975
|
2013-05-23 23:56:31 +02:00 |
Florin Peter
|
adc930d9f9
|
added l10n support in apps/files_encryption/ajax/adminrecovery.php
|
2013-05-23 22:09:28 +02:00 |
Björn Schießle
|
7b07168c46
|
code clean up; nicer solution to solve the public link share problem if a user is logged in
|
2013-05-23 21:18:31 +02:00 |
Björn Schießle
|
a9ebf2aabe
|
fix public link share if a user is logged in
|
2013-05-23 20:30:07 +02:00 |
Michael Gapczynski
|
30330b4343
|
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
|
2013-05-23 10:25:12 -04:00 |
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 |
Michael Gapczynski
|
ec475cbcfa
|
Add data-dir attribute to home breadcrumb
|
2013-05-20 10:21:13 -04: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 |
Björn Schießle
|
bf04a21973
|
set migration status after successful upgrade
|
2013-05-17 13:16:52 +02:00 |
Björn Schießle
|
0b40c1d08a
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-17 11:20:17 +02:00 |
Björn Schießle
|
ca6a77d39b
|
upgrade from old encryption to the new one needs to generate share keys too
|
2013-05-17 11:15:36 +02:00 |
Thomas Tanghus
|
152e275c8a
|
Various cleanups in OC.dialogs
|
2013-05-17 04:54:08 +02:00 |