]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoChecks if getenv returns proper system variable results
root [Thu, 23 Apr 2015 08:58:13 +0000 (10:58 +0200)]
Checks if getenv returns proper system variable results

Updated texts and changed the variable name to match the query

Updated text + info which path for php config is used

removed the term ownCloud and squashed the commits

Updated text

9 years agoMerge pull request #15598 from owncloud/fix-enc-file-size-master
Björn Schießle [Tue, 14 Apr 2015 14:48:04 +0000 (16:48 +0200)]
Merge pull request #15598 from owncloud/fix-enc-file-size-master

Fix file size of encrypted files

9 years agoMerge pull request #13360 from owncloud/cross-storage-move
Morris Jobke [Tue, 14 Apr 2015 12:35:08 +0000 (14:35 +0200)]
Merge pull request #13360 from owncloud/cross-storage-move

Proper copy/move between multiple local storages

9 years agoremove calculateUnencryptedSize() - not needed
Thomas Müller [Tue, 14 Apr 2015 10:53:13 +0000 (12:53 +0200)]
remove calculateUnencryptedSize() - not needed

9 years agoreturn size from cache in case the cache entry is marked as encrypted
Thomas Müller [Tue, 14 Apr 2015 10:44:51 +0000 (12:44 +0200)]
return size from cache in case the cache entry is marked as encrypted

9 years agoa bit more phpdoc
Robin Appelman [Tue, 14 Apr 2015 10:35:53 +0000 (12:35 +0200)]
a bit more phpdoc

9 years agopreserve filesize on rename after upload
Thomas Müller [Tue, 14 Apr 2015 10:27:12 +0000 (12:27 +0200)]
preserve filesize on rename after upload

9 years agofix reading of private key
Thomas Müller [Tue, 14 Apr 2015 10:23:25 +0000 (12:23 +0200)]
fix reading of private key

9 years agoMerge pull request #15566 from owncloud/fix-filepicker
Thomas Müller [Mon, 13 Apr 2015 22:39:12 +0000 (00:39 +0200)]
Merge pull request #15566 from owncloud/fix-filepicker

fix filepicker

9 years agoMerge pull request #15585 from owncloud/fix-user-list
Lukas Reschke [Mon, 13 Apr 2015 21:30:37 +0000 (23:30 +0200)]
Merge pull request #15585 from owncloud/fix-user-list

Fix user list

9 years agoMerge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
Morris Jobke [Mon, 13 Apr 2015 19:51:38 +0000 (21:51 +0200)]
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace

Fix namespace duplication and other issues in repairlegacystorages

9 years agoMerge pull request #15360 from owncloud/cross-storage-move-cache
Morris Jobke [Mon, 13 Apr 2015 19:48:30 +0000 (21:48 +0200)]
Merge pull request #15360 from owncloud/cross-storage-move-cache

Preserve cache data when doing a cross storage move

9 years agoFix user list
Morris Jobke [Mon, 13 Apr 2015 15:12:06 +0000 (17:12 +0200)]
Fix user list

* the name cell was changed from td to th because of accessibility
  issues - this adjusts the CSS and JS to behave like before

9 years agoFix cross storage move with shared storages
Robin Appelman [Mon, 13 Apr 2015 15:09:18 +0000 (17:09 +0200)]
Fix cross storage move with shared storages

9 years agoupda tests
Robin Appelman [Thu, 9 Apr 2015 13:13:56 +0000 (15:13 +0200)]
upda tests

9 years agoFix moving mount points
Robin Appelman [Thu, 9 Apr 2015 12:10:51 +0000 (14:10 +0200)]
Fix moving mount points

9 years agocheck that we know the parent
Robin Appelman [Tue, 7 Apr 2015 14:02:37 +0000 (16:02 +0200)]
check that we know the parent

9 years agocheck for source cache
Robin Appelman [Wed, 1 Apr 2015 14:12:01 +0000 (16:12 +0200)]
check for source cache

9 years agoreuse cache move logic
Robin Appelman [Wed, 1 Apr 2015 13:15:24 +0000 (15:15 +0200)]
reuse cache move logic

9 years agopreserve cache data when doing a cross storage move
Robin Appelman [Wed, 1 Apr 2015 13:12:59 +0000 (15:12 +0200)]
preserve cache data when doing a cross storage move

9 years agoFix namespace duplication and other issues in repairlegacystorages
Joas Schilling [Mon, 13 Apr 2015 14:34:10 +0000 (16:34 +0200)]
Fix namespace duplication and other issues in repairlegacystorages

