]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #3527 from owncloud/file_encryption_external_storage_fixes
FlorinPeter [Fri, 31 May 2013 10:21:46 +0000 (03:21 -0700)]
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes

File encryption external storage fixes

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 31 May 2013 00:04:40 +0000 (02:04 +0200)]
[tx-robot] updated from transifex

11 years agoadded our own file extension .part will not work here if we use file_get_contents...
Florin Peter [Thu, 30 May 2013 20:07:36 +0000 (22:07 +0200)]
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'

11 years agoprevent files_versions from calling file proxy which calls files_encryption and do...
Florin Peter [Thu, 30 May 2013 20:05:52 +0000 (22:05 +0200)]
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations

11 years agoLDAP: fix generation of alternate internal name on conflicts. Use also smaller number...
Arthur Schiwon [Thu, 30 May 2013 12:14:43 +0000 (14:14 +0200)]
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links

11 years agoMerge pull request #3509 from owncloud/update_jquery_to_1_10
Jörn Friedrich Dreyer [Thu, 30 May 2013 13:00:52 +0000 (06:00 -0700)]
Merge pull request #3509 from owncloud/update_jquery_to_1_10

Update jquery to 1.10.0 and add jquery-migrate 1.2.1

11 years agoMerge pull request #3529 from owncloud/folder-permissions
icewind1991 [Thu, 30 May 2013 12:54:29 +0000 (05:54 -0700)]
Merge pull request #3529 from owncloud/folder-permissions

Cache: provide a function to get the permissions of all files in a folder with one query

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 30 May 2013 00:34:14 +0000 (02:34 +0200)]
[tx-robot] updated from transifex

11 years agofix share and un-share for single file
Florin Peter [Wed, 29 May 2013 23:38:11 +0000 (01:38 +0200)]
fix share and un-share for single file

11 years agofixed problems with file_get_contents and file_put_contents this problem was related...
Florin Peter [Wed, 29 May 2013 23:13:22 +0000 (01:13 +0200)]
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files

11 years agoMerge branch 'master' into file_encryption_external_storage_fixes
Florin Peter [Wed, 29 May 2013 22:45:29 +0000 (00:45 +0200)]
Merge branch 'master' into file_encryption_external_storage_fixes

Conflicts:
apps/files_encryption/hooks/hooks.php

11 years agoImplement getDirectoryPermissions() in Shared Permissions, fixes #2846
Michael Gapczynski [Wed, 29 May 2013 22:22:54 +0000 (18:22 -0400)]
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846

11 years agoOnly retrieve the current user's permissions
Michael Gapczynski [Wed, 29 May 2013 22:08:18 +0000 (18:08 -0400)]
Only retrieve the current user's permissions

11 years agoMerge pull request #3533 from owncloud/signature-delimiter
Thomas Tanghus [Wed, 29 May 2013 21:58:00 +0000 (14:58 -0700)]
Merge pull request #3533 from owncloud/signature-delimiter

fix wrong signature delimiter - fix #3523

11 years agoMerge pull request #3507 from owncloud/remove_unused_vars
Morris Jobke [Wed, 29 May 2013 21:46:04 +0000 (14:46 -0700)]
Merge pull request #3507 from owncloud/remove_unused_vars

remove unused varaibles

11 years agoreformat code
Florin Peter [Wed, 29 May 2013 21:13:45 +0000 (23:13 +0200)]
reformat code

11 years agochanged " to '
Florin Peter [Wed, 29 May 2013 21:11:30 +0000 (23:11 +0200)]
changed " to '

11 years agofixes for pgsql
Florin Peter [Wed, 29 May 2013 18:41:07 +0000 (20:41 +0200)]
fixes for pgsql

11 years agoMerge branch 'master' into remove_unused_vars
Florin Peter [Wed, 29 May 2013 18:29:09 +0000 (20:29 +0200)]
Merge branch 'master' into remove_unused_vars

11 years agochanged l10n to full sentences
Florin Peter [Wed, 29 May 2013 18:27:12 +0000 (20:27 +0200)]
changed l10n to full sentences

11 years agofix wrong signature delimiter - fix #3523
Morris Jobke [Wed, 29 May 2013 18:21:48 +0000 (20:21 +0200)]
fix wrong signature delimiter - fix #3523

11 years agochanged deprecated class
Florin Peter [Wed, 29 May 2013 18:15:04 +0000 (20:15 +0200)]
changed deprecated class

11 years agofixed typo
Florin Peter [Wed, 29 May 2013 18:11:53 +0000 (20:11 +0200)]
fixed typo

11 years agofixes if cache returns false
Florin Peter [Wed, 29 May 2013 18:11:13 +0000 (20:11 +0200)]
fixes if cache returns false

11 years agofix $parent/$source typo
Florin Peter [Wed, 29 May 2013 17:58:05 +0000 (19:58 +0200)]
fix $parent/$source typo

