]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoFix phpStorm complains and namespace
Joas Schilling [Mon, 20 Apr 2015 10:31:07 +0000 (12:31 +0200)]
Fix phpStorm complains and namespace

9 years agoFix wrong path generation
Morris Jobke [Mon, 20 Apr 2015 09:01:33 +0000 (11:01 +0200)]
Fix wrong path generation

* fixes #15742

9 years agoMerge pull request #15740 from owncloud/get_rid_of_geo
Thomas Müller [Sun, 19 Apr 2015 20:29:30 +0000 (22:29 +0200)]
Merge pull request #15740 from owncloud/get_rid_of_geo

get rid of OC_Geo

9 years agoMerge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage
Thomas Müller [Sun, 19 Apr 2015 19:00:04 +0000 (21:00 +0200)]
Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage

LDAP - move from constants to class member constants

9 years agoget rid of OC_Geo
Georg Ehrke [Sun, 19 Apr 2015 18:16:56 +0000 (20:16 +0200)]
get rid of OC_Geo

9 years agoMerge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp
Roeland Douma [Sun, 19 Apr 2015 13:42:07 +0000 (15:42 +0200)]
Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp

Reduce call of legacy wrapper by call the OCP directly

9 years agoMerge pull request #15737 from owncloud/add-deprecated-version
Roeland Douma [Sun, 19 Apr 2015 13:40:53 +0000 (15:40 +0200)]
Merge pull request #15737 from owncloud/add-deprecated-version

Add version to @deprecated tags

9 years agoMerge pull request #15729 from owncloud/remove-unused-variables
Robin McCorkell [Sun, 19 Apr 2015 11:38:29 +0000 (12:38 +0100)]
Merge pull request #15729 from owncloud/remove-unused-variables

Remove unused variables

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

9 years agoAdd version to @deprecated tags
Morris Jobke [Sat, 18 Apr 2015 23:04:59 +0000 (01:04 +0200)]
Add version to @deprecated tags

9 years agoReduce call of legacy wrapper by call the OCP directly
Morris Jobke [Sat, 18 Apr 2015 22:29:09 +0000 (00:29 +0200)]
Reduce call of legacy wrapper by call the OCP directly

* ref #15734
* reduces the call depth, because the private methods just call OCP stuff

9 years agoMerge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
Thomas Müller [Sat, 18 Apr 2015 20:51:15 +0000 (22:51 +0200)]
Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules

Issue/15694 display name of encryption modules

9 years agoMerge pull request #15728 from owncloud/update-iurlgenerator-doc
Thomas Müller [Sat, 18 Apr 2015 20:48:09 +0000 (22:48 +0200)]
Merge pull request #15728 from owncloud/update-iurlgenerator-doc

IUrlGenerator - document linkTo properly

9 years agoMerge pull request #15727 from owncloud/cleanup-db-interface
Thomas Müller [Sat, 18 Apr 2015 20:47:40 +0000 (22:47 +0200)]
Merge pull request #15727 from owncloud/cleanup-db-interface

DB: remove unused parameter - was forgotten during the migration to doct...

9 years agoMerge pull request #15725 from owncloud/l10n-public-interface
Thomas Müller [Sat, 18 Apr 2015 20:46:50 +0000 (22:46 +0200)]
Merge pull request #15725 from owncloud/l10n-public-interface

IL10n - add PHPDoc for $options

9 years agoMerge pull request #15722 from owncloud/remove-vardumps
Morris Jobke [Sat, 18 Apr 2015 20:04:25 +0000 (22:04 +0200)]
Merge pull request #15722 from owncloud/remove-vardumps

LDAP tests: switch var_dump to exception

9 years agoMerge pull request #15723 from owncloud/fix-decimal-unit-tests
Morris Jobke [Sat, 18 Apr 2015 20:02:20 +0000 (22:02 +0200)]
Merge pull request #15723 from owncloud/fix-decimal-unit-tests

Use data provider instead of hand-crafted for loops

9 years agoMerge pull request #15720 from owncloud/fix-method-visibility
Thomas Müller [Sat, 18 Apr 2015 19:04:00 +0000 (21:04 +0200)]
Merge pull request #15720 from owncloud/fix-method-visibility

add visibility of methods in server container

9 years agofix followup issues with unneeded parameters
Morris Jobke [Sat, 18 Apr 2015 15:02:39 +0000 (17:02 +0200)]
fix followup issues with unneeded parameters