9 years agoMerge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
Thomas Müller [Mon, 13 Apr 2015 13:16:07 +0000 (15:16 +0200)]
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results

cach user folder for file search results

9 years agofix rebase issue
Robin Appelman [Tue, 7 Apr 2015 15:53:40 +0000 (17:53 +0200)]
fix rebase issue

9 years agoadd missing return for shared
Robin Appelman [Thu, 19 Mar 2015 14:26:47 +0000 (15:26 +0100)]
add missing return for shared

9 years agoProperly handle copy/move failures in cross storage copy/move
Robin Appelman [Thu, 5 Mar 2015 10:49:31 +0000 (11:49 +0100)]
Properly handle copy/move failures in cross storage copy/move

9 years agoDetect storage full when doing cross storage copy/move
Robin Appelman [Thu, 5 Mar 2015 10:49:15 +0000 (11:49 +0100)]
Detect storage full when doing cross storage copy/move

9 years agoproperly return false if we cant delete the source file
Robin Appelman [Mon, 9 Feb 2015 14:15:03 +0000 (15:15 +0100)]
properly return false if we cant delete the source file

9 years agoMake getSourcePath accessible for storage wrappers
Robin Appelman [Mon, 19 Jan 2015 15:25:28 +0000 (16:25 +0100)]
Make getSourcePath accessible for storage wrappers

9 years agoFix test
Robin Appelman [Mon, 19 Jan 2015 15:23:33 +0000 (16:23 +0100)]
Fix test

9 years agoImplement move/copyFromStorage for shared storage
Robin Appelman [Mon, 19 Jan 2015 12:44:37 +0000 (13:44 +0100)]
Implement move/copyFromStorage for shared storage

9 years agoImprove cross storage copy between local storages
Robin Appelman [Fri, 16 Jan 2015 12:33:17 +0000 (13:33 +0100)]
Improve cross storage copy between local storages

9 years agoMove cross storage copy logic to the storage
Robin Appelman [Fri, 16 Jan 2015 12:32:42 +0000 (13:32 +0100)]
Move cross storage copy logic to the storage

9 years agoSmall cleanup of rename code
Robin Appelman [Wed, 14 Jan 2015 15:44:30 +0000 (16:44 +0100)]
Small cleanup of rename code

9 years agoMerge pull request #15570 from owncloud/shares-properlyformatmountpoint
Morris Jobke [Mon, 13 Apr 2015 11:16:07 +0000 (13:16 +0200)]
Merge pull request #15570 from owncloud/shares-properlyformatmountpoint

Properly add trailing slash to mount point

9 years agoMerge pull request #15564 from rullzer/fix_13709
Vincent Petry [Mon, 13 Apr 2015 10:46:43 +0000 (12:46 +0200)]
Merge pull request #15564 from rullzer/fix_13709

Do not try to make user subadmin of group twice

9 years agoProperly add trailing slash to mount point
Vincent Petry [Mon, 13 Apr 2015 10:36:47 +0000 (12:36 +0200)]
Properly add trailing slash to mount point

Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name

9 years agoDo not try to make user subadmin of group twice
Roeland Jago Douma [Mon, 13 Apr 2015 08:32:18 +0000 (10:32 +0200)]
Do not try to make user subadmin of group twice

If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.

Added unit test to ensure things keep working.

9 years agocach user folder for file search results
Jörn Friedrich Dreyer [Mon, 13 Apr 2015 09:29:10 +0000 (11:29 +0200)]
cach user folder for file search results

9 years agofix filepicker
Morris Jobke [Mon, 13 Apr 2015 08:35:45 +0000 (10:35 +0200)]
fix filepicker

* add ability to filter for mimetype
* fixes #15526
* fixes #11563

9 years agoMerge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
Morris Jobke [Mon, 13 Apr 2015 08:30:31 +0000 (10:30 +0200)]
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient

Prevent php message: "Trying to get property of non-object at /xxx/lib/p...

9 years agoMerge pull request #15562 from owncloud/fix-15560
Joas Schilling [Mon, 13 Apr 2015 08:07:01 +0000 (10:07 +0200)]
Merge pull request #15562 from owncloud/fix-15560

Properly import used classes

9 years agoPrevent php message: "Trying to get property of non-object at /xxx/lib/private/ocscli...
Thomas Müller [Mon, 13 Apr 2015 07:43:45 +0000 (09:43 +0200)]
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"

9 years agoProperly import used classes
Thomas Müller [Mon, 13 Apr 2015 07:26:30 +0000 (09:26 +0200)]
Properly import used classes

