]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #3648 from owncloud/sql_limit_as_param
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 09:48:15 +0000 (02:48 -0700)]
Merge pull request #3648 from owncloud/sql_limit_as_param

convert LIMIT to parameter

11 years agoMerge pull request #3610 from owncloud/encryption_recovery_for_ldap
Björn Schießle [Mon, 10 Jun 2013 09:03:56 +0000 (02:03 -0700)]
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap

recover encryption keys if ownCloud can't change the log-in password

11 years agoconvert LIMIT to parameter
Jörn Friedrich Dreyer [Mon, 10 Jun 2013 08:04:52 +0000 (10:04 +0200)]
convert LIMIT to parameter

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 10 Jun 2013 00:06:36 +0000 (02:06 +0200)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Jun 2013 00:06:21 +0000 (02:06 +0200)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 8 Jun 2013 00:13:41 +0000 (02:13 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #2919 from owncloud/hook-improvements
Michael Gapczynski [Fri, 7 Jun 2013 13:35:50 +0000 (06:35 -0700)]
Merge pull request #2919 from owncloud/hook-improvements

Hook improvements

11 years agoMerge pull request #3628 from owncloud/update_3rdparty_submodule
Morris Jobke [Fri, 7 Jun 2013 09:43:22 +0000 (02:43 -0700)]
Merge pull request #3628 from owncloud/update_3rdparty_submodule

update 3rdparty submodule

11 years agoupdate 3rdparty submodule
Georg Ehrke [Fri, 7 Jun 2013 08:44:16 +0000 (10:44 +0200)]
update 3rdparty submodule

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 7 Jun 2013 00:17:50 +0000 (02:17 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3622 from owncloud/read-extfx-confg-from-home
Thomas Müller [Thu, 6 Jun 2013 23:19:48 +0000 (16:19 -0700)]
Merge pull request #3622 from owncloud/read-extfx-confg-from-home

Read configuratons for external filesystem test from a private place.

11 years agoRead configuratons for external filesystem test from a private place.
Thomas Mueller [Thu, 6 Jun 2013 22:04:46 +0000 (00:04 +0200)]
Read configuratons for external filesystem test from a private place.

This will help not to accidentially push private data and enable testing on our ci server.

11 years agouse pre_setPassword hook to update the encryption keys if the back-end doesn't suppor...
Björn Schießle [Thu, 6 Jun 2013 11:32:02 +0000 (13:32 +0200)]
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened

11 years agoalways emit the preSetPassword hook, this should only indicate the intention. Finally...
Björn Schießle [Thu, 6 Jun 2013 11:30:18 +0000 (13:30 +0200)]
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not

11 years agoadd hint about what the recovery password field is for
Björn Schießle [Thu, 6 Jun 2013 10:26:05 +0000 (12:26 +0200)]
add hint about what the recovery password field is for

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 6 Jun 2013 00:21:31 +0000 (02:21 +0200)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 5 Jun 2013 00:01:42 +0000 (02:01 +0200)]
[tx-robot] updated from transifex

11 years agoMerge branch 'master' into hook-improvements
Michael Gapczynski [Tue, 4 Jun 2013 22:19:08 +0000 (18:19 -0400)]
Merge branch 'master' into hook-improvements

Conflicts:
lib/files/view.php

11 years agoMerge pull request #3594 from opensaucesystems/patch-1
Thomas Müller [Tue, 4 Jun 2013 21:01:09 +0000 (14:01 -0700)]
Merge pull request #3594 from opensaucesystems/patch-1

Added input[type="url"] to styles.css

11 years agoexclude 3rdparty folder within files_external and files_encryption from code coverage
Thomas Mueller [Tue, 4 Jun 2013 20:41:52 +0000 (22:41 +0200)]
exclude 3rdparty folder within files_external and files_encryption from code coverage

11 years agoAdded input[type="url"] to styles.css
opensaucesystems [Tue, 4 Jun 2013 14:04:29 +0000 (16:04 +0200)]
Added input[type="url"] to styles.css

11 years agoLDAP: append port when URL is passed in LDAP Host configuration, fixes #2600
Arthur Schiwon [Mon, 3 Jun 2013 21:07:32 +0000 (23:07 +0200)]
LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 4 Jun 2013 00:31:06 +0000 (02:31 +0200)]
[tx-robot] updated from transifex

