]>
source.dussan.org Git - nextcloud-server.git/log
Bart Visscher [Fri, 24 May 2013 19:46:42 +0000 (21:46 +0200)]
Merge branch 'master' into doctrine
Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php
Thomas Müller [Fri, 24 May 2013 09:21:19 +0000 (02:21 -0700)]
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
Alessandro Cosentino [Fri, 24 May 2013 00:59:02 +0000 (20:59 -0400)]
small typo in the comments
Michael Gapczynski [Fri, 24 May 2013 00:35:11 +0000 (17:35 -0700)]
Merge pull request #3425 from owncloud/move-storages
Support for moving/copying folders between storages
Jenkins for ownCloud [Fri, 24 May 2013 00:02:43 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 23 May 2013 21:56:31 +0000 (23:56 +0200)]
fixes after review from @DeepDiver1975
Florin Peter [Thu, 23 May 2013 20:09:28 +0000 (22:09 +0200)]
added l10n support in apps/files_encryption/ajax/adminrecovery.php
Björn Schießle [Thu, 23 May 2013 19:18:31 +0000 (21:18 +0200)]
code clean up; nicer solution to solve the public link share problem if a user is logged in
Björn Schießle [Thu, 23 May 2013 18:30:07 +0000 (20:30 +0200)]
fix public link share if a user is logged in
Michael Gapczynski [Thu, 23 May 2013 14:25:12 +0000 (10:25 -0400)]
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
Michael Gapczynski [Thu, 23 May 2013 14:23:16 +0000 (10:23 -0400)]
Switch to calling deleteAll via storage to avoid emitting delete hook
Björn Schießle [Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)]
Merge branch 'master' into files_encryption
Jenkins for ownCloud [Thu, 23 May 2013 00:00:27 +0000 (02:00 +0200)]
[tx-robot] updated from transifex
Michael Gapczynski [Wed, 22 May 2013 22:20:15 +0000 (15:20 -0700)]
Merge pull request #3457 from owncloud/fix-share-links
Fix public links
Florin Peter [Wed, 22 May 2013 21:51:35 +0000 (23:51 +0200)]
added trash bin tests
Florin Peter [Wed, 22 May 2013 21:50:45 +0000 (23:50 +0200)]
added static function registerHooks() for better unit tests handling
Michael Gapczynski [Wed, 22 May 2013 19:02:11 +0000 (15:02 -0400)]
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
Björn Schießle [Wed, 22 May 2013 16:30:29 +0000 (18:30 +0200)]
revert changes to .gitmodules, they were applied by accident
Björn Schießle [Wed, 22 May 2013 16:28:44 +0000 (18:28 +0200)]
revert submodule changes
Björn Schießle [Wed, 22 May 2013 16:05:12 +0000 (18:05 +0200)]
settings clean-up; There is no blacklist in the new encryption app
Björn Schießle [Wed, 22 May 2013 16:01:18 +0000 (18:01 +0200)]
improved error messages
Björn Schießle [Wed, 22 May 2013 13:29:22 +0000 (15:29 +0200)]
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Thomas Müller [Wed, 22 May 2013 12:20:04 +0000 (05:20 -0700)]
Merge pull request #3337 from owncloud/oracle_fixes
Oracle fixes
Jörn Friedrich Dreyer [Wed, 8 May 2013 14:29:15 +0000 (16:29 +0200)]
cleanup codestyle
Jörn Friedrich Dreyer [Wed, 8 May 2013 14:18:24 +0000 (16:18 +0200)]
use to_char only for oracle, whitespace
Jörn Friedrich Dreyer [Mon, 29 Apr 2013 10:25:27 +0000 (12:25 +0200)]
add debug output
Jörn Friedrich Dreyer [Wed, 8 May 2013 13:30:04 +0000 (15:30 +0200)]
allow install when only oracle is available
Morris Jobke [Wed, 22 May 2013 10:00:04 +0000 (03:00 -0700)]
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
Jenkins for ownCloud [Wed, 22 May 2013 00:19:52 +0000 (02:19 +0200)]
[tx-robot] updated from transifex
Florin Peter [Wed, 22 May 2013 00:02:42 +0000 (02:02 +0200)]
fix pgsql error
Florin Peter [Tue, 21 May 2013 23:22:36 +0000 (01:22 +0200)]
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Florin Peter [Tue, 21 May 2013 22:55:16 +0000 (00:55 +0200)]
improved tests
Florin Peter [Tue, 21 May 2013 22:53:07 +0000 (00:53 +0200)]
fixed finding encrypted files in subfolders and removed unused code
Thomas Müller [Tue, 21 May 2013 22:21:25 +0000 (15:21 -0700)]
Merge pull request #3266 from owncloud/hooks
New hook system
Thomas Müller [Tue, 21 May 2013 22:17:08 +0000 (15:17 -0700)]
Merge pull request #1586 from owncloud/filecache_mtime
Emulate touch() for backends that don't support it
Robin Appelman [Tue, 21 May 2013 21:35:19 +0000 (23:35 +0200)]
merge master into filecache_mtime
Florin Peter [Tue, 21 May 2013 19:09:39 +0000 (21:09 +0200)]
added webdav test
Florin Peter [Tue, 21 May 2013 19:09:25 +0000 (21:09 +0200)]
fixed postFileSize
Jörn Friedrich Dreyer [Tue, 21 May 2013 16:15:22 +0000 (09:15 -0700)]
Merge pull request #3335 from owncloud/prevent-scan-loop
Prevent backgroundScan() from looping
Björn Schießle [Tue, 21 May 2013 13:30:19 +0000 (15:30 +0200)]
Merge branch 'master' into files_encryption
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
Björn Schießle [Tue, 21 May 2013 10:33:32 +0000 (12:33 +0200)]
fix path to 3rdparty apps
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
Jenkins for ownCloud [Tue, 21 May 2013 00:04:52 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
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
Thomas Müller [Mon, 20 May 2013 15:08:15 +0000 (08:08 -0700)]
Merge pull request #3430 from owncloud/vcategory_rename
Add rename() method to OC_VCategories.
Michael Gapczynski [Mon, 20 May 2013 14:21:55 +0000 (10:21 -0400)]
Remove user name addition to paths in deleteAll
Michael Gapczynski [Mon, 20 May 2013 14:21:13 +0000 (10:21 -0400)]
Add data-dir attribute to home breadcrumb
Thomas Tanghus [Mon, 20 May 2013 11:57:18 +0000 (13:57 +0200)]
Add test for renaming non-existing category.
Thomas Tanghus [Mon, 20 May 2013 11:56:57 +0000 (13:56 +0200)]
Remove debug output
Thomas Tanghus [Mon, 20 May 2013 08:16:07 +0000 (10:16 +0200)]
Add rename() method to OC_VCategories.
Thomas Tanghus [Mon, 20 May 2013 07:54:43 +0000 (09:54 +0200)]
Remove more obsolete code.
Thomas Tanghus [Mon, 20 May 2013 07:44:31 +0000 (09:44 +0200)]
Don't set image path in template.
Florin Peter [Mon, 20 May 2013 00:25:56 +0000 (02:25 +0200)]
Merge branch 'master' into files_encryption
Jenkins for ownCloud [Mon, 20 May 2013 00:10:11 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
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
Michael Gapczynski [Sun, 19 May 2013 19:04:41 +0000 (15:04 -0400)]
Fix undefined variable for copying empty folders
Bernhard Posselt [Sun, 19 May 2013 18:25:39 +0000 (11:25 -0700)]
Merge pull request #3399 from owncloud/fix_js_for_ie
cleanup after people who don't test in ie
Michael Gapczynski [Sun, 19 May 2013 18:20:46 +0000 (14:20 -0400)]
Add tests for copying/moving between storages
Michael Gapczynski [Sun, 19 May 2013 18:15:49 +0000 (14:15 -0400)]
Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
Michael Gapczynski [Sun, 19 May 2013 17:09:24 +0000 (10:09 -0700)]
Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
Lukas Reschke [Sun, 19 May 2013 11:33:33 +0000 (13:33 +0200)]
Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
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
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
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
Thomas Tanghus [Fri, 17 May 2013 14:18:40 +0000 (16:18 +0200)]
Dialogs: Home folder icon instead of '/'.
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