9 years agoMerge pull request #15555 from rullzer/fix_15494
Morris Jobke [Sun, 12 Apr 2015 21:00:32 +0000 (23:00 +0200)]
Merge pull request #15555 from rullzer/fix_15494

Initial fix for #15494

9 years agoMerge pull request #15541 from owncloud/add-reply-to-support
Lukas Reschke [Sun, 12 Apr 2015 20:30:35 +0000 (22:30 +0200)]
Merge pull request #15541 from owncloud/add-reply-to-support

Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests

9 years agoInitial fix for #15494
Roeland Jago Douma [Sun, 12 Apr 2015 14:22:21 +0000 (16:22 +0200)]
Initial fix for #15494

9 years agoMerge pull request #15545 from owncloud/fix-fonts
Morris Jobke [Sun, 12 Apr 2015 08:03:54 +0000 (10:03 +0200)]
Merge pull request #15545 from owncloud/fix-fonts

fix wrong typeface being used for some buttons

9 years agofix wrong typeface being used for some buttons
Jan-Christoph Borchardt [Sat, 11 Apr 2015 11:29:55 +0000 (13:29 +0200)]
fix wrong typeface being used for some buttons

9 years agoMerge pull request #15535 from owncloud/smb-1.0.0
Morris Jobke [Fri, 10 Apr 2015 21:43:55 +0000 (23:43 +0200)]
Merge pull request #15535 from owncloud/smb-1.0.0

update icewind/smb to 1.0.0

9 years agoMerge pull request #15536 from owncloud/fix-mysql-autotest
Robin McCorkell [Fri, 10 Apr 2015 20:56:27 +0000 (21:56 +0100)]
Merge pull request #15536 from owncloud/fix-mysql-autotest

[autotest.sh] use the DATABASEHOST for the mysql DB drop

9 years agoAdd "Reply-To" support to sharing mails and refactor code
Lukas Reschke [Fri, 10 Apr 2015 15:21:52 +0000 (17:21 +0200)]
Add "Reply-To" support to sharing mails and refactor code

9 years agoMerge pull request #15458 from owncloud/web-shell-master
Lukas Reschke [Fri, 10 Apr 2015 14:33:01 +0000 (16:33 +0200)]
Merge pull request #15458 from owncloud/web-shell-master

Move console application to it's own class - allows reuse in the web shell

9 years agoMerge pull request #15538 from owncloud/encryption-crypt-tests
Clark Tomlinson [Fri, 10 Apr 2015 14:24:01 +0000 (10:24 -0400)]
Merge pull request #15538 from owncloud/encryption-crypt-tests

add unit test for crypt.php

9 years agoMerge pull request #15395 from owncloud/fix-imagepath
Vincent Petry [Fri, 10 Apr 2015 14:11:57 +0000 (16:11 +0200)]
Merge pull request #15395 from owncloud/fix-imagepath

Fix UrlGenerator::imagePath() for app paths

9 years agoMerge pull request #15489 from owncloud/dont_hide_exceptions_master
Thomas Müller [Fri, 10 Apr 2015 13:49:45 +0000 (15:49 +0200)]
Merge pull request #15489 from owncloud/dont_hide_exceptions_master

Dont hide exceptions master

9 years agoMerge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
Morris Jobke [Fri, 10 Apr 2015 13:42:16 +0000 (15:42 +0200)]
Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2

Fix master unit test: Clear leftover shares from other tests

9 years agoadd unit test for crypt.php
Bjoern Schiessle [Thu, 9 Apr 2015 12:59:03 +0000 (14:59 +0200)]
add unit test for crypt.php

9 years agoAdd "Reply-To" support for mails
Lukas Reschke [Fri, 10 Apr 2015 13:05:34 +0000 (15:05 +0200)]
Add "Reply-To" support for mails

9 years agoupdate icewind/smb to 1.0.0
Robin Appelman [Fri, 10 Apr 2015 12:36:37 +0000 (14:36 +0200)]
update icewind/smb to 1.0.0

9 years agoClear leftover shares from other tests
Vincent Petry [Fri, 10 Apr 2015 11:43:57 +0000 (13:43 +0200)]
Clear leftover shares from other tests

9 years agoThrow ServerNotAvailableException always
Morris Jobke [Fri, 10 Apr 2015 12:51:21 +0000 (14:51 +0200)]
Throw ServerNotAvailableException always

9 years ago[autotest.sh] use the DATABASEHOST for the mysql DB drop
Morris Jobke [Fri, 10 Apr 2015 12:46:08 +0000 (14:46 +0200)]
[autotest.sh] use the DATABASEHOST for the mysql DB drop

