]>
source.dussan.org Git - nextcloud-server.git/log
Björn Schießle [Tue, 21 May 2013 10:22:03 +0000 (12:22 +0200)]
fix path, needs to be relative to data/
Björn Schießle [Tue, 21 May 2013 08:30:24 +0000 (10:30 +0200)]
move 3rdparty dependencies to app
Florin Peter [Tue, 21 May 2013 05:19:23 +0000 (07:19 +0200)]
fix broken tests
Florin Peter [Mon, 20 May 2013 22:00:55 +0000 (00:00 +0200)]
cleanup unused code optimize tests
Florin Peter [Mon, 20 May 2013 21:44:10 +0000 (23:44 +0200)]
improved tests
Florin Peter [Mon, 20 May 2013 19:46:28 +0000 (21:46 +0200)]
added test for failed sharing
Florin Peter [Mon, 20 May 2013 19:24:39 +0000 (21:24 +0200)]
removed dead code for delShareKey
Florin Peter [Mon, 20 May 2013 19:22:03 +0000 (21:22 +0200)]
key creation should never override a private or public key
Florin Peter [Mon, 20 May 2013 19:19:28 +0000 (21:19 +0200)]
added legacy encryption test
Florin Peter [Mon, 20 May 2013 00:25:56 +0000 (02:25 +0200)]
Merge branch 'master' into files_encryption
Florin Peter [Sun, 19 May 2013 23:57:16 +0000 (01:57 +0200)]
fix for webdav because initMounts() is triggered twice so we lost the root path
Florin Peter [Sun, 19 May 2013 23:47:35 +0000 (01:47 +0200)]
Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit
079f918d5ca0d242e77717aaeac82bcf011dc745 .
Florin Peter [Sun, 19 May 2013 23:24:36 +0000 (01:24 +0200)]
reformat code added and changed phpdoc
Florin Peter [Sun, 19 May 2013 22:47:00 +0000 (00:47 +0200)]
removed /l10n/.tx/ from .gitignore
Florin Peter [Sun, 19 May 2013 22:38:23 +0000 (00:38 +0200)]
changed recovery_enabled and migration_status columns to integer and fix tests
Florin Peter [Sun, 19 May 2013 20:31:00 +0000 (22:31 +0200)]
update phpdoc
Florin Peter [Sun, 19 May 2013 20:30:03 +0000 (22:30 +0200)]
fix for webdav and wrong reference for findByStorageId
Florin Peter [Sun, 19 May 2013 20:28:48 +0000 (22:28 +0200)]
cleanup tests
Bernhard Posselt [Sun, 19 May 2013 18:25:39 +0000 (11:25 -0700)]
Merge pull request #3399 from owncloud/fix_js_for_ie
Michael Gapczynski [Sun, 19 May 2013 17:09:24 +0000 (10:09 -0700)]
Merge pull request #3421 from owncloud/pre_login_password
Lukas Reschke [Sun, 19 May 2013 11:33:33 +0000 (13:33 +0200)]
Add password to pre_login
Florin Peter [Sun, 19 May 2013 05:04:31 +0000 (07:04 +0200)]
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
Jenkins for ownCloud [Sun, 19 May 2013 00:01:55 +0000 (02:01 +0200)]
[tx-robot] updated from transifex
Florin Peter [Sat, 18 May 2013 20:33:31 +0000 (22:33 +0200)]
updated authors info
Florin Peter [Sat, 18 May 2013 20:25:47 +0000 (22:25 +0200)]
fixed again key-manager tests
Florin Peter [Sat, 18 May 2013 20:10:00 +0000 (22:10 +0200)]
changed migrationStatus to migration_status for pgsql
Florin Peter [Sat, 18 May 2013 20:00:35 +0000 (22:00 +0200)]
fixed key-manager tests
Florin Peter [Sat, 18 May 2013 19:37:00 +0000 (21:37 +0200)]
removed mockery from tests and changed class names
Florin Peter [Sat, 18 May 2013 19:12:53 +0000 (21:12 +0200)]
fixed typos
Björn Schießle [Sat, 18 May 2013 08:33:44 +0000 (10:33 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Sat, 18 May 2013 08:33:33 +0000 (10:33 +0200)]
display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
Jenkins for ownCloud [Sat, 18 May 2013 00:03:28 +0000 (02:03 +0200)]
[tx-robot] updated from transifex
Florin Peter [Fri, 17 May 2013 20:45:09 +0000 (22:45 +0200)]
improved tests
Florin Peter [Fri, 17 May 2013 20:44:45 +0000 (22:44 +0200)]
remove unused code
Florin Peter [Fri, 17 May 2013 20:16:56 +0000 (22:16 +0200)]
added folder move test
Florin Peter [Fri, 17 May 2013 19:59:53 +0000 (21:59 +0200)]
fix broken legacy tests
Björn Schießle [Fri, 17 May 2013 16:01:32 +0000 (18:01 +0200)]
fix path to class
Björn Schießle [Fri, 17 May 2013 15:29:32 +0000 (17:29 +0200)]
fix migration to new encryption
Björn Schießle [Fri, 17 May 2013 12:56:37 +0000 (14:56 +0200)]
re-add 3rdparty submodule
Björn Schießle [Fri, 17 May 2013 12:49:54 +0000 (14:49 +0200)]
some typo fixed
Björn Schießle [Fri, 17 May 2013 12:13:05 +0000 (14:13 +0200)]
gremove unused code
Björn Schießle [Fri, 17 May 2013 11:16:52 +0000 (13:16 +0200)]
set migration status after successful upgrade
Jörn Friedrich Dreyer [Fri, 17 May 2013 10:47:32 +0000 (12:47 +0200)]
cleanup after people who don't test in ie
Björn Schießle [Fri, 17 May 2013 09:20:17 +0000 (11:20 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Fri, 17 May 2013 09:15:36 +0000 (11:15 +0200)]
upgrade from old encryption to the new one needs to generate share keys too
FlorinPeter [Fri, 17 May 2013 08:55:28 +0000 (01:55 -0700)]
Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
Jenkins for ownCloud [Fri, 17 May 2013 00:07:36 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 16 May 2013 23:17:55 +0000 (01:17 +0200)]
revert changes
Florin Peter [Thu, 16 May 2013 23:20:02 +0000 (01:20 +0200)]
only connect share hooks if installation OC is installed
Florin Peter [Thu, 16 May 2013 23:17:55 +0000 (01:17 +0200)]
revert changes
Florin Peter [Thu, 16 May 2013 23:07:50 +0000 (01:07 +0200)]
added tests for recovery
Florin Peter [Thu, 16 May 2013 23:07:26 +0000 (01:07 +0200)]
improved tests
Florin Peter [Thu, 16 May 2013 22:58:41 +0000 (00:58 +0200)]
moved enable and disable recovery to Helper class for unit tests
Florin Peter [Thu, 16 May 2013 20:57:55 +0000 (22:57 +0200)]
fix for recover files in subfolder
Florin Peter [Thu, 16 May 2013 20:39:09 +0000 (22:39 +0200)]
fix typo in addRecoveryKeys
Björn Schießle [Thu, 16 May 2013 15:44:28 +0000 (17:44 +0200)]
add pre-shared hooks
Björn Schießle [Thu, 16 May 2013 14:01:40 +0000 (16:01 +0200)]
show nicer warning if the admin recovery password was wrong
Björn Schießle [Thu, 16 May 2013 13:19:53 +0000 (15:19 +0200)]
some error handling in case the recovery password is wrong
Björn Schießle [Thu, 16 May 2013 12:53:04 +0000 (14:53 +0200)]
allow admin to recover users files in case of password lost
blizzz [Thu, 16 May 2013 12:40:31 +0000 (05:40 -0700)]
Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
Jenkins for ownCloud [Thu, 16 May 2013 00:01:37 +0000 (02:01 +0200)]
[tx-robot] updated from transifex
Florin Peter [Wed, 15 May 2013 22:44:40 +0000 (00:44 +0200)]
improved tests for touch
Florin Peter [Wed, 15 May 2013 22:36:40 +0000 (00:36 +0200)]
added tests for put content, get content, touch and fopen
Florin Peter [Wed, 15 May 2013 22:34:45 +0000 (00:34 +0200)]
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
Florin Peter [Wed, 15 May 2013 22:31:17 +0000 (00:31 +0200)]
fix if file is not yet created
Florin Peter [Wed, 15 May 2013 22:30:01 +0000 (00:30 +0200)]
added test for share with group
Thomas Müller [Wed, 15 May 2013 22:02:01 +0000 (15:02 -0700)]
Merge pull request #3371 from owncloud/fix-3353
Thomas Mueller [Wed, 15 May 2013 21:43:46 +0000 (23:43 +0200)]
Merge branch 'master' into fix-3353
Thomas Müller [Wed, 15 May 2013 21:34:16 +0000 (14:34 -0700)]
Merge pull request #3374 from owncloud/vobject_compound_property
Thomas Mueller [Wed, 15 May 2013 20:44:15 +0000 (22:44 +0200)]
No unit test coverage reports for pgsql - this causes issues on Jenkins.
Florin Peter [Wed, 15 May 2013 20:42:22 +0000 (22:42 +0200)]
added test for rename folder
Thomas Müller [Wed, 15 May 2013 19:34:32 +0000 (12:34 -0700)]
Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point
Florin Peter [Wed, 15 May 2013 19:01:03 +0000 (21:01 +0200)]
removed unused code
Florin Peter [Wed, 15 May 2013 19:00:35 +0000 (21:00 +0200)]
added test for password change
Florin Peter [Wed, 15 May 2013 08:19:38 +0000 (10:19 +0200)]
fix for losing mount point "/"
Florin Peter [Wed, 15 May 2013 15:00:01 +0000 (17:00 +0200)]
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
Thomas Tanghus [Wed, 15 May 2013 16:56:54 +0000 (18:56 +0200)]
Add Compound property to avoid double escaping values.
Björn Schießle [Wed, 15 May 2013 15:57:18 +0000 (17:57 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Wed, 15 May 2013 15:56:45 +0000 (17:56 +0200)]
add recovery key to all files if the user enabled the feature and removes them again on disable
Florin Peter [Wed, 15 May 2013 15:00:01 +0000 (17:00 +0200)]
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
Björn Schießle [Wed, 15 May 2013 14:14:54 +0000 (16:14 +0200)]
added missing file to enable the admin to change the recovery key password
Björn Schießle [Wed, 15 May 2013 14:13:29 +0000 (16:13 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Wed, 15 May 2013 14:12:20 +0000 (16:12 +0200)]
enable admin to change the recovery password
Michael Gapczynski [Wed, 15 May 2013 13:33:38 +0000 (09:33 -0400)]
Fix finding mount in background watcher, fixes #3353
Michael Gapczynski [Wed, 15 May 2013 13:24:21 +0000 (06:24 -0700)]
Merge pull request #3366 from owncloud/contributing_add_contacts
Florin Peter [Wed, 15 May 2013 12:33:08 +0000 (14:33 +0200)]
fix for broken tests
Florin Peter [Wed, 15 May 2013 12:32:50 +0000 (14:32 +0200)]
fix for previous workaround
Björn Schießle [Wed, 15 May 2013 12:02:13 +0000 (14:02 +0200)]
check if the user knows the correct recovery password before changing the recovery key settings
Thomas Tanghus [Wed, 15 May 2013 11:53:15 +0000 (13:53 +0200)]
Add Contacts repo to CONTRIBUTING.md
Björn Schießle [Wed, 15 May 2013 09:42:41 +0000 (11:42 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Wed, 15 May 2013 09:42:22 +0000 (11:42 +0200)]
only let the user change the recovery admin settings if a key passwords was entered.
Florin Peter [Wed, 15 May 2013 08:52:23 +0000 (10:52 +0200)]
workaround for blank page need an other solution
Florin Peter [Wed, 15 May 2013 08:21:56 +0000 (10:21 +0200)]
improved files_encryption tests
Florin Peter [Wed, 15 May 2013 08:20:52 +0000 (10:20 +0200)]
removed FileProxy from test
Florin Peter [Wed, 15 May 2013 08:20:19 +0000 (10:20 +0200)]
merge changes for files_encryption
Florin Peter [Wed, 15 May 2013 08:19:38 +0000 (10:19 +0200)]
fix for losing mount point "/"
Florin Peter [Wed, 15 May 2013 08:18:25 +0000 (10:18 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Wed, 15 May 2013 01:22:06 +0000 (03:22 +0200)]
Merge branch 'master' into files_encryption
Florin Peter [Wed, 15 May 2013 00:38:08 +0000 (02:38 +0200)]
improved tests and added new tests for file rename and move
Florin Peter [Wed, 15 May 2013 00:36:23 +0000 (02:36 +0200)]
disabled FileProxy in Keymanager::getPrivateKey
projects / nextcloud-server.git / log