11 years agoignore l10n folder within remaining apps
Thomas Mueller [Mon, 3 Jun 2013 22:04:17 +0000 (00:04 +0200)]
ignore l10n folder within remaining apps

11 years agoCache Test: set datadir to temporary location, otherwise initmountpoints will access...
Arthur Schiwon [Fri, 26 Apr 2013 20:14:38 +0000 (22:14 +0200)]
Cache Test: set datadir to temporary location, otherwise initmountpoints will access to productive location

11 years agoCache: mount user mountpoints to make sure that // exists before accessing it. Fixes...
Arthur Schiwon [Fri, 26 Apr 2013 11:20:12 +0000 (13:20 +0200)]
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374

11 years agoMerge pull request #3444 from owncloud/share-fix
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 18:35:06 +0000 (11:35 -0700)]
Merge pull request #3444 from owncloud/share-fix

Fix undefined index for share mount point retrieval

11 years agoMerge pull request #3581 from owncloud/publicphp_maintenance
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 18:26:56 +0000 (11:26 -0700)]
Merge pull request #3581 from owncloud/publicphp_maintenance

public.php - check if maintenance mode is enabled

11 years agoMerge pull request #3561 from owncloud/user
icewind1991 [Mon, 3 Jun 2013 15:13:40 +0000 (08:13 -0700)]
Merge pull request #3561 from owncloud/user

Refactor of user management

11 years agoMerge pull request #3578 from owncloud/ocdialog
Thomas Tanghus [Mon, 3 Jun 2013 13:37:27 +0000 (06:37 -0700)]
Merge pull request #3578 from owncloud/ocdialog

Replacement for jquery.dialog to fit better with ownCloud design.

11 years agoExclude apps/files/l10n from coverage reports
Thomas Müller [Mon, 3 Jun 2013 12:50:36 +0000 (14:50 +0200)]
Exclude apps/files/l10n from coverage reports

11 years agoalso clear cached users when removing a single backend
Robin Appelman [Mon, 3 Jun 2013 12:19:17 +0000 (14:19 +0200)]
also clear cached users when removing a single backend

11 years agouse caching for userExists
Robin Appelman [Mon, 3 Jun 2013 11:46:05 +0000 (13:46 +0200)]
use caching for userExists

11 years agocast result to bool
Robin Appelman [Mon, 3 Jun 2013 11:39:34 +0000 (13:39 +0200)]
cast result to bool

11 years agomove phpdoc comments
Robin Appelman [Mon, 3 Jun 2013 11:33:56 +0000 (13:33 +0200)]
move phpdoc comments

11 years agoUser: return backend result
Robin Appelman [Mon, 3 Jun 2013 11:19:01 +0000 (13:19 +0200)]
User: return backend result

11 years agoUser: consisten variable naming
Robin Appelman [Mon, 3 Jun 2013 11:17:03 +0000 (13:17 +0200)]
User: consisten variable naming

11 years agoUser: remove determineDisplayName
Robin Appelman [Mon, 3 Jun 2013 11:15:42 +0000 (13:15 +0200)]
User: remove determineDisplayName

11 years agopublic.php - check if maintenance mode is enabled
Georg Ehrke [Mon, 3 Jun 2013 10:57:47 +0000 (12:57 +0200)]
public.php - check if maintenance mode is enabled

11 years agoMerge pull request #3560 from owncloud/init-order-session
Jörn Friedrich Dreyer [Mon, 3 Jun 2013 10:21:05 +0000 (03:21 -0700)]
Merge pull request #3560 from owncloud/init-order-session

initialize the session earlier

11 years agoSet default button in oc-dialogs
Thomas Tanghus [Mon, 3 Jun 2013 01:31:33 +0000 (03:31 +0200)]
Set default button in oc-dialogs