9 years agoMerge pull request #15510 from owncloud/cron-singleuser
Thomas Müller [Fri, 10 Apr 2015 12:38:50 +0000 (14:38 +0200)]
Merge pull request #15510 from owncloud/cron-singleuser

block cron when in single user mode

9 years agoMerge pull request #15530 from owncloud/davclient-catchmoreexceptions
Morris Jobke [Fri, 10 Apr 2015 12:17:42 +0000 (14:17 +0200)]
Merge pull request #15530 from owncloud/davclient-catchmoreexceptions

Catch more exceptions in DAV client

9 years agoFix converting Guzzle error codes in s2s storage
Vincent Petry [Fri, 10 Apr 2015 10:12:05 +0000 (12:12 +0200)]
Fix converting Guzzle error codes in s2s storage

9 years agoCatch more exceptions when connecting to remote DAV server
Vincent Petry [Fri, 10 Apr 2015 09:55:58 +0000 (11:55 +0200)]
Catch more exceptions when connecting to remote DAV server

Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.

9 years agoMerge pull request #15528 from owncloud/share-loading
Thomas Müller [Fri, 10 Apr 2015 09:45:24 +0000 (11:45 +0200)]
Merge pull request #15528 from owncloud/share-loading

fix share input loading spinner, fix #15522

9 years agofix share input loading spinner, fix #15522
Jan-Christoph Borchardt [Fri, 10 Apr 2015 09:32:02 +0000 (11:32 +0200)]
fix share input loading spinner, fix #15522

9 years agoFix singe user mode on public.php - take two
Thomas Müller [Fri, 10 Apr 2015 09:17:33 +0000 (11:17 +0200)]
Fix singe user mode on public.php - take two

9 years agofix cherrypicking
Jörn Friedrich Dreyer [Thu, 9 Apr 2015 12:03:30 +0000 (14:03 +0200)]
fix cherrypicking

9 years agoMerge pull request #15398 from Volker-E/master
Jan-Christoph Borchardt [Fri, 10 Apr 2015 08:43:39 +0000 (10:43 +0200)]
Merge pull request #15398 from Volker-E/master

fixing #15396 & #15397

9 years agofix typo and comment
Morris Jobke [Thu, 2 Apr 2015 13:05:37 +0000 (15:05 +0200)]
fix typo and comment

9 years agofix filesystem and encryption tests
Jörn Friedrich Dreyer [Thu, 2 Apr 2015 09:28:10 +0000 (11:28 +0200)]
fix filesystem and encryption tests

Conflicts:
apps/files_encryption/lib/util.php
apps/files_encryption/tests/hooks.php

9 years agothrow exception when backends don't provide a user instead of creating legacy local...
Jörn Friedrich Dreyer [Thu, 2 Apr 2015 09:05:14 +0000 (11:05 +0200)]
throw exception when backends don't provide a user instead of creating legacy local storages

9 years agothrow exception if setup is incomplete
Morris Jobke [Wed, 1 Apr 2015 15:12:28 +0000 (17:12 +0200)]
throw exception if setup is incomplete

9 years agomore robust share dialog
Morris Jobke [Wed, 1 Apr 2015 12:28:28 +0000 (14:28 +0200)]
more robust share dialog

9 years agofix_tests
Jörn Friedrich Dreyer [Tue, 31 Mar 2015 13:33:44 +0000 (15:33 +0200)]
fix_tests

Conflicts:
apps/user_ldap/tests/user_ldap.php

9 years agodo not disclose information, show generic error on login page
Jörn Friedrich Dreyer [Tue, 31 Mar 2015 12:56:02 +0000 (14:56 +0200)]
do not disclose information, show generic error on login page

Conflicts:
core/templates/login.php
lib/base.php

9 years agodo not hide exception when ldap server has a hiccup
Jörn Friedrich Dreyer [Tue, 31 Mar 2015 11:42:23 +0000 (13:42 +0200)]
do not hide exception when ldap server has a hiccup

9 years agoMerge pull request #15521 from owncloud/shareinfo-catchguzzle503
Morris Jobke [Thu, 9 Apr 2015 22:23:05 +0000 (00:23 +0200)]
Merge pull request #15521 from owncloud/shareinfo-catchguzzle503

Properly catch guzzle 503 when querying share info

9 years agoMerge pull request #15437 from owncloud/deleteorphanedfiles
Thomas Müller [Thu, 9 Apr 2015 22:09:56 +0000 (00:09 +0200)]
Merge pull request #15437 from owncloud/deleteorphanedfiles

[command] delete orphaned file cache entries

9 years agoMerge pull request #15404 from Crote/occ-password-from-env
Thomas Müller [Thu, 9 Apr 2015 22:08:40 +0000 (00:08 +0200)]
Merge pull request #15404 from Crote/occ-password-from-env

Add password input from env variable for occ user:{add, resetpassword}

9 years agoMerge pull request #15182 from rullzer/fix-8231
Thomas Müller [Thu, 9 Apr 2015 22:05:11 +0000 (00:05 +0200)]
Merge pull request #15182 from rullzer/fix-8231

ajax/share.php should return correct list of suggestions

9 years agoMerge pull request #15492 from owncloud/ldap-wizard-overhaul
blizzz [Thu, 9 Apr 2015 21:52:53 +0000 (23:52 +0200)]
Merge pull request #15492 from owncloud/ldap-wizard-overhaul

LDAP Wizard Overhaul

9 years agoFix single user check in case no user is logged in
Thomas Müller [Thu, 9 Apr 2015 21:47:24 +0000 (23:47 +0200)]
Fix single user check in case no user is logged in

9 years agoMerge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
Thomas Müller [Thu, 9 Apr 2015 21:37:02 +0000 (23:37 +0200)]
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares

only create a db entry for the user in case of a name conflict on group share

9 years agochange default value of ldap_tls to 0. It will be detected anyway, but starting with...
Arthur Schiwon [Thu, 9 Apr 2015 19:04:33 +0000 (21:04 +0200)]
change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability

9 years agocompile user and login filter on the first time automatically, if a suggestion was...
Arthur Schiwon [Thu, 9 Apr 2015 18:31:23 +0000 (20:31 +0200)]
compile user and login filter on the first time automatically, if a suggestion was provided

9 years agoMerge pull request #15512 from owncloud/autoclose-settings-menu
Vincent Petry [Thu, 9 Apr 2015 17:53:43 +0000 (19:53 +0200)]
Merge pull request #15512 from owncloud/autoclose-settings-menu

Don't stop event execution for menu item click

9 years agoMerge pull request #15511 from owncloud/fix-typos
Lukas Reschke [Thu, 9 Apr 2015 17:23:27 +0000 (19:23 +0200)]
Merge pull request #15511 from owncloud/fix-typos

Fix typos and some other adjustments

9 years agoProperly catch guzzle 503 when querying share info
Vincent Petry [Thu, 9 Apr 2015 16:55:28 +0000 (18:55 +0200)]
Properly catch guzzle 503 when querying share info

9 years agoMerge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
Morris Jobke [Thu, 9 Apr 2015 16:41:18 +0000 (18:41 +0200)]
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource

fixes #15326

9 years agoDon't stop event execution for menu item click
Morris Jobke [Thu, 9 Apr 2015 12:46:26 +0000 (14:46 +0200)]
Don't stop event execution for menu item click

* fixes #12326 - the settings menu is closed now, because the event is executed

9 years agoFix mock object to return proper type
Thomas Müller [Thu, 9 Apr 2015 16:30:45 +0000 (18:30 +0200)]
Fix mock object to return proper type

9 years agoMerge pull request #15282 from owncloud/keepsharerelationshipondelete
Vincent Petry [Thu, 9 Apr 2015 16:10:17 +0000 (18:10 +0200)]
Merge pull request #15282 from owncloud/keepsharerelationshipondelete

Keep shares when deleting shared folders

9 years agoFix mock object to return proper type
Thomas Müller [Thu, 9 Apr 2015 15:45:57 +0000 (17:45 +0200)]
Fix mock object to return proper type

9 years agoThrow an exception in case checkServer() returns errors
Thomas Müller [Thu, 9 Apr 2015 14:42:34 +0000 (16:42 +0200)]
Throw an exception in case checkServer() returns errors

9 years agoMerge pull request #14540 from owncloud/windows-setup-check
Lukas Reschke [Thu, 9 Apr 2015 14:38:11 +0000 (16:38 +0200)]
Merge pull request #14540 from owncloud/windows-setup-check

Disallow Windows Server in Server Check

9 years agoIntroduce own console application class
Thomas Müller [Wed, 8 Apr 2015 08:53:03 +0000 (10:53 +0200)]
Introduce own console application class

9 years agoblock ocs in single user mode
Robin Appelman [Thu, 9 Apr 2015 13:57:27 +0000 (15:57 +0200)]
block ocs in single user mode