Florin Peter
|
31037241e1
|
Merge branch 'master' into files_encryption
|
2013-05-20 02:25:56 +02:00 |
|
Florin Peter
|
58a8d67a9b
|
fix for webdav because initMounts() is triggered twice so we lost the root path
|
2013-05-20 01:57:16 +02:00 |
|
Florin Peter
|
b3b6738d59
|
Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit 079f918d5c.
|
2013-05-20 01:47:35 +02:00 |
|
Florin Peter
|
3b850a2524
|
reformat code added and changed phpdoc
|
2013-05-20 01:24:36 +02:00 |
|
Florin Peter
|
b1d0e8f40b
|
removed /l10n/.tx/ from .gitignore
|
2013-05-20 00:47:00 +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
|
079f918d5c
|
fix for webdav and wrong reference for findByStorageId
|
2013-05-19 22:30:03 +02:00 |
|
Florin Peter
|
bdd2127f19
|
cleanup tests
|
2013-05-19 22:28:48 +02:00 |
Bernhard Posselt
|
71668cf08a
|
Merge pull request #3399 from owncloud/fix_js_for_ie
cleanup after people who don't test in ie
|
2013-05-19 11:25:39 -07:00 |
Michael Gapczynski
|
67729f5f9f
|
Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
|
2013-05-19 10:09:24 -07:00 |
Lukas Reschke
|
7ec36c5bbb
|
Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
|
2013-05-19 13:33:33 +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 |
Björn Schießle
|
173332afcc
|
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
|
2013-05-18 10:33:44 +02:00 |
|
Björn Schießle
|
f70240f430
|
display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
|
2013-05-18 10:33:33 +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
|
bdf74090fc
|
re-add 3rdparty submodule
|
2013-05-17 14:56:37 +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 |
Jörn Friedrich Dreyer
|
800c39fef1
|
cleanup after people who don't test in ie
|
2013-05-17 12:47:32 +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 |
|
FlorinPeter
|
0f314c1404
|
Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
fix for SQLite3Result::fetchArray() on setup
|
2013-05-17 01:55:28 -07:00 |
|
Jenkins for ownCloud
|
6a6079176b
|
[tx-robot] updated from transifex
|
2013-05-17 02:07:36 +02:00 |
|
Florin Peter
|
d7dc710c8b
|
revert changes
|
2013-05-17 01:22:30 +02:00 |
|
Florin Peter
|
a92dead754
|
only connect share hooks if installation OC is installed
|
2013-05-17 01:20:02 +02:00 |
|
Florin Peter
|
469d6028ad
|
revert changes
|
2013-05-17 01:17:55 +02:00 |
|
Florin Peter
|
2b0bf4dc87
|
added tests for recovery
|
2013-05-17 01:07:50 +02:00 |
|
Florin Peter
|
a4c0eb1756
|
improved tests
|
2013-05-17 01:07:26 +02:00 |
|
Florin Peter
|
42b4963dd0
|
moved enable and disable recovery to Helper class for unit tests
|
2013-05-17 00:58:41 +02:00 |
|
Florin Peter
|
3793e4d2d6
|
fix for recover files in subfolder
|
2013-05-16 22:57:55 +02:00 |
|
Florin Peter
|
d40d6aa358
|
fix typo in addRecoveryKeys
|
2013-05-16 22:39:09 +02:00 |
|
Björn Schießle
|
95297c2469
|
add pre-shared hooks
|
2013-05-16 17:44:28 +02:00 |
|
Björn Schießle
|
f1a5b8b524
|
show nicer warning if the admin recovery password was wrong
|
2013-05-16 16:01:40 +02:00 |
|
Björn Schießle
|
8ae30891b3
|
some error handling in case the recovery password is wrong
|
2013-05-16 15:19:53 +02:00 |
|
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |