summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15718 from ↵Thomas Müller2015-04-183-7/+7
|\ | | | | | | | | owncloud/issue/15694-display-name-of-encryption-modules Issue/15694 display name of encryption modules
| * Fix dummy encryption module registrationJoas Schilling2015-04-181-1/+1
| |
| * Fix potential undefined variableJoas Schilling2015-04-181-2/+2
| |
| * Fix display name of encryption modulesJoas Schilling2015-04-181-4/+4
| |
* | Merge pull request #15728 from owncloud/update-iurlgenerator-docThomas Müller2015-04-181-1/+3
|\ \ | | | | | | IUrlGenerator - document linkTo properly
| * | IUrlGenerator - document linkTo properlyMorris Jobke2015-04-181-1/+3
| | | | | | | | | | | | | | | * parameter $args was there since 6.0.0 * see 61a9098b7d88656d0297a18c1b7685c04d1c64dc
* | | Merge pull request #15727 from owncloud/cleanup-db-interfaceThomas Müller2015-04-186-26/+24
|\ \ \ | | | | | | | | DB: remove unused parameter - was forgotten during the migration to doct...
| * | | fix followup issues with unneeded parametersMorris Jobke2015-04-185-20/+20
| | | |
| * | | DB: remove unused parameter - was forgotten during the migration to doctrineMorris Jobke2015-04-182-6/+4
| |/ / | | | | | | | | | * 377e9a8677afc92bca61fb1bb055901db8457896 <- doctrine merge
* | | Merge pull request #15725 from owncloud/l10n-public-interfaceThomas Müller2015-04-181-2/+4
|\ \ \ | | | | | | | | IL10n - add PHPDoc for $options
| * | | IL10n - add PHPDoc for $optionsMorris Jobke2015-04-181-2/+4
| |/ / | | | | | | | | | | | | * added in #11549 * undocumented in the public interface
* | | Merge pull request #15722 from owncloud/remove-vardumpsMorris Jobke2015-04-181-3/+3
|\ \ \ | | | | | | | | LDAP tests: switch var_dump to exception
| * | | LDAP tests: swithc var_dump to exceptionMorris Jobke2015-04-181-3/+3
| |/ /
* | | Merge pull request #15723 from owncloud/fix-decimal-unit-testsMorris Jobke2015-04-181-22/+24
|\ \ \ | | | | | | | | Use data provider instead of hand-crafted for loops
| * | | Use data provider instead of hand-crafted for loopsMorris Jobke2015-04-181-22/+24
| |/ / | | | | | | | | | | | | * reduces scrutinizer complains * uses PHPUnit functionality
* | | Merge pull request #15720 from owncloud/fix-method-visibilityThomas Müller2015-04-184-98/+98
|\ \ \ | |/ / |/| | add visibility of methods in server container
| * | fix wrong variable names in PHPDocMorris Jobke2015-04-182-4/+4
| | |
| * | add visibility of methods in server container and interfaceMorris Jobke2015-04-182-94/+94
|/ /
* | Merge pull request #15692 from owncloud/log-exception-type-masterJoas Schilling2015-04-181-0/+1
|\ \ | |/ |/| Write the type of exception to the log - really helpful for exceptions w...
| * Write the type of exception to the log - really helpful for exceptions which ↵Thomas Müller2015-04-171-0/+1
| | | | | | | | hold no message
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-18242-198/+692
| |
* | Merge pull request #15714 from owncloud/fix-ldap-xpmodeMorris Jobke2015-04-183-2/+8
|\ \ | | | | | | always open filter tab in raw mode, when 'Manually enter LDAP filters' i...
| * | always open filter tab in raw mode, when 'Manually enter LDAP filters' is ↵Arthur Schiwon2015-04-173-2/+8
|/ / | | | | | | checked
* | Merge pull request #15691 from owncloud/vobject-sabre2.1Morris Jobke2015-04-171-258/+0
|\ \ | | | | | | Get rid of the obsolete OC_VObject class
| * | Get rid of the obsolete OC_VObject classVincent Petry2015-04-171-258/+0
| | | | | | | | | | | | The class isn't needed any more since the update to Sabre 2.1
* | | Merge pull request #15708 from owncloud/fix-capitalizationMorris Jobke2015-04-172-5/+5
|\ \ \ | | | | | | | | fix capitalization for server-side encryption and email server
| * | | fix capitalization for server-side encryption and email server, fix #15642Jan-Christoph Borchardt2015-04-172-5/+5
| | | |
* | | | Revert "make jshint happy"Thomas Müller2015-04-172-20/+17
| | | | | | | | | | | | | | | | This reverts commit a255866a937d906dbbe0ed46aa7394326b30e4f5.
* | | | Revert "use a simple function - OC.Encryption is already defined - fixes #15707"Thomas Müller2015-04-171-13/+23
| | | | | | | | | | | | | | | | This reverts commit c1a60a23498abe6502d207b8c803255e31515577.
* | | | make jshint happyThomas Müller2015-04-172-17/+20
| | | |
* | | | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-171-23/+13
| | | |
* | | | Merge pull request #15699 from owncloud/fix-15696-masterThomas Müller2015-04-171-11/+10
|\ \ \ \ | | | | | | | | | | Fix 15696 master
| * | | | Do not concat translation stringThomas Müller2015-04-171-5/+4
| | | | |
| * | | | fixing undefined variableThomas Müller2015-04-171-8/+8
| |/ / /
* | | | Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-appsThomas Müller2015-04-172-19/+68
|\ \ \ \ | |/ / / |/| | | Delay initialization of the OC\Encryption\Update - introducing 'OC\Encry...
| * | | Delay initialization of the OC\Encryption\Update - introducing ↵Thomas Müller2015-04-172-19/+68
| | |/ | |/| | | | | | | 'OC\Encryption\HookManager'
* | | Merge pull request #15686 from owncloud/enc_fix_change_passwordThomas Müller2015-04-172-5/+38
|\ \ \ | |/ / |/| | fix change password if no user is logged in, occ call
| * | fix change password if no user is logged in, occ callBjoern Schiessle2015-04-172-5/+38
| | |
* | | Merge pull request #15616 from owncloud/enc_stream_copyVincent Petry2015-04-176-60/+66
|\ \ \ | |/ / |/| | always create a new instance of the encryption module
| * | always create a new instance of the encryption moduleBjoern Schiessle2015-04-176-60/+66
|/ /
* | Merge pull request #15679 from owncloud/fix-private-member-accessThomas Müller2015-04-171-2/+2
|\ \ | | | | | | Fix private member access of parent class in ocsresponse
| * | Fix private member access of parent class in ocsresponseMorris Jobke2015-04-161-2/+2
| | | | | | | | | | | | * noticed while checking PHPDoc
* | | Merge pull request #15680 from owncloud/add-since-tags-to-public-namespaceThomas Müller2015-04-17141-152/+1373
|\ \ \ | | | | | | | | Add @since tags to all methods in public namespace
| * | | Add @since tags to all methods in public namespaceMorris Jobke2015-04-16141-152/+1373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1742-68/+364
| |/ / |/| |
* | | Merge pull request #15675 from owncloud/enc_error_messagesClark Tomlinson2015-04-166-10/+155
|\ \ \ | | | | | | | | [encryption] display warning if password changed or if the keys are not initialized
| * | | display warning if password changed or if the keys are not initializedBjoern Schiessle2015-04-166-10/+155
| | | |
* | | | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-1629-118/+1204
|\ \ \ \ | | | | | | | | | | add migration script from old encryption to new one
| * | | | decrypt private key for public shares correctlyBjoern Schiessle2015-04-163-4/+4
| | | | |
| * | | | detect system wide mount points correctlyBjoern Schiessle2015-04-168-24/+85
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 00:15:48 +0000