11 years agoCatch double destroy on escape.
Thomas Tanghus [Mon, 3 Jun 2013 01:19:35 +0000 (03:19 +0200)]
Catch double destroy on escape.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 3 Jun 2013 00:34:10 +0000 (02:34 +0200)]
[tx-robot] updated from transifex

11 years agoLet the content determine overflow.
Thomas Tanghus [Mon, 3 Jun 2013 00:11:01 +0000 (02:11 +0200)]
Let the content determine overflow.

11 years agofixing code coverage
Thomas Mueller [Sun, 2 Jun 2013 23:00:27 +0000 (01:00 +0200)]
fixing code coverage

11 years agoFixing code coverage analysis
Thomas Mueller [Sun, 2 Jun 2013 22:59:04 +0000 (00:59 +0200)]
Fixing code coverage analysis

11 years agoMerge pull request #3051 from owncloud/backgroundjob
icewind1991 [Sun, 2 Jun 2013 21:29:59 +0000 (14:29 -0700)]
Merge pull request #3051 from owncloud/backgroundjob

Reworked background job system.

11 years agoMerge pull request #3567 from owncloud/fixing-3466
Frank Karlitschek [Sun, 2 Jun 2013 21:04:55 +0000 (14:04 -0700)]
Merge pull request #3567 from owncloud/fixing-3466

