summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Check the correct config for displaying the "notify by email" optionJoas Schilling2016-01-083-3/+10
* Merge pull request #21220 from owncloud/remove-to-make-apache24-happyLukas Reschke2016-01-081-3/+6
|\
| * always check if the csp is emptyJörn Friedrich Dreyer2016-01-081-1/+1
| * Use setifempty to please incompatible httpd versionsLukas Reschke2016-01-081-3/+6
|/
* Merge pull request #21032 from owncloud/router-error-handlingThomas Müller2016-01-083-67/+58
|\
| * Deprecate remaining function and entire classRoeland Jago Douma2016-01-071-0/+2
| * Cleanup router codeLukas Reschke2016-01-072-66/+50
| * Check if app does existsLukas Reschke2016-01-071-1/+6
* | Merge pull request #21527 from owncloud/remove_all_avatarsThomas Müller2016-01-082-13/+31
|\ \
| * | Remove all cache avatars on avatar deletionRoeland Jago Douma2016-01-072-13/+31
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0880-64/+58
| |/ |/|
* | Merge pull request #21498 from owncloud/cleanup-OC_DBThomas Müller2016-01-0727-119/+44
|\ \
| * | Remove OC_DB::getConnectionMorris Jobke2016-01-0720-34/+28
| * | Remove OC_DB::insertidMorris Jobke2016-01-075-20/+5
| * | Remove beginTransaction, commit, rollback from OC_DBMorris Jobke2016-01-072-24/+3
| * | Remove OC_DB::isErrorMorris Jobke2016-01-073-20/+7
| * | Remove OC_DB::dropTableMorris Jobke2016-01-075-22/+2
* | | Merge pull request #20966 from knox/masterThomas Müller2016-01-071-0/+2
|\ \ \
| * \ \ Merge branch 'master' into mastermbi2015-12-30651-2700/+10956
| |\ \ \
| * | | | Do not rewrite letsencrypt .well-known URImbi2015-12-081-0/+1
| * | | | Merge branch 'master' into mastermbi2015-12-08192-459/+3400
| |\ \ \ \
| * | | | | Allow .well-known URI for letsencryptmbi2015-12-051-0/+1
* | | | | | Merge pull request #21066 from owncloud/behat_capabilities_changing_server_co...Thomas Müller2016-01-076-38/+434
|\ \ \ \ \ \
| * | | | | | Deduplicate the arrayJoas Schilling2015-12-111-20/+15
| * | | | | | Speed up the tests by reseting the configs and app only when neededJoas Schilling2015-12-112-27/+47
| * | | | | | Prepare logic to handle nested elements and add pending test casesSergio Bertolin2015-12-112-99/+183
| * | | | | | Added tests disabling options using testing appSergio Bertolin2015-12-112-5/+108
| * | | | | | Add an OCS app for testing instead of using sudo and execJoas Schilling2015-12-115-41/+172
| * | | | | | Added functionality to change server configurationSergio Bertolin2015-12-112-17/+42
| * | | | | | Added functionality for changing server configurationSergio Bertolin2015-12-112-0/+38
* | | | | | | Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-...Thomas Müller2016-01-0714-21/+38
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated shipped flag from info.xml which has no use anymoreJoas Schilling2016-01-079-9/+0
| * | | | | | | Add ownCloud min and max version for shipped appsJoas Schilling2016-01-0710-12/+14
| * | | | | | | Add a warning to the app:check-code if the version is missingJoas Schilling2016-01-072-0/+9
| * | | | | | | Add a warning on the apps list when the version is missingJoas Schilling2016-01-072-0/+15
* | | | | | | | Merge pull request #21512 from owncloud/allow-searching-by-app-idThomas Müller2016-01-071-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow searching apps by IDJoas Schilling2016-01-071-0/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #21481 from owncloud/ext-smb-dependenciesThomas Müller2016-01-071-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-071-2/+4
* | | | | | | | | Merge pull request #21502 from owncloud/di_mimetypedetectorThomas Müller2016-01-072-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI containerRoeland Jago Douma2016-01-072-0/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #21507 from owncloud/users-dropdownscrollThomas Müller2016-01-071-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix users list dropdown position after scrollVincent Petry2016-01-071-0/+5
* | | | | | | | | | Merge pull request #21455 from owncloud/fix-method-signatureThomas Müller2016-01-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix method call + undefined variableLukas Reschke2016-01-071-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developersThomas Müller2016-01-073-14/+40
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Allow downgrades for our brave developers, that switch between branchesJoas Schilling2016-01-073-14/+40
| |/ / / / / / /
* | | | | | | | Merge pull request #20773 from owncloud/share2.0_createThomas Müller2016-01-0714-74/+2542
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [Sharing 2.0] Some error cases report 404 instead of 403Roeland Jago Douma2016-01-062-8/+16
| * | | | | | | [Sharing 2.0] Add L10N instance to manager for translated errorsRoeland Jago Douma2016-01-064-28/+65