]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoFixes header going down in trash bin app.
raghunayyar [Thu, 16 Jan 2014 15:30:15 +0000 (21:00 +0530)]
Fixes header going down in trash bin app.

10 years agoFixed files row height in Firefox/KDE
Vincent Petry [Thu, 16 Jan 2014 11:05:05 +0000 (12:05 +0100)]
Fixed files row height in Firefox/KDE

Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.

10 years agoFixes Trashbin and Files Style Conflicts, more em to px conversions post rebase
raghunayyar [Thu, 16 Jan 2014 08:53:39 +0000 (14:23 +0530)]
Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase

10 years agoMerge branch 'master' into files-em-to-px
raghunayyar [Wed, 15 Jan 2014 09:29:50 +0000 (14:59 +0530)]
Merge branch 'master' into files-em-to-px

Conflicts:
apps/files/css/files.css

10 years agotypo, grammar
Arthur Schiwon [Wed, 8 Jan 2014 18:55:28 +0000 (19:55 +0100)]
typo, grammar

10 years agoLDAP: only read config from database, if configID is given. Not what we want to do...
Arthur Schiwon [Fri, 13 Dec 2013 17:01:42 +0000 (18:01 +0100)]
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page

10 years agoremove unused variables
Arthur Schiwon [Fri, 13 Dec 2013 16:52:43 +0000 (17:52 +0100)]
remove unused variables

10 years agoLDAP: fix TLS detection
Arthur Schiwon [Fri, 13 Dec 2013 16:52:19 +0000 (17:52 +0100)]
LDAP: fix TLS detection

10 years agoMerge pull request #6704 from owncloud/encryptedfoldersizecalc
Vincent Petry [Tue, 14 Jan 2014 15:20:16 +0000 (07:20 -0800)]
Merge pull request #6704 from owncloud/encryptedfoldersizecalc

Fix calculated folder size to use unencrypted size

10 years agoMerge pull request #6759 from owncloud/extstorage-smbtimezonefix
Vincent Petry [Tue, 14 Jan 2014 14:03:24 +0000 (06:03 -0800)]
Merge pull request #6759 from owncloud/extstorage-smbtimezonefix

Fixed timezone issue with SMB storage

10 years agoMerge pull request #6767 from owncloud/sharing_error_messages
Björn Schießle [Tue, 14 Jan 2014 14:02:48 +0000 (06:02 -0800)]
Merge pull request #6767 from owncloud/sharing_error_messages

it is not an urgent error... a DEBUG message is enough at this point

10 years agoit is not an urgent error... a DEBUG message is enough at this point
Bjoern Schiessle [Tue, 14 Jan 2014 12:38:41 +0000 (13:38 +0100)]
it is not an urgent error... a DEBUG message is enough at this point

10 years agoMerge pull request #6752 from owncloud/silence-test-listener
Thomas Müller [Mon, 13 Jan 2014 23:47:39 +0000 (15:47 -0800)]
Merge pull request #6752 from owncloud/silence-test-listener

no warnings within unlinkDir() within the TestCleanupListener

10 years agoMerge pull request #6755 from owncloud/remove-ru_RU-master
Andreas Fischer [Mon, 13 Jan 2014 23:44:34 +0000 (00:44 +0100)]
Merge pull request #6755 from owncloud/remove-ru_RU-master

remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex

10 years agoFixed timezone issue with SMB storage
Vincent Petry [Mon, 13 Jan 2014 23:37:57 +0000 (00:37 +0100)]
Fixed timezone issue with SMB storage

Now forcing smbclient to also run on UTC

10 years agodon't unshare on delete
Bjoern Schiessle [Mon, 13 Jan 2014 14:25:59 +0000 (15:25 +0100)]
don't unshare on delete

10 years agoremove ru_RU - it has bee removed from transifex
Thomas Müller [Mon, 13 Jan 2014 15:41:10 +0000 (16:41 +0100)]
remove ru_RU - it has bee removed from transifex

10 years agoMerge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
Vincent Petry [Mon, 13 Jan 2014 15:09:01 +0000 (07:09 -0800)]
Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files

Fixing Issue #6301 on master branch

10 years agoMerge pull request #6734 from st3so/redirectfix
Frank Karlitschek [Mon, 13 Jan 2014 14:55:52 +0000 (06:55 -0800)]
Merge pull request #6734 from st3so/redirectfix