11 years agoMerge pull request #3532 from owncloud/scan-update
Michael Gapczynski [Wed, 29 May 2013 17:23:41 +0000 (10:23 -0700)]
Merge pull request #3532 from owncloud/scan-update

Only update metadata that has changed

11 years agoMerge branch 'master' into file_encryption_external_storage_fixes
Florin Peter [Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)]
Merge branch 'master' into file_encryption_external_storage_fixes

11 years agofix for share folder on external storage
Florin Peter [Wed, 29 May 2013 17:11:39 +0000 (19:11 +0200)]
fix for share folder on external storage

11 years agoMerge pull request #3530 from owncloud/cache-mimeicon
icewind1991 [Wed, 29 May 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #3530 from owncloud/cache-mimeicon

Cache mimetype icons

11 years agoStyle fixes
Michael Gapczynski [Wed, 29 May 2013 14:56:28 +0000 (10:56 -0400)]
Style fixes

11 years agoOrganize conditionals in a better order
Michael Gapczynski [Wed, 29 May 2013 14:40:05 +0000 (10:40 -0400)]
Organize conditionals in a better order

11 years agoOnly update metadata that has changed
Michael Gapczynski [Wed, 29 May 2013 14:19:03 +0000 (10:19 -0400)]
Only update metadata that has changed

11 years agoCache mimetype icons
Robin Appelman [Wed, 29 May 2013 13:43:41 +0000 (15:43 +0200)]
Cache mimetype icons

11 years agofix indention
Björn Schießle [Wed, 29 May 2013 13:37:27 +0000 (15:37 +0200)]
fix indention

11 years agoCache: provide a function to get the permissions of all files in a folder with one...
Robin Appelman [Wed, 29 May 2013 13:25:42 +0000 (15:25 +0200)]
Cache: provide a function to get the permissions of all files in a folder with one query

11 years agoremove unnecessary variable
Björn Schießle [Wed, 29 May 2013 13:14:15 +0000 (15:14 +0200)]
remove unnecessary variable

11 years agouse public API for error handling; improved while condition
Björn Schießle [Wed, 29 May 2013 12:40:47 +0000 (14:40 +0200)]
use public API for error handling; improved while condition

11 years agofor external storages we never reach the path 'files', instead we need to leave the...
Björn Schießle [Wed, 29 May 2013 12:19:18 +0000 (14:19 +0200)]
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists

11 years agoif one public link share was found, we don't have to check it for the other folders
Björn Schießle [Wed, 29 May 2013 11:12:30 +0000 (13:12 +0200)]
if one public link share was found, we don't have to check it for the other folders

11 years agocheck list of users with access to the file from the bottom to the top. This way...
Björn Schießle [Wed, 29 May 2013 11:10:26 +0000 (13:10 +0200)]
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages

11 years agochanges l10n after review
Florin Peter [Wed, 29 May 2013 10:47:50 +0000 (12:47 +0200)]
changes l10n after review

11 years agochanges after review
Florin Peter [Wed, 29 May 2013 10:23:33 +0000 (12:23 +0200)]
changes after review

11 years agoMerge branch 'master' into remove_unused_vars
Florin Peter [Wed, 29 May 2013 07:21:00 +0000 (09:21 +0200)]
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 29 May 2013 00:10:54 +0000 (02:10 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3511 from owncloud/sessionclass
icewind1991 [Tue, 28 May 2013 20:37:39 +0000 (13:37 -0700)]
Merge pull request #3511 from owncloud/sessionclass

Abstract session access away in a class

11 years agofixed if fopen returns false typically on external storage
Florin Peter [Tue, 28 May 2013 18:50:14 +0000 (20:50 +0200)]
fixed if fopen returns false typically on external storage

11 years agodidn't mean to commit this yet
Robin Appelman [Tue, 28 May 2013 15:21:44 +0000 (17:21 +0200)]
didn't mean to commit this yet

11 years agofixed missing convert to new session handler
Florin Peter [Tue, 28 May 2013 15:06:37 +0000 (17:06 +0200)]
fixed missing convert to new session handler

11 years agoMerge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass
Florin Peter [Tue, 28 May 2013 15:04:44 +0000 (17:04 +0200)]
Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass

11 years agofixed encryption session namespace to avoid problems
Florin Peter [Tue, 28 May 2013 15:04:35 +0000 (17:04 +0200)]
fixed encryption session namespace to avoid problems

11 years agoimplement ArrayInterface with Session
Robin Appelman [Tue, 28 May 2013 14:52:40 +0000 (16:52 +0200)]
implement ArrayInterface with Session

11 years agomerge master into sessionclass
Robin Appelman [Tue, 28 May 2013 12:55:42 +0000 (14:55 +0200)]
merge master into sessionclass

11 years agoMerge pull request #3179 from pawl/patch-1
Jörn Friedrich Dreyer [Tue, 28 May 2013 12:18:43 +0000 (05:18 -0700)]
Merge pull request #3179 from pawl/patch-1

Improve IE Compatibility

11 years agoMerge pull request #2778 from Kondou-ger/optimize_pictures
Jörn Friedrich Dreyer [Tue, 28 May 2013 11:48:38 +0000 (04:48 -0700)]
Merge pull request #2778 from Kondou-ger/optimize_pictures

Optimize pictures with optipng.

11 years agoMerge pull request #3488 from zafi/master
blizzz [Tue, 28 May 2013 09:39:02 +0000 (02:39 -0700)]
Merge pull request #3488 from zafi/master

The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD

11 years agoMerge branch 'master' into remove_unused_vars
Florin Peter [Tue, 28 May 2013 09:00:49 +0000 (11:00 +0200)]
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php

11 years agoMerge pull request #3512 from owncloud/file_encryption_session_fix
FlorinPeter [Tue, 28 May 2013 08:55:55 +0000 (01:55 -0700)]
Merge pull request #3512 from owncloud/file_encryption_session_fix

fix for losing private key while being logged in and accessing a public link

11 years ago$_POST["adminEnableRecovery"] is a string
Björn Schießle [Tue, 28 May 2013 08:49:54 +0000 (10:49 +0200)]
$_POST["adminEnableRecovery"] is a string

11 years agofix for undefined index
Florin Peter [Tue, 28 May 2013 07:36:14 +0000 (09:36 +0200)]
fix for undefined index

11 years agofix for losing private key while being logged in and accessing a public link
Florin Peter [Tue, 28 May 2013 07:27:04 +0000 (09:27 +0200)]
fix for losing private key while being logged in and accessing a public link

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 28 May 2013 00:07:51 +0000 (02:07 +0200)]
[tx-robot] updated from transifex

11 years agofix syntax error
Robin Appelman [Mon, 27 May 2013 23:31:26 +0000 (01:31 +0200)]
fix syntax error

11 years agoprovide a dummy session for CLI
Robin Appelman [Mon, 27 May 2013 23:15:38 +0000 (01:15 +0200)]
provide a dummy session for CLI

11 years agocheck fix if session start is successfull
Robin Appelman [Mon, 27 May 2013 23:13:36 +0000 (01:13 +0200)]
check fix if session start is successfull

11 years agoFix session not working error
Robin Appelman [Mon, 27 May 2013 23:10:18 +0000 (01:10 +0200)]
Fix session not working error

11 years agoUse the new session wrapper
Robin Appelman [Mon, 27 May 2013 23:04:09 +0000 (01:04 +0200)]
Use the new session wrapper

11 years agoAbstract the session away in a class
Robin Appelman [Mon, 27 May 2013 22:50:00 +0000 (00:50 +0200)]
Abstract the session away in a class

11 years agoMerge pull request #3510 from owncloud/publicemitter
Frank Karlitschek [Mon, 27 May 2013 20:45:47 +0000 (13:45 -0700)]
Merge pull request #3510 from owncloud/publicemitter

Add PublicEmitter class

11 years agochanged to public log api
Florin Peter [Mon, 27 May 2013 18:51:52 +0000 (20:51 +0200)]
changed to public log api

11 years agoreplace == with === and replace != with !==
Florin Peter [Mon, 27 May 2013 18:44:38 +0000 (20:44 +0200)]
replace == with === and replace != with !==

11 years agochanged basic auth to test user
Florin Peter [Mon, 27 May 2013 18:32:59 +0000 (20:32 +0200)]
changed basic auth to test user

11 years agoAdd PublicEmitter class
Robin Appelman [Mon, 27 May 2013 18:20:06 +0000 (20:20 +0200)]
Add PublicEmitter class

11 years agoUpdate jquery to 1.10.0 & add jquery-migrate 1.2.1
kondou [Mon, 27 May 2013 18:13:13 +0000 (20:13 +0200)]
Update jquery to 1.10.0 & add jquery-migrate 1.2.1

11 years agoMerge branch 'master' into remove_unused_vars
Björn Schießle [Mon, 27 May 2013 16:09:35 +0000 (18:09 +0200)]
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php

11 years agoreplace == with ===
Björn Schießle [Mon, 27 May 2013 16:03:29 +0000 (18:03 +0200)]
replace == with ===

11 years agolegacyBlockDecryprt() needs to be public
Björn Schießle [Mon, 27 May 2013 11:47:03 +0000 (13:47 +0200)]
legacyBlockDecryprt() needs to be public

11 years agomake legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
Björn Schießle [Mon, 27 May 2013 10:21:39 +0000 (12:21 +0200)]
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes

11 years agofix migration from old to new encryption
Björn Schießle [Mon, 27 May 2013 10:02:27 +0000 (12:02 +0200)]
fix migration from old to new encryption

11 years agoreformat code
Florin Peter [Mon, 27 May 2013 15:26:58 +0000 (17:26 +0200)]
reformat code

11 years agoMerge branch 'master' into remove_unused_vars
Florin Peter [Mon, 27 May 2013 15:26:35 +0000 (17:26 +0200)]
Merge branch 'master' into remove_unused_vars

Conflicts:
apps/files_encryption/lib/util.php

11 years agoMerge pull request #3506 from owncloud/fix_3320
Björn Schießle [Mon, 27 May 2013 15:04:55 +0000 (08:04 -0700)]
Merge pull request #3506 from owncloud/fix_3320

fix https://github.com/owncloud/core/issues/3320

11 years agoMerge pull request #3495 from owncloud/file_encryption_util_is_error
Thomas Tanghus [Mon, 27 May 2013 14:56:12 +0000 (07:56 -0700)]
Merge pull request #3495 from owncloud/file_encryption_util_is_error

added OC_DB::isError and logging for #3486

11 years agoMerge pull request #3412 from owncloud/fix_2013
Michael Gapczynski [Mon, 27 May 2013 14:44:35 +0000 (07:44 -0700)]
Merge pull request #3412 from owncloud/fix_2013

Don't set Content-Length header if size is unknown

11 years agoadd event.preventDefault to undelete function
Georg Ehrke [Mon, 27 May 2013 14:37:43 +0000 (16:37 +0200)]
add event.preventDefault to undelete function

11 years agofix tests, after unused variables are removed
Björn Schießle [Mon, 27 May 2013 13:34:57 +0000 (15:34 +0200)]
fix tests, after unused variables are removed

11 years agoremove unused varaibles
Björn Schießle [Mon, 27 May 2013 13:31:26 +0000 (15:31 +0200)]
remove unused varaibles

11 years agofix https://github.com/owncloud/core/issues/3320
Georg Ehrke [Mon, 27 May 2013 13:24:37 +0000 (15:24 +0200)]
fix https://github.com/owncloud/core/issues/3320

11 years agoMerge branch 'master' into file_encryption_util_is_error
Florin Peter [Mon, 27 May 2013 12:41:53 +0000 (14:41 +0200)]
Merge branch 'master' into file_encryption_util_is_error

Conflicts:
apps/files_encryption/lib/util.php

11 years agoMerge pull request #3481 from owncloud/firsttime_enc
Björn Schießle [Mon, 27 May 2013 12:17:31 +0000 (05:17 -0700)]
Merge pull request #3481 from owncloud/firsttime_enc

fix first time encryption after app was enabled

11 years agoMerge pull request #3496 from owncloud/file_encryption_tests
FlorinPeter [Mon, 27 May 2013 12:15:21 +0000 (05:15 -0700)]
Merge pull request #3496 from owncloud/file_encryption_tests

improved tests for files_encryption

11 years agoMerge branch 'master' into file_encryption_tests
Florin Peter [Mon, 27 May 2013 10:54:33 +0000 (12:54 +0200)]
Merge branch 'master' into file_encryption_tests

11 years agoadded check by numRows()
Florin Peter [Mon, 27 May 2013 10:41:55 +0000 (12:41 +0200)]
added check by numRows()
changed to public api where it was possible
reformat code to comply with the coding guidelines

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 27 May 2013 00:07:24 +0000 (02:07 +0200)]
[tx-robot] updated from transifex

