]>
source.dussan.org Git - nextcloud-server.git/log
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
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
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
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
Florin Peter [Wed, 15 May 2013 20:42:22 +0000 (22:42 +0200)]
added test for rename folder
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
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
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
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
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
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
Florin Peter [Wed, 15 May 2013 00:34:36 +0000 (02:34 +0200)]
prevent of infinite loop with FileProxy
Florin Peter [Wed, 15 May 2013 00:32:27 +0000 (02:32 +0200)]
added setter for filesystem view
this is needed because there is no possibility to set $defaultInstance to false after filesystem::init
Jenkins for ownCloud [Wed, 15 May 2013 00:02:45 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Florin Peter [Tue, 14 May 2013 21:19:16 +0000 (23:19 +0200)]
fix for move file to an empty folder
Florin Peter [Tue, 14 May 2013 20:32:39 +0000 (22:32 +0200)]
fix for Allowed memory size of xx bytes exhausted while reading big files
Thomas Müller [Tue, 14 May 2013 20:13:16 +0000 (13:13 -0700)]
Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
fix allowed rename of folder in root directory to reserved name "Shared"
Florin Peter [Tue, 14 May 2013 19:29:24 +0000 (21:29 +0200)]
fix for zero size files
Björn Schießle [Tue, 14 May 2013 18:06:53 +0000 (20:06 +0200)]
fix history template, print_unescaped() needs to include closing tags
Florin Peter [Tue, 14 May 2013 18:11:07 +0000 (20:11 +0200)]
fix for public link share
Raghu Nayyar [Tue, 14 May 2013 16:52:54 +0000 (09:52 -0700)]
Merge pull request #3338 from owncloud/button_color_fix
Keeping Font Colors Consistant on the headers.
Morris Jobke [Tue, 14 May 2013 13:16:30 +0000 (06:16 -0700)]
Merge pull request #3330 from owncloud/preselect_filename_on_rename
peselect filename without extension on rename
Morris Jobke [Tue, 14 May 2013 10:49:23 +0000 (12:49 +0200)]
[files] add private declaration of $view
raghunayyar [Tue, 14 May 2013 05:37:12 +0000 (11:07 +0530)]
color change to crumb elements as well.
Jenkins for ownCloud [Tue, 14 May 2013 00:04:01 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
Florin Peter [Mon, 13 May 2013 22:00:20 +0000 (00:00 +0200)]
added test for public shared file via link
Florin Peter [Mon, 13 May 2013 20:49:27 +0000 (22:49 +0200)]
added post_deleteUser hook for cleanup public key
Florin Peter [Mon, 13 May 2013 20:34:11 +0000 (22:34 +0200)]
added post_createUser hook
Florin Peter [Mon, 13 May 2013 19:24:59 +0000 (21:24 +0200)]
added handling for public file access via files_sharing link
Florin Peter [Mon, 13 May 2013 19:22:59 +0000 (21:22 +0200)]
removed var_dump
raghunayyar [Mon, 13 May 2013 17:42:05 +0000 (23:12 +0530)]
Keeping Font Colors Consistant on the headers.
Björn Schießle [Mon, 13 May 2013 15:40:57 +0000 (17:40 +0200)]
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
Björn Schießle [Mon, 13 May 2013 15:26:21 +0000 (17:26 +0200)]
don't create a recovery user, only generate recovery key similar to the public link share key
Morris Jobke [Mon, 13 May 2013 15:12:57 +0000 (08:12 -0700)]
Merge pull request #3303 from owncloud/update_etags_on_restore
Make sure that etags get updated once a file gets retored from the trash bin
Bernhard Posselt [Mon, 13 May 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #3329 from owncloud/increase_lock_timeout
Set the SQLite database lock timeout to 60 seconds which is the default ...
Jörn Friedrich Dreyer [Mon, 13 May 2013 13:54:45 +0000 (15:54 +0200)]
peselect filename without extension on rename
Björn Schießle [Mon, 13 May 2013 13:45:30 +0000 (15:45 +0200)]
if file was shared to user than userIds is just the users Id
Björn Schießle [Mon, 13 May 2013 13:15:35 +0000 (15:15 +0200)]
generate random key name for share key to avoid name conflicts
Lukas Reschke [Mon, 13 May 2013 12:45:38 +0000 (05:45 -0700)]
Merge pull request #3326 from owncloud/fix-3321
Add requesttoken to guest view
Björn Schießle [Mon, 13 May 2013 12:28:45 +0000 (14:28 +0200)]
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
Lukas Reschke [Mon, 13 May 2013 12:23:56 +0000 (14:23 +0200)]
Add requesttoken to guest view
Should fix #3321
Björn Schießle [Mon, 13 May 2013 08:48:06 +0000 (10:48 +0200)]
Merge branch 'master' into update_etags_on_restore
Morris Jobke [Mon, 13 May 2013 07:42:13 +0000 (00:42 -0700)]
Merge pull request #3235 from NCTU-NBA/pr-langcode
Modify zh_* language codes
Frank Karlitschek [Mon, 13 May 2013 00:42:18 +0000 (02:42 +0200)]
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
Jenkins for ownCloud [Mon, 13 May 2013 00:10:20 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
Pellaeon Lin [Sun, 12 May 2013 14:32:22 +0000 (22:32 +0800)]
Merge remote-tracking branch 'upstream/master' into pr-langcode
Morris Jobke [Sun, 12 May 2013 11:02:01 +0000 (13:02 +0200)]
[files] fix mock creation and remove hardcoded 'require' statement
Morris Jobke [Sun, 12 May 2013 10:28:18 +0000 (03:28 -0700)]
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
disable mbstring.func_overload in setup v.3
Morris Jobke [Wed, 8 May 2013 09:56:59 +0000 (11:56 +0200)]
[files] rename lib to "App"
Morris Jobke [Tue, 7 May 2013 14:04:12 +0000 (16:04 +0200)]
[files] ownCloud typo
Morris Jobke [Tue, 7 May 2013 13:24:26 +0000 (15:24 +0200)]
[files] rename test class and add rename test
Morris Jobke [Tue, 7 May 2013 13:21:43 +0000 (15:21 +0200)]
[files] remove realpath in test
Morris Jobke [Tue, 7 May 2013 11:37:20 +0000 (13:37 +0200)]
[files] rename tests
Morris Jobke [Tue, 7 May 2013 11:36:29 +0000 (13:36 +0200)]
[files] remove normalizePath on rename and dependency injection
Morris Jobke [Mon, 6 May 2013 18:59:26 +0000 (20:59 +0200)]
[files] kill stripslashes
Morris Jobke [Mon, 6 May 2013 18:53:41 +0000 (20:53 +0200)]
[files] fix typos
Morris Jobke [Mon, 6 May 2013 18:45:04 +0000 (20:45 +0200)]
[files] refactoring
Morris Jobke [Tue, 9 Apr 2013 11:54:01 +0000 (13:54 +0200)]
string comparision
Morris Jobke [Tue, 9 Apr 2013 11:44:54 +0000 (13:44 +0200)]
wrong root dir name
Morris Jobke [Tue, 9 Apr 2013 11:31:12 +0000 (13:31 +0200)]
fix allowed rename of folder in root directory to reserved name "Shared"
refs #2159
Lukas Reschke [Sun, 12 May 2013 09:40:30 +0000 (02:40 -0700)]
Merge pull request #3290 from owncloud/config-data
Move config data to template
Thomas Tanghus [Sun, 12 May 2013 08:56:32 +0000 (10:56 +0200)]
disable mbstring.func_overload in setup
Lukas Reschke [Sat, 11 May 2013 19:08:26 +0000 (21:08 +0200)]
Typo
Lukas Reschke [Sat, 11 May 2013 19:07:05 +0000 (21:07 +0200)]
Get config from template
Jenkins for ownCloud [Sun, 12 May 2013 00:05:29 +0000 (02:05 +0200)]
[tx-robot] updated from transifex
icewind1991 [Sat, 11 May 2013 21:22:08 +0000 (14:22 -0700)]
Merge pull request #3309 from owncloud/no_explicit_autoload
Use new autoloader class in tests