9 years agoRemove unused variables
Morris Jobke [Sat, 18 Apr 2015 14:17:15 +0000 (16:17 +0200)]
Remove unused variables

* should make scrutinizer a lot more happy
* reduces maybe memory footprint

9 years agoIUrlGenerator - document linkTo properly
Morris Jobke [Sat, 18 Apr 2015 14:03:37 +0000 (16:03 +0200)]
IUrlGenerator - document linkTo properly

* parameter $args was there since 6.0.0
* see 61a9098b7d88656d0297a18c1b7685c04d1c64dc

9 years agoDB: remove unused parameter - was forgotten during the migration to doctrine
Morris Jobke [Sat, 18 Apr 2015 13:57:13 +0000 (15:57 +0200)]
DB: remove unused parameter - was forgotten during the migration to doctrine

377e9a8677afc92bca61fb1bb055901db8457896 <- doctrine merge

9 years agoIL10n - add PHPDoc for $options
Morris Jobke [Sat, 18 Apr 2015 13:50:17 +0000 (15:50 +0200)]
IL10n - add PHPDoc for $options

* added in #11549
* undocumented in the public interface

9 years agoLDAP - move from constants to class member constants
Morris Jobke [Sat, 18 Apr 2015 13:29:08 +0000 (15:29 +0200)]
LDAP - move from constants to class member constants

* fixes scrutinizer warnings
* drops the usage of deprecated code usage

9 years agoUse data provider instead of hand-crafted for loops
Morris Jobke [Sat, 18 Apr 2015 13:19:33 +0000 (15:19 +0200)]
Use data provider instead of hand-crafted for loops

* reduces scrutinizer complains
* uses PHPUnit functionality

9 years agoLDAP tests: swithc var_dump to exception
Morris Jobke [Sat, 18 Apr 2015 13:09:15 +0000 (15:09 +0200)]
LDAP tests: swithc var_dump to exception

9 years agofix wrong variable names in PHPDoc
Morris Jobke [Sat, 18 Apr 2015 12:31:28 +0000 (14:31 +0200)]
fix wrong variable names in PHPDoc

9 years agoadd visibility of methods in server container and interface
Morris Jobke [Sat, 18 Apr 2015 09:46:29 +0000 (11:46 +0200)]
add visibility of methods in server container and interface

9 years agoFix dummy encryption module registration
Joas Schilling [Sat, 18 Apr 2015 08:20:32 +0000 (10:20 +0200)]
Fix dummy encryption module registration

9 years agoFix potential undefined variable
Joas Schilling [Sat, 18 Apr 2015 08:20:13 +0000 (10:20 +0200)]
Fix potential undefined variable

9 years agoFix display name of encryption modules
Joas Schilling [Sat, 18 Apr 2015 08:18:58 +0000 (10:18 +0200)]
Fix display name of encryption modules

9 years agoMerge pull request #15692 from owncloud/log-exception-type-master
Joas Schilling [Sat, 18 Apr 2015 07:28:48 +0000 (09:28 +0200)]
Merge pull request #15692 from owncloud/log-exception-type-master

Write the type of exception to the log - really helpful for exceptions w...

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 Apr 2015 05:55:19 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agoMerge pull request #15714 from owncloud/fix-ldap-xpmode
Morris Jobke [Fri, 17 Apr 2015 23:27:19 +0000 (01:27 +0200)]
Merge pull request #15714 from owncloud/fix-ldap-xpmode

always open filter tab in raw mode, when 'Manually enter LDAP filters' i...

9 years agoalways open filter tab in raw mode, when 'Manually enter LDAP filters' is checked
Arthur Schiwon [Fri, 17 Apr 2015 21:33:59 +0000 (23:33 +0200)]
always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked

9 years agoMerge pull request #15691 from owncloud/vobject-sabre2.1
Morris Jobke [Fri, 17 Apr 2015 20:33:00 +0000 (22:33 +0200)]
Merge pull request #15691 from owncloud/vobject-sabre2.1

Get rid of the obsolete OC_VObject class

9 years agoMerge pull request #15708 from owncloud/fix-capitalization
Morris Jobke [Fri, 17 Apr 2015 19:16:43 +0000 (21:16 +0200)]
Merge pull request #15708 from owncloud/fix-capitalization

fix capitalization for server-side encryption and email server

9 years agoRevert "make jshint happy"
Thomas Müller [Fri, 17 Apr 2015 16:02:08 +0000 (18:02 +0200)]
Revert "make jshint happy"

