]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoFix several minor things
Joas Schilling [Mon, 20 Apr 2015 15:44:34 +0000 (17:44 +0200)]
Fix several minor things

9 years agolet user update the private key password in case the login password was changed from...
Bjoern Schiessle [Thu, 16 Apr 2015 13:42:13 +0000 (15:42 +0200)]
let user update the private key password in case the login password was changed from outside

9 years agoMerge pull request #15675 from owncloud/enc_error_messages
Clark Tomlinson [Thu, 16 Apr 2015 13:45:09 +0000 (09:45 -0400)]
Merge pull request #15675 from owncloud/enc_error_messages

[encryption] display warning if password changed or if the keys are not initialized

9 years agoMerge pull request #15445 from owncloud/enc2_migration
Clark Tomlinson [Thu, 16 Apr 2015 13:34:47 +0000 (09:34 -0400)]
Merge pull request #15445 from owncloud/enc2_migration

add migration script from old encryption to new one

9 years agoMerge pull request #15674 from owncloud/fix-console-check-output
Joas Schilling [Thu, 16 Apr 2015 12:51:29 +0000 (14:51 +0200)]
Merge pull request #15674 from owncloud/fix-console-check-output

Convert error and hint to string before writing to the output

9 years agoMerge pull request #15673 from owncloud/issue/15577-transaction-read-committed
Joas Schilling [Thu, 16 Apr 2015 12:33:35 +0000 (14:33 +0200)]
Merge pull request #15673 from owncloud/issue/15577-transaction-read-committed

[master] Using TRANSACTION_READ_COMMITTED

9 years agodisplay warning if password changed or if the keys are not initialized
Bjoern Schiessle [Thu, 16 Apr 2015 11:47:27 +0000 (13:47 +0200)]
display warning if password changed or if the keys are not initialized

9 years agodecrypt private key for public shares correctly
Bjoern Schiessle [Wed, 15 Apr 2015 17:37:03 +0000 (19:37 +0200)]
decrypt private key for public shares correctly

9 years agodetect system wide mount points correctly
Bjoern Schiessle [Wed, 15 Apr 2015 11:19:17 +0000 (13:19 +0200)]
detect system wide mount points correctly

9 years agoif we start writing a file from the beginning, size should start by zero; result...
Bjoern Schiessle [Wed, 15 Apr 2015 11:17:01 +0000 (13:17 +0200)]
if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size

9 years agoallow user to start migration in admin settings if no external user back-ends are...
Bjoern Schiessle [Thu, 9 Apr 2015 14:07:15 +0000 (16:07 +0200)]
allow user to start migration in admin settings if no external user back-ends are enabled

9 years agofix decryption of legacy private key
Bjoern Schiessle [Wed, 8 Apr 2015 10:19:09 +0000 (12:19 +0200)]
fix decryption of legacy private key

9 years agoadd version
Bjoern Schiessle [Wed, 8 Apr 2015 09:47:52 +0000 (11:47 +0200)]
add version

9 years agoadd migration script from old encryption to new one
Bjoern Schiessle [Tue, 7 Apr 2015 16:05:54 +0000 (18:05 +0200)]
add migration script from old encryption to new one

9 years agoConvert error and hint to string before writing to the output - fixes https://mailman...
Thomas Müller [Thu, 16 Apr 2015 10:32:17 +0000 (12:32 +0200)]
Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html

9 years agoMerge pull request #15670 from owncloud/encryption-is-an-shipped-app-master
Joas Schilling [Thu, 16 Apr 2015 09:57:14 +0000 (11:57 +0200)]
Merge pull request #15670 from owncloud/encryption-is-an-shipped-app-master

files_encryption -> encryption

9 years agoUsing TRANSACTION_READ_COMMITTED
Thomas Müller [Mon, 13 Apr 2015 09:36:06 +0000 (11:36 +0200)]
Using TRANSACTION_READ_COMMITTED

9 years agofiles_encryption -> encryption
Thomas Müller [Thu, 16 Apr 2015 08:46:34 +0000 (10:46 +0200)]
files_encryption -> encryption

9 years agoMerge pull request #15623 from t3chguy/master
Jörn Friedrich Dreyer [Thu, 16 Apr 2015 07:30:07 +0000 (09:30 +0200)]
Merge pull request #15623 from t3chguy/master

