]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Thu, 16 Apr 2015 15:00:08 +0000 (17:00 +0200)]
Add @since tags to all methods in public namespace
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
Morris Jobke [Wed, 15 Apr 2015 18:28:58 +0000 (20:28 +0200)]
Merge pull request #15654 from owncloud/enc2_header_system_keys
make sure that encrypted private keys always have a header
Bjoern Schiessle [Wed, 15 Apr 2015 17:52:48 +0000 (19:52 +0200)]
make sure that encrypted private keys always have a header
Morris Jobke [Wed, 15 Apr 2015 15:40:18 +0000 (17:40 +0200)]
Merge pull request #15644 from owncloud/sftp-defaultport-storageid
Fix SFTP storage id to be compatible with older ids
Morris Jobke [Wed, 15 Apr 2015 15:40:07 +0000 (17:40 +0200)]
Add visibility for method
Morris Jobke [Wed, 15 Apr 2015 14:43:40 +0000 (16:43 +0200)]
Merge pull request #15638 from owncloud/primary-button-disabled
add disabled state to primary action button
Vincent Petry [Wed, 15 Apr 2015 14:21:41 +0000 (16:21 +0200)]
Fix SFTP storage id to be compatible with older ids
Remove port from SFTP storage id if it is 22.
This will prevent recreating a different storage entry due to id
mismatch after upgrade.
Jan-Christoph Borchardt [Wed, 15 Apr 2015 12:42:45 +0000 (14:42 +0200)]
Merge pull request #15632 from owncloud/remove-tooltip-fade
remove slow fade animation for remaining tipsy tooltips
Jan-Christoph Borchardt [Wed, 15 Apr 2015 12:23:54 +0000 (14:23 +0200)]
add disabled state to primary action button
Jan-Christoph Borchardt [Wed, 15 Apr 2015 10:25:10 +0000 (12:25 +0200)]
remove slow fade animation for remaining tipsy tooltips
Vincent Petry [Wed, 15 Apr 2015 10:14:54 +0000 (12:14 +0200)]
Merge pull request #15626 from owncloud/remove-tooltip-fade
remove slow fade animation for tipsy tooltip
Thomas Müller [Wed, 15 Apr 2015 09:18:58 +0000 (11:18 +0200)]
Merge pull request #15613 from owncloud/allow-files-nav-icons
Allow files app nav entries to have a different icon class
Jan-Christoph Borchardt [Wed, 15 Apr 2015 07:10:21 +0000 (09:10 +0200)]
remove slow fade animation for tipsy tooltip
Jenkins for ownCloud [Wed, 15 Apr 2015 05:54:38 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 15 Apr 2015 01:08:52 +0000 (03:08 +0200)]
Merge pull request #12006 from owncloud/dav-put-storage
Work directly on the storage when uploading over webdav
Jenkins for ownCloud [Tue, 14 Apr 2015 22:22:17 +0000 (18:22 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Apr 2015 22:15:32 +0000 (18:15 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 14 Apr 2015 22:16:56 +0000 (00:16 +0200)]
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
Adding a final fallback for findBinaryPath
Thomas Müller [Tue, 14 Apr 2015 22:14:08 +0000 (00:14 +0200)]
Merge pull request #15592 from owncloud/fix-15590-master
Avoid php message "Invalid argument supplied for foreach()"
Vincent Petry [Tue, 14 Apr 2015 16:10:17 +0000 (18:10 +0200)]
Merge pull request #15612 from owncloud/fix-transifex-master
files_encryption -> encryption
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
Morris Jobke [Tue, 14 Apr 2015 14:44:24 +0000 (16:44 +0200)]
Remove unneeded comments
Robin Appelman [Tue, 14 Apr 2015 14:25:52 +0000 (16:25 +0200)]
Keep phpdoc updated.
Thomas Müller [Tue, 14 Apr 2015 14:18:12 +0000 (16:18 +0200)]
files_encryption -> encryption
Morris Jobke [Tue, 14 Apr 2015 14:17:24 +0000 (16:17 +0200)]
Allow files app nav entries to have a different icon class
Robin Appelman [Tue, 14 Apr 2015 13:25:52 +0000 (15:25 +0200)]
pass a stream to the tests
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
Olivier Paroz [Tue, 14 Apr 2015 12:06:58 +0000 (14:06 +0200)]
Adding a final fallback for findBinaryPath
Thomas Müller [Tue, 14 Apr 2015 10:53:13 +0000 (12:53 +0200)]
remove calculateUnencryptedSize() - not needed
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
Robin Appelman [Tue, 14 Apr 2015 10:35:53 +0000 (12:35 +0200)]
a bit more phpdoc
Thomas Müller [Tue, 14 Apr 2015 10:27:12 +0000 (12:27 +0200)]
preserve filesize on rename after upload
Thomas Müller [Tue, 14 Apr 2015 10:23:25 +0000 (12:23 +0200)]
fix reading of private key
Thomas Müller [Tue, 14 Apr 2015 09:00:20 +0000 (11:00 +0200)]
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
Thomas Müller [Mon, 13 Apr 2015 22:39:12 +0000 (00:39 +0200)]
Merge pull request #15566 from owncloud/fix-filepicker
fix filepicker
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
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
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
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
Robin Appelman [Mon, 13 Apr 2015 15:09:18 +0000 (17:09 +0200)]
Fix cross storage move with shared storages
Robin Appelman [Thu, 9 Apr 2015 13:13:56 +0000 (15:13 +0200)]
upda tests
Robin Appelman [Thu, 9 Apr 2015 12:10:51 +0000 (14:10 +0200)]
Fix moving mount points
Robin Appelman [Tue, 7 Apr 2015 14:02:37 +0000 (16:02 +0200)]
check that we know the parent
Robin Appelman [Wed, 1 Apr 2015 14:12:01 +0000 (16:12 +0200)]
check for source cache
Robin Appelman [Wed, 1 Apr 2015 13:15:24 +0000 (15:15 +0200)]
reuse cache move logic
Robin Appelman [Wed, 1 Apr 2015 13:12:59 +0000 (15:12 +0200)]
preserve cache data when doing a cross storage move
Joas Schilling [Mon, 13 Apr 2015 14:34:10 +0000 (16:34 +0200)]
Fix namespace duplication and other issues in repairlegacystorages
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
Robin Appelman [Tue, 7 Apr 2015 15:53:40 +0000 (17:53 +0200)]
fix rebase issue
Robin Appelman [Thu, 19 Mar 2015 14:26:47 +0000 (15:26 +0100)]
add missing return for shared
Robin Appelman [Thu, 5 Mar 2015 10:49:31 +0000 (11:49 +0100)]
Properly handle copy/move failures in 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
Robin Appelman [Mon, 9 Feb 2015 14:15:03 +0000 (15:15 +0100)]
properly return false if we cant delete the source file
Robin Appelman [Mon, 19 Jan 2015 15:25:28 +0000 (16:25 +0100)]
Make getSourcePath accessible for storage wrappers
Robin Appelman [Mon, 19 Jan 2015 15:23:33 +0000 (16:23 +0100)]
Fix test
Robin Appelman [Mon, 19 Jan 2015 12:44:37 +0000 (13:44 +0100)]
Implement move/copyFromStorage for shared storage
Robin Appelman [Fri, 16 Jan 2015 12:33:17 +0000 (13:33 +0100)]
Improve cross storage copy between local storages
Robin Appelman [Fri, 16 Jan 2015 12:32:42 +0000 (13:32 +0100)]
Move cross storage copy logic to the storage
Robin Appelman [Wed, 14 Jan 2015 15:44:30 +0000 (16:44 +0100)]
Small cleanup of rename code
Robin Appelman [Mon, 13 Apr 2015 12:14:48 +0000 (14:14 +0200)]
rewind and update error message
Robin Appelman [Mon, 13 Apr 2015 12:13:21 +0000 (14:13 +0200)]
use our own stream copy instead
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
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
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
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.
Jörn Friedrich Dreyer [Mon, 13 Apr 2015 09:29:10 +0000 (11:29 +0200)]
cach user folder for file search results
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
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...
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
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"
Thomas Müller [Mon, 13 Apr 2015 07:26:30 +0000 (09:26 +0200)]
Properly import used classes
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
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
Roeland Jago Douma [Sun, 12 Apr 2015 14:22:21 +0000 (16:22 +0200)]
Initial fix for #15494
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
Jan-Christoph Borchardt [Sat, 11 Apr 2015 11:29:55 +0000 (13:29 +0200)]
fix wrong typeface being used for some buttons
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
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
Lukas Reschke [Fri, 10 Apr 2015 15:21:52 +0000 (17:21 +0200)]
Add "Reply-To" support to sharing mails and refactor code
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
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
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
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
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
Bjoern Schiessle [Thu, 9 Apr 2015 12:59:03 +0000 (14:59 +0200)]
add unit test for crypt.php
Lukas Reschke [Fri, 10 Apr 2015 13:05:34 +0000 (15:05 +0200)]
Add "Reply-To" support for mails
Robin Appelman [Fri, 10 Apr 2015 12:36:37 +0000 (14:36 +0200)]
update icewind/smb to 1.0.0
Vincent Petry [Fri, 10 Apr 2015 11:43:57 +0000 (13:43 +0200)]
Clear leftover shares from other tests
Morris Jobke [Fri, 10 Apr 2015 12:51:21 +0000 (14:51 +0200)]
Throw ServerNotAvailableException always
Morris Jobke [Fri, 10 Apr 2015 12:46:08 +0000 (14:46 +0200)]
[autotest.sh] use the DATABASEHOST for the mysql DB drop
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
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
Vincent Petry [Fri, 10 Apr 2015 10:12:05 +0000 (12:12 +0200)]
Fix converting Guzzle error codes in s2s storage
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.
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
Jan-Christoph Borchardt [Fri, 10 Apr 2015 09:32:02 +0000 (11:32 +0200)]
fix share input loading spinner, fix #15522
Thomas Müller [Fri, 10 Apr 2015 09:17:33 +0000 (11:17 +0200)]
Fix singe user mode on public.php - take two
Jörn Friedrich Dreyer [Thu, 9 Apr 2015 12:03:30 +0000 (14:03 +0200)]
fix cherrypicking
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
Morris Jobke [Thu, 2 Apr 2015 13:05:37 +0000 (15:05 +0200)]
fix typo and comment