In cases where smb4php returns false of an empty array stat/( has to ret...

11 years agoUse int for last_run
Robin Appelman [Sun, 2 Jun 2013 20:49:54 +0000 (22:49 +0200)]
Use int for last_run

11 years agomake sure the filesystem is setup before doing mount operations
Robin Appelman [Sun, 2 Jun 2013 20:09:44 +0000 (22:09 +0200)]
make sure the filesystem is setup before doing mount operations

11 years agoReplacement for jquery.dialog to fit better with ownCloud design.
Thomas Tanghus [Sun, 2 Jun 2013 19:52:59 +0000 (21:52 +0200)]
Replacement for jquery.dialog to fit better with ownCloud design.

11 years agofix clearing mounts when filesystem isn't initialized yet
Robin Appelman [Sun, 2 Jun 2013 19:44:24 +0000 (21:44 +0200)]
fix clearing mounts when filesystem isn't initialized yet

11 years agoFiles: use public api to register backgroundjob
Robin Appelman [Sun, 2 Jun 2013 19:21:39 +0000 (21:21 +0200)]
Files: use public api to register backgroundjob

11 years agomerge master into backgroundjob
Robin Appelman [Sun, 2 Jun 2013 18:12:44 +0000 (20:12 +0200)]
merge master into backgroundjob

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 2 Jun 2013 00:07:21 +0000 (02:07 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3573 from owncloud/octemplate_speedup
Kondou [Sat, 1 Jun 2013 16:33:58 +0000 (09:33 -0700)]
Merge pull request #3573 from owncloud/octemplate_speedup

Speed up octemplate rendering.

11 years agoForgot typeof condition
Thomas Tanghus [Sat, 1 Jun 2013 14:47:34 +0000 (16:47 +0200)]
Forgot typeof condition

11 years agoSpeed up octemplate rendering.
Thomas Tanghus [Sat, 1 Jun 2013 14:38:35 +0000 (16:38 +0200)]
Speed up octemplate rendering.

11 years agoMerge pull request #3454 from owncloud/fix_hasInternetConnection
Thomas Müller [Sat, 1 Jun 2013 00:05:45 +0000 (17:05 -0700)]
Merge pull request #3454 from owncloud/fix_hasInternetConnection

isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 1 Jun 2013 00:03:53 +0000 (02:03 +0200)]
[tx-robot] updated from transifex

11 years agoadding PHPDoc comment to getManager()
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()

11 years agofix namespacing error
Robin Appelman [Fri, 31 May 2013 22:35:16 +0000 (00:35 +0200)]
fix namespacing error

11 years agofix undefined variables
Robin Appelman [Fri, 31 May 2013 22:34:46 +0000 (00:34 +0200)]
fix undefined variables

11 years agouse single quotes
Robin Appelman [Fri, 31 May 2013 20:51:16 +0000 (22:51 +0200)]
use single quotes

11 years agoIn cases where smb4php returns false of an empty array stat/( has to return false.
Thomas Mueller [Fri, 31 May 2013 22:06:23 +0000 (00:06 +0200)]
In cases where smb4php returns false of an empty array stat/( has to return false.
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.

Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33

11 years agofix method naming
Thomas Mueller [Fri, 31 May 2013 21:24:09 +0000 (23:24 +0200)]
fix method naming

11 years agoMerge pull request #3459 from owncloud/fix_for_2377
icewind1991 [Fri, 31 May 2013 21:00:02 +0000 (14:00 -0700)]
Merge pull request #3459 from owncloud/fix_for_2377

fix problems with german "Umlaut" in folder name

11 years agouser should set into session before postLogin hook otherwise it will break not only...
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

11 years agoMerge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
blizzz [Fri, 31 May 2013 19:17:46 +0000 (12:17 -0700)]
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js

Fix ldap sqlite n js

11 years agofix broken tests
Florin Peter [Fri, 31 May 2013 18:55:05 +0000 (20:55 +0200)]
fix broken tests

11 years agoMerge pull request #3562 from owncloud/fix_ldap_offline_host_handling
blizzz [Fri, 31 May 2013 18:10:33 +0000 (11:10 -0700)]
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling

Fix ldap offline host handling

11 years agoLDAP: sqlite compatibility for emptyiing tables
Arthur Schiwon [Fri, 31 May 2013 18:07:13 +0000 (20:07 +0200)]
LDAP: sqlite compatibility for emptyiing tables

11 years agoLDAP: fix setting value of checkbox after loading configuration
Arthur Schiwon [Fri, 31 May 2013 18:06:40 +0000 (20:06 +0200)]
LDAP: fix setting value of checkbox after loading configuration

11 years agoMerge pull request #3554 from owncloud/files_encryption_fs_loaded_fix
FlorinPeter [Fri, 31 May 2013 18:02:33 +0000 (11:02 -0700)]
Merge pull request #3554 from owncloud/files_encryption_fs_loaded_fix

fix login errors while filesystem is not loaded

11 years agoFix postLogin hook
Robin Appelman [Fri, 31 May 2013 17:58:31 +0000 (19:58 +0200)]
Fix postLogin hook

11 years agofix typo
Robin Appelman [Fri, 31 May 2013 16:18:13 +0000 (18:18 +0200)]
fix typo

11 years agofix caching of user objects
Robin Appelman [Fri, 31 May 2013 15:42:51 +0000 (17:42 +0200)]
fix caching of user objects

11 years agoinitialize the session earlier
Robin Appelman [Fri, 31 May 2013 15:31:52 +0000 (17:31 +0200)]
initialize the session earlier

11 years agocache instances of \OC\User\User
Robin Appelman [Fri, 31 May 2013 15:31:27 +0000 (17:31 +0200)]
cache instances of \OC\User\User

11 years agoMerge branch 'master' into user
Robin Appelman [Fri, 31 May 2013 14:35:51 +0000 (16:35 +0200)]
Merge branch 'master' into user

11 years agoalso fix login errors while filesystem is not loaded in app.php
Florin Peter [Fri, 31 May 2013 10:56:08 +0000 (12:56 +0200)]
also fix login errors while filesystem is not loaded in app.php

11 years agoMerge branch 'master' into files_encryption_fs_loaded_fix
Florin Peter [Fri, 31 May 2013 10:49:46 +0000 (12:49 +0200)]
Merge branch 'master' into files_encryption_fs_loaded_fix

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 agofix login errors while filesystem is not loaded
Florin Peter [Fri, 31 May 2013 09:55:40 +0000 (11:55 +0200)]
fix login errors while filesystem is not loaded

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 '