]>
source.dussan.org Git - nextcloud-server.git/log
Robin Appelman [Mon, 3 Jun 2013 11:39:34 +0000 (13:39 +0200)]
cast result to bool
Robin Appelman [Mon, 3 Jun 2013 11:33:56 +0000 (13:33 +0200)]
move phpdoc comments
Robin Appelman [Mon, 3 Jun 2013 11:19:01 +0000 (13:19 +0200)]
User: return backend result
Robin Appelman [Mon, 3 Jun 2013 11:17:03 +0000 (13:17 +0200)]
User: consisten variable naming
Robin Appelman [Mon, 3 Jun 2013 11:15:42 +0000 (13:15 +0200)]
User: remove determineDisplayName
Thomas Mueller [Fri, 31 May 2013 22:49:06 +0000 (00:49 +0200)]
adding PHPDoc comment to getManager()
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
Robin Appelman [Fri, 31 May 2013 22:35:16 +0000 (00:35 +0200)]
fix namespacing error
Robin Appelman [Fri, 31 May 2013 22:34:46 +0000 (00:34 +0200)]
fix undefined variables
Robin Appelman [Fri, 31 May 2013 20:51:16 +0000 (22:51 +0200)]
use single quotes
Florin Peter [Fri, 31 May 2013 19:30:13 +0000 (21:30 +0200)]
user should set into session before postLogin hook otherwise it will break not only the files_encryption app
Florin Peter [Fri, 31 May 2013 18:55:05 +0000 (20:55 +0200)]
fix broken tests
Robin Appelman [Fri, 31 May 2013 17:58:31 +0000 (19:58 +0200)]
Fix postLogin hook
Robin Appelman [Fri, 31 May 2013 16:18:13 +0000 (18:18 +0200)]
fix typo
Robin Appelman [Fri, 31 May 2013 15:42:51 +0000 (17:42 +0200)]
fix caching of user objects
Robin Appelman [Fri, 31 May 2013 15:31:27 +0000 (17:31 +0200)]
cache instances of \OC\User\User
Robin Appelman [Fri, 31 May 2013 14:35:51 +0000 (16:35 +0200)]
Merge branch 'master' into user
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
Jenkins for ownCloud [Fri, 31 May 2013 00:04:40 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
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'
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
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
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
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
Jenkins for ownCloud [Thu, 30 May 2013 00:34:14 +0000 (02:34 +0200)]
[tx-robot] updated from transifex
Florin Peter [Wed, 29 May 2013 23:38:11 +0000 (01:38 +0200)]
fix share and un-share for single file
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
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
Michael Gapczynski [Wed, 29 May 2013 22:22:54 +0000 (18:22 -0400)]
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
Michael Gapczynski [Wed, 29 May 2013 22:08:18 +0000 (18:08 -0400)]
Only retrieve the current user's permissions
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
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
Florin Peter [Wed, 29 May 2013 21:13:45 +0000 (23:13 +0200)]
reformat code
Florin Peter [Wed, 29 May 2013 21:11:30 +0000 (23:11 +0200)]
changed " to '
Florin Peter [Wed, 29 May 2013 18:41:07 +0000 (20:41 +0200)]
fixes for pgsql
Florin Peter [Wed, 29 May 2013 18:29:09 +0000 (20:29 +0200)]
Merge branch 'master' into remove_unused_vars
Florin Peter [Wed, 29 May 2013 18:27:12 +0000 (20:27 +0200)]
changed l10n to full sentences
Morris Jobke [Wed, 29 May 2013 18:21:48 +0000 (20:21 +0200)]
fix wrong signature delimiter - fix #3523
Florin Peter [Wed, 29 May 2013 18:15:04 +0000 (20:15 +0200)]
changed deprecated class
Florin Peter [Wed, 29 May 2013 18:11:53 +0000 (20:11 +0200)]
fixed typo
Florin Peter [Wed, 29 May 2013 18:11:13 +0000 (20:11 +0200)]
fixes if cache returns false
Florin Peter [Wed, 29 May 2013 17:58:05 +0000 (19:58 +0200)]
fix $parent/$source typo
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
Florin Peter [Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)]
Merge branch 'master' into file_encryption_external_storage_fixes
Florin Peter [Wed, 29 May 2013 17:11:39 +0000 (19:11 +0200)]
fix for share folder on external storage
icewind1991 [Wed, 29 May 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #3530 from owncloud/cache-mimeicon
Cache mimetype icons
Michael Gapczynski [Wed, 29 May 2013 14:56:28 +0000 (10:56 -0400)]
Style fixes
Michael Gapczynski [Wed, 29 May 2013 14:40:05 +0000 (10:40 -0400)]
Organize conditionals in a better order
Michael Gapczynski [Wed, 29 May 2013 14:19:03 +0000 (10:19 -0400)]
Only update metadata that has changed
Robin Appelman [Wed, 29 May 2013 13:43:41 +0000 (15:43 +0200)]
Cache mimetype icons
Björn Schießle [Wed, 29 May 2013 13:37:27 +0000 (15:37 +0200)]
fix indention
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
Björn Schießle [Wed, 29 May 2013 13:14:15 +0000 (15:14 +0200)]
remove unnecessary variable
Björn Schießle [Wed, 29 May 2013 12:40:47 +0000 (14:40 +0200)]
use public API for error handling; improved while condition
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
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
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
Florin Peter [Wed, 29 May 2013 10:47:50 +0000 (12:47 +0200)]
changes l10n after review
Florin Peter [Wed, 29 May 2013 10:23:33 +0000 (12:23 +0200)]
changes after review
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
Jenkins for ownCloud [Wed, 29 May 2013 00:10:54 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Tue, 28 May 2013 23:05:49 +0000 (01:05 +0200)]
Emit leacgy OC_User hooks
Robin Appelman [Tue, 28 May 2013 22:47:55 +0000 (00:47 +0200)]
fix setting getting active userid
Robin Appelman [Tue, 28 May 2013 22:47:44 +0000 (00:47 +0200)]
fix User->setHome when the backend action fails
Robin Appelman [Tue, 28 May 2013 22:32:10 +0000 (00:32 +0200)]
implement old user api on top of the new one
Robin Appelman [Tue, 28 May 2013 21:46:57 +0000 (23:46 +0200)]
New user management classes
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
Florin Peter [Tue, 28 May 2013 18:50:14 +0000 (20:50 +0200)]
fixed if fopen returns false typically on external storage
Robin Appelman [Tue, 28 May 2013 15:21:44 +0000 (17:21 +0200)]
didn't mean to commit this yet
Florin Peter [Tue, 28 May 2013 15:06:37 +0000 (17:06 +0200)]
fixed missing convert to new session handler
Florin Peter [Tue, 28 May 2013 15:04:44 +0000 (17:04 +0200)]
Merge branch 'sessionclass' of https://github.com/owncloud/core into sessionclass
Florin Peter [Tue, 28 May 2013 15:04:35 +0000 (17:04 +0200)]
fixed encryption session namespace to avoid problems
Robin Appelman [Tue, 28 May 2013 14:52:40 +0000 (16:52 +0200)]
implement ArrayInterface with Session
Robin Appelman [Tue, 28 May 2013 12:55:42 +0000 (14:55 +0200)]
merge master into sessionclass
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
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.
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
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
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
Björn Schießle [Tue, 28 May 2013 08:49:54 +0000 (10:49 +0200)]
$_POST["adminEnableRecovery"] is a string
Florin Peter [Tue, 28 May 2013 07:36:14 +0000 (09:36 +0200)]
fix for undefined index
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
Jenkins for ownCloud [Tue, 28 May 2013 00:07:51 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Mon, 27 May 2013 23:31:26 +0000 (01:31 +0200)]
fix syntax error
Robin Appelman [Mon, 27 May 2013 23:15:38 +0000 (01:15 +0200)]
provide a dummy session for CLI
Robin Appelman [Mon, 27 May 2013 23:13:36 +0000 (01:13 +0200)]
check fix if session start is successfull
Robin Appelman [Mon, 27 May 2013 23:10:18 +0000 (01:10 +0200)]
Fix session not working error
Robin Appelman [Mon, 27 May 2013 23:04:09 +0000 (01:04 +0200)]
Use the new session wrapper
Robin Appelman [Mon, 27 May 2013 22:50:00 +0000 (00:50 +0200)]
Abstract the session away in a class
Frank Karlitschek [Mon, 27 May 2013 20:45:47 +0000 (13:45 -0700)]
Merge pull request #3510 from owncloud/publicemitter
Add PublicEmitter class
Florin Peter [Mon, 27 May 2013 18:51:52 +0000 (20:51 +0200)]
changed to public log api
Florin Peter [Mon, 27 May 2013 18:44:38 +0000 (20:44 +0200)]
replace == with === and replace != with !==
Florin Peter [Mon, 27 May 2013 18:32:59 +0000 (20:32 +0200)]
changed basic auth to test user
Robin Appelman [Mon, 27 May 2013 18:20:06 +0000 (20:20 +0200)]
Add PublicEmitter class
kondou [Mon, 27 May 2013 18:13:13 +0000 (20:13 +0200)]
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
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
Björn Schießle [Mon, 27 May 2013 16:03:29 +0000 (18:03 +0200)]
replace == with ===
Björn Schießle [Mon, 27 May 2013 11:47:03 +0000 (13:47 +0200)]
legacyBlockDecryprt() needs to be public
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
Björn Schießle [Mon, 27 May 2013 10:02:27 +0000 (12:02 +0200)]
fix migration from old to new encryption
Florin Peter [Mon, 27 May 2013 15:26:58 +0000 (17:26 +0200)]
reformat code