fixing typo in redirection query string

10 years agono warnings within unlinkDir() within the TestCleanupListener
Thomas Müller [Mon, 13 Jan 2014 14:32:11 +0000 (15:32 +0100)]
no warnings within unlinkDir() within the TestCleanupListener

10 years agoMerge pull request #6694 from owncloud/fix-email-template-l10n
Thomas Müller [Mon, 13 Jan 2014 12:34:28 +0000 (04:34 -0800)]
Merge pull request #6694 from owncloud/fix-email-template-l10n

fix email template l10n, emphasize filename

10 years agofixing typo in redirection query string
st3so [Sun, 12 Jan 2014 14:45:33 +0000 (15:45 +0100)]
fixing typo in redirection query string

10 years agoMerge pull request #6713 from owncloud/files-filenameescapingfixes
Lukas Reschke [Sun, 12 Jan 2014 11:45:30 +0000 (03:45 -0800)]
Merge pull request #6713 from owncloud/files-filenameescapingfixes

Fixed various file name escaping issues in core apps

10 years agoFixed various file name escaping issues in core apps
Vincent Petry [Fri, 10 Jan 2014 14:02:26 +0000 (15:02 +0100)]
Fixed various file name escaping issues in core apps

- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes

10 years agoFix calculated folder size to use unencrypted size
Vincent Petry [Thu, 9 Jan 2014 16:27:55 +0000 (17:27 +0100)]
Fix calculated folder size to use unencrypted size

The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.

10 years agoMerge pull request #6687 from owncloud/sharing-fixpartfilehandling
Vincent Petry [Thu, 9 Jan 2014 14:16:43 +0000 (06:16 -0800)]
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling

Removed special handling of part files in shared storage rename

10 years agoMerge pull request #6693 from owncloud/fixing-apache-login
Thomas Müller [Thu, 9 Jan 2014 11:32:17 +0000 (03:32 -0800)]
Merge pull request #6693 from owncloud/fixing-apache-login

Fixing apache login

10 years agofix email template l10n, emphasize filename
Jan-Christoph Borchardt [Thu, 9 Jan 2014 09:54:23 +0000 (10:54 +0100)]
fix email template l10n, emphasize filename

10 years agorename user-id to loginname to stay consistent
Thomas Müller [Thu, 9 Jan 2014 09:29:21 +0000 (10:29 +0100)]
rename user-id to loginname to stay consistent

10 years agoset login name within apache auth backend
Thomas Müller [Thu, 9 Jan 2014 09:28:24 +0000 (10:28 +0100)]
set login name within apache auth backend

10 years agofixing PHPDoc and use cameCase names
Thomas Müller [Thu, 9 Jan 2014 09:27:47 +0000 (10:27 +0100)]
fixing PHPDoc and use cameCase names

10 years agoMerge pull request #6681 from owncloud/userreport
blizzz [Wed, 8 Jan 2014 18:41:39 +0000 (10:41 -0800)]
Merge pull request #6681 from owncloud/userreport

add command line option to get user number statistics

10 years agoInfowarning about 32bit
Arthur Schiwon [Wed, 8 Jan 2014 18:41:10 +0000 (19:41 +0100)]
Infowarning about 32bit

10 years agoRemoved special handling of part files in shared storage rename
Vincent Petry [Wed, 8 Jan 2014 17:43:20 +0000 (18:43 +0100)]
Removed special handling of part files in shared storage rename

This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.

10 years agoMerge pull request #6686 from owncloud/fixes-6685-master
Jan-Christoph Borchardt [Wed, 8 Jan 2014 15:33:12 +0000 (07:33 -0800)]
Merge pull request #6686 from owncloud/fixes-6685-master

Fix ownCloud for php5.3.x

10 years agoFix ownCloud for php5.3.x
Thomas Müller [Wed, 8 Jan 2014 15:07:01 +0000 (16:07 +0100)]
Fix ownCloud for php5.3.x

10 years agoMerge pull request #6680 from owncloud/core-preventunlinkstorageroot
Thomas Müller [Wed, 8 Jan 2014 13:32:36 +0000 (05:32 -0800)]
Merge pull request #6680 from owncloud/core-preventunlinkstorageroot

Prevent deleting storage root

10 years agoadd tests for user counting
Arthur Schiwon [Wed, 8 Jan 2014 12:26:48 +0000 (13:26 +0100)]
add tests for user counting

10 years agoif backends have the same class name, sum their users up instead of overwriting
Arthur Schiwon [Wed, 8 Jan 2014 12:24:28 +0000 (13:24 +0100)]
if backends have the same class name, sum their users up instead of overwriting

10 years agoPrevent deleting storage root
Vincent Petry [Wed, 8 Jan 2014 12:17:36 +0000 (13:17 +0100)]
Prevent deleting storage root

Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.

Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.

10 years agoMerge pull request #6515 from owncloud/autotest-enforcephpunitversion
Thomas Müller [Wed, 8 Jan 2014 11:30:05 +0000 (03:30 -0800)]
Merge pull request #6515 from owncloud/autotest-enforcephpunitversion

Enforce required phpunit version

10 years agoLDAP: add tests for countUsers
Arthur Schiwon [Wed, 8 Jan 2014 11:24:29 +0000 (12:24 +0100)]
LDAP: add tests for countUsers

10 years agoremove unnecessary line
Arthur Schiwon [Wed, 8 Jan 2014 11:20:56 +0000 (12:20 +0100)]
remove unnecessary line

10 years agoLDAP: implement userCount action. This required to (finally) clean up and refactor...
Arthur Schiwon [Wed, 8 Jan 2014 11:07:57 +0000 (12:07 +0100)]
LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search.

10 years agoMerge pull request #6675 from owncloud/disable-mod_pagespeed
Vincent Petry [Wed, 8 Jan 2014 10:52:03 +0000 (02:52 -0800)]
Merge pull request #6675 from owncloud/disable-mod_pagespeed

turn off mod_pagespeed

10 years agoMerge pull request #5238 from owncloud/externalstorage-owncloudbackend
Thomas Müller [Wed, 8 Jan 2014 09:49:15 +0000 (01:49 -0800)]
Merge pull request #5238 from owncloud/externalstorage-owncloudbackend

Added ownCloud backend for external storage

10 years agoMerge branch 'master' into disable-mod_pagespeed
Thomas Müller [Wed, 8 Jan 2014 09:19:16 +0000 (10:19 +0100)]
Merge branch 'master' into disable-mod_pagespeed

10 years agoMerge pull request #6677 from owncloud/fixing-3rdparty-submodule
Thomas Müller [Wed, 8 Jan 2014 09:16:38 +0000 (01:16 -0800)]
Merge pull request #6677 from owncloud/fixing-3rdparty-submodule

Fix submodule 3rdparty - translation sync broke that

10 years agoMerge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix
Vincent Petry [Wed, 8 Jan 2014 08:55:11 +0000 (00:55 -0800)]
Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix

Now also preventing to override "files" dir size with -1

10 years agoFix submodule 3rdparty - translation sync broke that
Thomas Müller [Wed, 8 Jan 2014 08:42:37 +0000 (09:42 +0100)]
Fix submodule 3rdparty - translation sync broke that

10 years agoturn off mod_pagespeed
Thomas Müller [Wed, 8 Jan 2014 06:56:08 +0000 (07:56 +0100)]
turn off mod_pagespeed

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 8 Jan 2014 06:55:41 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years agoMerge pull request #6594 from owncloud/kill-index.php-from-url
Jörn Friedrich Dreyer [Wed, 8 Jan 2014 06:28:58 +0000 (22:28 -0800)]
Merge pull request #6594 from owncloud/kill-index.php-from-url

Kill index.php from url

10 years agoMerge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2
Thomas Müller [Wed, 8 Jan 2014 06:27:47 +0000 (22:27 -0800)]
Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2

enable ldap tests

10 years agoAdd command line tool to show numbers of users and user directories
Arthur Schiwon [Tue, 7 Jan 2014 22:06:37 +0000 (23:06 +0100)]
Add command line tool to show numbers of users and user directories

10 years agoIntroduce user count action to user management
Arthur Schiwon [Tue, 7 Jan 2014 22:05:37 +0000 (23:05 +0100)]
Introduce user count action to user management

10 years agoNow also preventing to override "files" dir size with -1
Vincent Petry [Tue, 7 Jan 2014 16:41:04 +0000 (17:41 +0100)]
Now also preventing to override "files" dir size with -1

Fixes #6526

