Commit graph

24549 commits

Author SHA1 Message Date
Morris Jobke
ccf47f40aa Remove unused variables
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
Morris Jobke
eb62e7cc27 IUrlGenerator - document linkTo properly
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke
47ecfd98a3 DB: remove unused parameter - was forgotten during the migration to doctrine
* 377e9a8677 <- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke
9ffac12986 IL10n - add PHPDoc for $options
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke
58e5878b4d LDAP - move from constants to class member constants
* fixes scrutinizer warnings
* drops the usage of deprecated code usage
2015-04-18 15:29:08 +02:00
Morris Jobke
758b2332f0 Use data provider instead of hand-crafted for loops
* reduces scrutinizer complains
* uses PHPUnit functionality
2015-04-18 15:19:33 +02:00
Morris Jobke
85d0fc5cf6 LDAP tests: swithc var_dump to exception 2015-04-18 15:09:15 +02:00
Morris Jobke
f72dabb4eb fix wrong variable names in PHPDoc 2015-04-18 14:31:28 +02:00
Morris Jobke
11f29f6d95 add visibility of methods in server container and interface 2015-04-18 14:19:22 +02:00
Olivier Paroz
fcc1b9b3cc Thou shalt not corrupt the answer of a cache request 2015-04-18 12:33:43 +02:00
Joas Schilling
3f3f8c2f99 Fix usage of deprecated private constants 2015-04-18 10:30:02 +02:00
Joas Schilling
491e590165 Fix dummy encryption module registration 2015-04-18 10:20:32 +02:00
Joas Schilling
b5c5775626 Fix potential undefined variable 2015-04-18 10:20:13 +02:00
Joas Schilling
4d238c3949 Fix display name of encryption modules 2015-04-18 10:18:58 +02:00
Joas Schilling
6ce1abfa5c Deprecate the OC_API constants in favor of the OCP ones 2015-04-18 09:29:52 +02:00
Joas Schilling
4e58f4892a Move constants to OCP\API so apps can use them 2015-04-18 09:29:51 +02:00
Joas Schilling
8cb0d97b10 Merge pull request #15692 from owncloud/log-exception-type-master
Write the type of exception to the log - really helpful for exceptions w...
2015-04-18 09:28:48 +02:00
Joas Schilling
5acda185bd Correctly prefix OC_API with \ since its not in the namespace 2015-04-18 09:12:42 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Morris Jobke
4dd2ad7f4a Merge pull request #15714 from owncloud/fix-ldap-xpmode
always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
2015-04-18 01:27:19 +02:00
Arthur Schiwon
fe237fd159 always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked 2015-04-17 23:33:59 +02:00
Morris Jobke
7ab1f807fb Merge pull request #15691 from owncloud/vobject-sabre2.1
Get rid of the obsolete OC_VObject class
2015-04-17 22:33:00 +02:00
Morris Jobke
34841ea5dd Merge pull request #15708 from owncloud/fix-capitalization
fix capitalization for server-side encryption and email server
2015-04-17 21:16:43 +02:00
Bjoern Schiessle
d0a6fb1f2c let user update the private key password in case the login password was changed from outside 2015-04-17 20:11:22 +02:00
Thomas Müller
ae681f0061 Revert "make jshint happy"
This reverts commit a255866a93.
2015-04-17 18:02:08 +02:00
Thomas Müller
0ca6398aa3 Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
This reverts commit c1a60a2349.
2015-04-17 18:02:00 +02:00
Thomas Müller
a255866a93 make jshint happy 2015-04-17 17:59:53 +02:00
Jan-Christoph Borchardt
b083b65894 fix capitalization for server-side encryption and email server, fix #15642 2015-04-17 17:57:30 +02:00
Thomas Müller
c1a60a2349 use a simple function - OC.Encryption is already defined - fixes #15707 2015-04-17 17:57:17 +02:00
Thomas Müller
f2fe9fffd9 Merge pull request #15699 from owncloud/fix-15696-master
Fix 15696 master
2015-04-17 17:36:07 +02:00
Thomas Müller
85dbaeee97 Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
2015-04-17 17:07:18 +02:00
Thomas Müller
2e803fd2cd Do not concat translation string 2015-04-17 14:26:58 +02:00
Thomas Müller
d9f23c0578 fixing undefined variable 2015-04-17 14:25:57 +02:00
Thomas Müller
295839930a Merge pull request #15686 from owncloud/enc_fix_change_password
fix change password if no user is logged in, occ call
2015-04-17 14:14:29 +02:00
Thomas Müller
d9990c2b4e Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager' 2015-04-17 13:55:31 +02:00
Bjoern Schiessle
195a48b2b8 fix change password if no user is logged in, occ call 2015-04-17 13:26:38 +02:00
Thomas Müller
d671f13f26 Write the type of exception to the log - really helpful for exceptions which hold no message 2015-04-17 13:10:10 +02:00
Vincent Petry
b7e5884b54 Get rid of the obsolete OC_VObject class
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
Vincent Petry
aef6ecdbf1 Merge pull request #15616 from owncloud/enc_stream_copy
always create a new instance of the encryption module
2015-04-17 11:32:24 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Roeland Jago Douma
b971029652 Added unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma
595adfd193 moved from html to $('html') to fix unit tests 2015-04-17 09:38:09 +02:00
Roeland Jago Douma
c456f5dee1 Reset sharedialog values 2015-04-17 09:38:09 +02:00
Thomas Müller
f32d97750c Merge pull request #15679 from owncloud/fix-private-member-access
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Thomas Müller
852cc6f2c6 Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Morris Jobke
7644950b48 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
2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73 Fix private member access of parent class in ocsresponse
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Clark Tomlinson
ac133e9faa Merge pull request #15675 from owncloud/enc_error_messages
[encryption] display warning if password changed or if the keys are not initialized
2015-04-16 09:45:09 -04:00
Clark Tomlinson
1174ad0681 Merge pull request #15445 from owncloud/enc2_migration
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00