This reverts commit a255866a937d906dbbe0ed46aa7394326b30e4f5.

9 years agoRevert "use a simple function - OC.Encryption is already defined - fixes #15707"
Thomas Müller [Fri, 17 Apr 2015 16:02:00 +0000 (18:02 +0200)]
Revert "use a simple function - OC.Encryption is already defined - fixes #15707"

This reverts commit c1a60a23498abe6502d207b8c803255e31515577.

9 years agomake jshint happy
Thomas Müller [Fri, 17 Apr 2015 15:59:53 +0000 (17:59 +0200)]
make jshint happy

9 years agofix capitalization for server-side encryption and email server, fix #15642
Jan-Christoph Borchardt [Fri, 17 Apr 2015 15:57:25 +0000 (17:57 +0200)]
fix capitalization for server-side encryption and email server, fix #15642

9 years agouse a simple function - OC.Encryption is already defined - fixes #15707
Thomas Müller [Fri, 17 Apr 2015 15:57:17 +0000 (17:57 +0200)]
use a simple function - OC.Encryption is already defined - fixes #15707

9 years agoMerge pull request #15699 from owncloud/fix-15696-master
Thomas Müller [Fri, 17 Apr 2015 15:36:07 +0000 (17:36 +0200)]
Merge pull request #15699 from owncloud/fix-15696-master

Fix 15696 master

9 years agoMerge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps
Thomas Müller [Fri, 17 Apr 2015 15:07:18 +0000 (17:07 +0200)]
Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps

Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...

9 years agoDo not concat translation string
Thomas Müller [Fri, 17 Apr 2015 12:26:58 +0000 (14:26 +0200)]
Do not concat translation string

9 years agofixing undefined variable
Thomas Müller [Fri, 17 Apr 2015 12:25:57 +0000 (14:25 +0200)]
fixing undefined variable

9 years agoMerge pull request #15686 from owncloud/enc_fix_change_password
Thomas Müller [Fri, 17 Apr 2015 12:14:29 +0000 (14:14 +0200)]
Merge pull request #15686 from owncloud/enc_fix_change_password

fix change password if no user is logged in, occ call

9 years agoDelay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookMan...
Thomas Müller [Fri, 17 Apr 2015 11:55:31 +0000 (13:55 +0200)]
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'

9 years agofix change password if no user is logged in, occ call
Bjoern Schiessle [Fri, 17 Apr 2015 08:52:40 +0000 (10:52 +0200)]
fix change password if no user is logged in, occ call

9 years agoWrite the type of exception to the log - really helpful for exceptions which hold...
Thomas Müller [Fri, 17 Apr 2015 11:10:10 +0000 (13:10 +0200)]
Write the type of exception to the log - really helpful for exceptions which hold no message

9 years agoGet rid of the obsolete OC_VObject class
Vincent Petry [Thu, 16 Apr 2015 16:34:44 +0000 (18:34 +0200)]
Get rid of the obsolete OC_VObject class

The class isn't needed any more since the update to Sabre 2.1

9 years agoMerge pull request #15616 from owncloud/enc_stream_copy
Vincent Petry [Fri, 17 Apr 2015 09:32:24 +0000 (11:32 +0200)]
Merge pull request #15616 from owncloud/enc_stream_copy

always create a new instance of the encryption module

9 years agoalways create a new instance of the encryption module
Bjoern Schiessle [Tue, 14 Apr 2015 14:48:39 +0000 (16:48 +0200)]
always create a new instance of the encryption module

9 years agoMerge pull request #15679 from owncloud/fix-private-member-access
Thomas Müller [Fri, 17 Apr 2015 07:13:54 +0000 (09:13 +0200)]
Merge pull request #15679 from owncloud/fix-private-member-access

Fix private member access of parent class in ocsresponse

9 years agoMerge pull request #15680 from owncloud/add-since-tags-to-public-namespace
Thomas Müller [Fri, 17 Apr 2015 07:13:04 +0000 (09:13 +0200)]
Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace

Add @since tags to all methods in public namespace

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 17 Apr 2015 05:55:37 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agoAdd @since tags to all methods in public namespace
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

9 years agoFix private member access of parent class in ocsresponse
Morris Jobke [Thu, 16 Apr 2015 14:54:01 +0000 (16:54 +0200)]
Fix private member access of parent class in ocsresponse

* noticed while checking PHPDoc

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.