10 years agoMerge pull request #6660 from owncloud/fixing-disabled-function-checks
Thomas Müller [Tue, 7 Jan 2014 19:10:45 +0000 (11:10 -0800)]
Merge pull request #6660 from owncloud/fixing-disabled-function-checks

Fixing disabled function checks

10 years agoMerge pull request #6290 from owncloud/files-androidcontentdisposition
Thomas Müller [Tue, 7 Jan 2014 19:06:20 +0000 (11:06 -0800)]
Merge pull request #6290 from owncloud/files-androidcontentdisposition

Files androidcontentdisposition

10 years agotrimming all array elements
Thomas Müller [Tue, 7 Jan 2014 18:47:01 +0000 (19:47 +0100)]
trimming all array elements

10 years agoMerge pull request #6642 from owncloud/update-SabreDAV
Thomas Müller [Tue, 7 Jan 2014 16:04:13 +0000 (08:04 -0800)]
Merge pull request #6642 from owncloud/update-SabreDAV

Update sabre dav to 1.7.9

10 years agoMerge pull request #6663 from owncloud/fix_empty_mimetypes
Thomas Müller [Tue, 7 Jan 2014 15:31:12 +0000 (07:31 -0800)]
Merge pull request #6663 from owncloud/fix_empty_mimetypes

remove duplicate exe mimetype, add correct msi mimetype

10 years agoRemove @ in order to get proper error handling
Thomas Müller [Tue, 7 Jan 2014 15:24:05 +0000 (16:24 +0100)]
Remove @ in order to get proper error handling

10 years agoremove duplicate exe mimetype, add correct msi mimetype
Jörn Friedrich Dreyer [Tue, 7 Jan 2014 14:51:08 +0000 (15:51 +0100)]
remove duplicate exe mimetype, add correct msi mimetype

10 years agowe shall explode on ',' only
Thomas Müller [Tue, 7 Jan 2014 13:53:02 +0000 (14:53 +0100)]
we shall explode on ',' only

10 years agoreuse existing helper function OC_Helper::is_function_enabled
Thomas Müller [Tue, 7 Jan 2014 13:52:18 +0000 (14:52 +0100)]
reuse existing helper function OC_Helper::is_function_enabled

10 years agoMerge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master
Thomas Müller [Tue, 7 Jan 2014 11:25:26 +0000 (03:25 -0800)]
Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master

Adding a random postfix to the part file.

10 years agoin order to work properly with encryption ocTransferId is added to the file path...
Thomas Müller [Tue, 7 Jan 2014 10:53:33 +0000 (11:53 +0100)]
in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 7 Jan 2014 06:56:11 +0000 (01:56 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 6 Jan 2014 06:55:59 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years agoreference 3rdparty branch with SabreDAV 1.7.9 installed using composer
Thomas Müller [Sun, 5 Jan 2014 20:49:50 +0000 (21:49 +0100)]
reference 3rdparty branch with SabreDAV 1.7.9 installed using composer

10 years agorequire composer's autoload.php if present
Thomas Müller [Sun, 5 Jan 2014 20:49:08 +0000 (21:49 +0100)]
require composer's autoload.php if present

10 years agoMerge pull request #6031 from s0taka/master
Morris Jobke [Sun, 5 Jan 2014 19:52:10 +0000 (11:52 -0800)]
Merge pull request #6031 from s0taka/master

No decimal points for Kilobyte and Byte #5371.

10 years agoMerge pull request #6580 from monreal/master
Thomas Müller [Sun, 5 Jan 2014 12:32:30 +0000 (04:32 -0800)]
Merge pull request #6580 from monreal/master

Silence output of 'which' command used in smbclient detection

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 5 Jan 2014 06:55:53 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 Jan 2014 06:55:57 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years agoMerge pull request #6610 from owncloud/apcu-clear
icewind1991 [Fri, 3 Jan 2014 13:30:49 +0000 (05:30 -0800)]
Merge pull request #6610 from owncloud/apcu-clear

Fix APCIterator syntax in \OC\Memcache\APCu::clear

10 years agoMerge pull request #6605 from owncloud/free_space_disabled
Thomas Müller [Thu, 2 Jan 2014 16:19:52 +0000 (08:19 -0800)]
Merge pull request #6605 from owncloud/free_space_disabled

Return SPACE_UNKNOWN if disk_free_space is disabled

10 years agoMerge pull request #6609 from owncloud/avatar-test-user
Thomas Müller [Thu, 2 Jan 2014 15:50:29 +0000 (07:50 -0800)]
Merge pull request #6609 from owncloud/avatar-test-user

Make OC_Avatar unit tests independent of currently loggedin user

10 years agoFix APCIterator syntax in \OC\Memcache\APCU::clear
Robin Appelman [Thu, 2 Jan 2014 15:12:56 +0000 (16:12 +0100)]
Fix APCIterator syntax in \OC\Memcache\APCU::clear

see http://www.php.net/manual/en/apciterator.construct.php

10 years agoMake OC_Avatar unit tests independent of currently loggedin user
Robin Appelman [Thu, 2 Jan 2014 15:08:08 +0000 (16:08 +0100)]
Make OC_Avatar unit tests independent of currently loggedin user

10 years agoMerge pull request #6513 from owncloud/user-no-change-displayname
icewind1991 [Thu, 2 Jan 2014 13:04:27 +0000 (05:04 -0800)]
Merge pull request #6513 from owncloud/user-no-change-displayname

Re-add the config options to remove the ability for users to change their displayname

10 years agoReturn SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on...
Robin Appelman [Thu, 2 Jan 2014 12:19:10 +0000 (13:19 +0100)]
Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 2 Jan 2014 06:56:21 +0000 (01:56 -0500)]
[tx-robot] updated from transifex

