Commit Graph

11516 Commits

Author SHA1 Message Date
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
Thomas Müller 54d3b381a8 Merge pull request #3430 from owncloud/vcategory_rename
Add rename() method to OC_VCategories.
2013-05-20 08:08:15 -07:00
Michael Gapczynski 09ff46eda2 Remove user name addition to paths in deleteAll 2013-05-20 10:21:55 -04:00
Michael Gapczynski ec475cbcfa Add data-dir attribute to home breadcrumb 2013-05-20 10:21:13 -04:00
Thomas Tanghus 946740a71f Add test for renaming non-existing category. 2013-05-20 13:57:18 +02:00
Thomas Tanghus c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Thomas Tanghus 38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus 27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +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 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
Michael Gapczynski fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04: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 e9b71eed69 Add tests for copying/moving between storages 2013-05-19 14:20:46 -04:00
Michael Gapczynski 41e2d64c86 Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem 2013-05-19 14:15:49 -04: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
Michael Gapczynski 9bebf9b4c8 Don't set Content-Length header if size is unknown 2013-05-17 14:14:12 -04: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
Thomas Tanghus c3779555aa Dialogs: Home folder icon instead of '/'. 2013-05-17 16:18:40 +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