11 years agoadded users for tests
Florin Peter [Sun, 26 May 2013 18:44:15 +0000 (20:44 +0200)]
added users for tests
reformat code to meet coding guidelines

11 years agoimproved test
Florin Peter [Sun, 26 May 2013 01:22:16 +0000 (03:22 +0200)]
improved test
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 May 2013 00:03:54 +0000 (02:03 +0200)]
[tx-robot] updated from transifex

11 years agofixed error rising from fetchRow
Florin Peter [Sat, 25 May 2013 21:07:19 +0000 (23:07 +0200)]
fixed error rising from fetchRow

11 years agoadded OC_DB::isError and logging
Florin Peter [Sat, 25 May 2013 19:33:05 +0000 (21:33 +0200)]
added OC_DB::isError and logging

11 years agoMerge pull request #3478 from davidak/master
Michael Gapczynski [Sat, 25 May 2013 18:21:21 +0000 (11:21 -0700)]
Merge pull request #3478 from davidak/master

small typo fix: added 2 whitespaces

11 years agoMerge pull request #3388 from roha4000/master
Michael Gapczynski [Sat, 25 May 2013 18:18:20 +0000 (11:18 -0700)]
Merge pull request #3388 from roha4000/master

Duplicate DB entries in filecache table when renaming folder in WebUI #2