10 years agoMerge pull request #6601 from AdamWill/pimple-include
Thomas Müller [Wed, 1 Jan 2014 23:25:58 +0000 (15:25 -0800)]
Merge pull request #6601 from AdamWill/pimple-include

don't specify path to 3rdparty directory when registering Pimple autoloader

10 years agoMerge pull request #6598 from lolozere/master
Thomas Müller [Wed, 1 Jan 2014 23:25:28 +0000 (15:25 -0800)]
Merge pull request #6598 from lolozere/master

Add support mimetype

10 years agodon't specify path to 3rdparty directory when registering Pimple autoloader
Adam Williamson [Wed, 1 Jan 2014 17:52:19 +0000 (09:52 -0800)]
don't specify path to 3rdparty directory when registering Pimple autoloader

The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.

10 years agoAdd support mimetype
lolozere [Wed, 1 Jan 2014 13:09:02 +0000 (14:09 +0100)]
Add support mimetype

Add support mimetype for extension .sh, .bash and .sh-lib

10 years agoRevert "Added support for extra backends (see pull request #5043)"
Niklas Sombert [Wed, 1 Jan 2014 12:43:23 +0000 (13:43 +0100)]
Revert "Added support for extra backends (see pull request #5043)"

This reverts commit 2d75914f2a97cbfd34ae7c2ef27f5bd8185b81eb, reversing
changes made to 760fa9ea3005e7df81a1fac54f207dbe7d8ef312.

10 years agoAdded support for extra backends (see pull request #5043)
Niklas Sombert [Wed, 1 Jan 2014 10:53:27 +0000 (11:53 +0100)]
Added support for extra backends (see pull request #5043)

Somebody had forgotten "OC_User::setupBackends();"...

10 years agouse getAppWebPath() in here as well
Thomas Müller [Tue, 31 Dec 2013 14:12:17 +0000 (15:12 +0100)]
use getAppWebPath() in here as well

10 years agonew config parameter 'front_controller_active' which will instruct the url generator...
Thomas Müller [Tue, 31 Dec 2013 13:36:02 +0000 (14:36 +0100)]
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php

10 years agoavoid conflict with physical file config.js
Thomas Müller [Tue, 31 Dec 2013 13:34:28 +0000 (14:34 +0100)]
avoid conflict with physical file config.js

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 31 Dec 2013 06:55:42 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 30 Dec 2013 06:55:38 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 29 Dec 2013 06:55:36 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 28 Dec 2013 06:55:35 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years agoSilence output of 'which' command used in smbclient detection
Michael Monreal [Fri, 27 Dec 2013 17:10:47 +0000 (18:10 +0100)]
Silence output of 'which' command used in smbclient detection

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 27 Dec 2013 06:55:35 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 26 Dec 2013 06:55:34 +0000 (01:55 -0500)]
[tx-robot] updated from transifex