Redis DB Index via Select

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 16 Apr 2015 05:54:43 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

9 years agoMemcache\Redis Add DB Select Functionality
Michael Telatynski [Tue, 14 Apr 2015 19:40:31 +0000 (20:40 +0100)]
Memcache\Redis Add DB Select Functionality

9 years ago8.1 alpha 1 v8.1.0alpha1
Frank Karlitschek [Wed, 15 Apr 2015 20:16:26 +0000 (22:16 +0200)]
8.1 alpha 1

9 years agoMerge pull request #15654 from owncloud/enc2_header_system_keys
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

9 years agomake 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

9 years agoMerge pull request #15644 from owncloud/sftp-defaultport-storageid
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

9 years agoAdd visibility for method
Morris Jobke [Wed, 15 Apr 2015 15:40:07 +0000 (17:40 +0200)]
Add visibility for method

9 years agoMerge pull request #15638 from owncloud/primary-button-disabled
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

9 years agoFix SFTP storage id to be compatible with older ids
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.

9 years agoMerge pull request #15632 from owncloud/remove-tooltip-fade
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

9 years agoadd disabled state to primary action button
Jan-Christoph Borchardt [Wed, 15 Apr 2015 12:23:54 +0000 (14:23 +0200)]
add disabled state to primary action button

9 years agoremove slow fade animation for remaining tipsy tooltips
Jan-Christoph Borchardt [Wed, 15 Apr 2015 10:25:10 +0000 (12:25 +0200)]
remove slow fade animation for remaining tipsy tooltips

9 years agoMerge pull request #15626 from owncloud/remove-tooltip-fade
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

9 years agoMerge pull request #15613 from owncloud/allow-files-nav-icons
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

9 years agoremove slow fade animation for tipsy tooltip
Jan-Christoph Borchardt [Wed, 15 Apr 2015 07:10:21 +0000 (09:10 +0200)]
remove slow fade animation for tipsy tooltip

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 15 Apr 2015 05:54:38 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

9 years agoMerge pull request #12006 from owncloud/dav-put-storage
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

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Apr 2015 22:22:17 +0000 (18:22 -0400)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 14 Apr 2015 22:15:32 +0000 (18:15 -0400)]
[tx-robot] updated from transifex

9 years agoMerge pull request #15597 from oparoz/another-fallback-for-findbinarypath
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

9 years agoMerge pull request #15592 from owncloud/fix-15590-master
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()"

9 years agoMerge pull request #15612 from owncloud/fix-transifex-master
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

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 agoRemove unneeded comments
Morris Jobke [Tue, 14 Apr 2015 14:44:24 +0000 (16:44 +0200)]
Remove unneeded comments

9 years agoKeep phpdoc updated.
Robin Appelman [Tue, 14 Apr 2015 14:25:52 +0000 (16:25 +0200)]
Keep phpdoc updated.

9 years agofiles_encryption -> encryption
Thomas Müller [Tue, 14 Apr 2015 14:18:12 +0000 (16:18 +0200)]
files_encryption -> encryption

9 years agoAllow files app nav entries to have a different icon class
Morris Jobke [Tue, 14 Apr 2015 14:17:24 +0000 (16:17 +0200)]
Allow files app nav entries to have a different icon class

9 years agopass a stream to the tests
Robin Appelman [Tue, 14 Apr 2015 13:25:52 +0000 (15:25 +0200)]
pass a stream to the tests

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 agoAdding a final fallback for findBinaryPath
Olivier Paroz [Tue, 14 Apr 2015 12:06:58 +0000 (14:06 +0200)]
Adding a final fallback for findBinaryPath

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 agoAvoid php message "Invalid argument supplied for foreach()" - refs #15590
Thomas Müller [Tue, 14 Apr 2015 09:00:20 +0000 (11:00 +0200)]
Avoid php message "Invalid argument supplied for foreach()" - refs #15590

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 agorewind and update error message
Robin Appelman [Mon, 13 Apr 2015 12:14:48 +0000 (14:14 +0200)]
rewind and update error message

9 years agouse our own stream copy instead
Robin Appelman [Mon, 13 Apr 2015 12:13:21 +0000 (14:13 +0200)]
use our own stream copy instead

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