Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Check the correct config for displaying the "notify by email" option | Joas Schilling | 2016-01-08 | 3 | -3/+10 |
* | Merge pull request #21220 from owncloud/remove-to-make-apache24-happy | Lukas Reschke | 2016-01-08 | 1 | -3/+6 |
|\ | |||||
| * | always check if the csp is empty | Jörn Friedrich Dreyer | 2016-01-08 | 1 | -1/+1 |
| * | Use setifempty to please incompatible httpd versions | Lukas Reschke | 2016-01-08 | 1 | -3/+6 |
|/ | |||||
* | Merge pull request #21032 from owncloud/router-error-handling | Thomas Müller | 2016-01-08 | 3 | -67/+58 |
|\ | |||||
| * | Deprecate remaining function and entire class | Roeland Jago Douma | 2016-01-07 | 1 | -0/+2 |
| * | Cleanup router code | Lukas Reschke | 2016-01-07 | 2 | -66/+50 |
| * | Check if app does exists | Lukas Reschke | 2016-01-07 | 1 | -1/+6 |
* | | Merge pull request #21527 from owncloud/remove_all_avatars | Thomas Müller | 2016-01-08 | 2 | -13/+31 |
|\ \ | |||||
| * | | Remove all cache avatars on avatar deletion | Roeland Jago Douma | 2016-01-07 | 2 | -13/+31 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-08 | 80 | -64/+58 |
| |/ |/| | |||||
* | | Merge pull request #21498 from owncloud/cleanup-OC_DB | Thomas Müller | 2016-01-07 | 27 | -119/+44 |
|\ \ | |||||
| * | | Remove OC_DB::getConnection | Morris Jobke | 2016-01-07 | 20 | -34/+28 |
| * | | Remove OC_DB::insertid | Morris Jobke | 2016-01-07 | 5 | -20/+5 |
| * | | Remove beginTransaction, commit, rollback from OC_DB | Morris Jobke | 2016-01-07 | 2 | -24/+3 |
| * | | Remove OC_DB::isError | Morris Jobke | 2016-01-07 | 3 | -20/+7 |
| * | | Remove OC_DB::dropTable | Morris Jobke | 2016-01-07 | 5 | -22/+2 |
* | | | Merge pull request #20966 from knox/master | Thomas Müller | 2016-01-07 | 1 | -0/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into master | mbi | 2015-12-30 | 651 | -2700/+10956 |
| |\ \ \ | |||||
| * | | | | Do not rewrite letsencrypt .well-known URI | mbi | 2015-12-08 | 1 | -0/+1 |
| * | | | | Merge branch 'master' into master | mbi | 2015-12-08 | 192 | -459/+3400 |
| |\ \ \ \ | |||||
| * | | | | | Allow .well-known URI for letsencrypt | mbi | 2015-12-05 | 1 | -0/+1 |
* | | | | | | Merge pull request #21066 from owncloud/behat_capabilities_changing_server_co... | Thomas Müller | 2016-01-07 | 6 | -38/+434 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Deduplicate the array | Joas Schilling | 2015-12-11 | 1 | -20/+15 |
| * | | | | | | Speed up the tests by reseting the configs and app only when needed | Joas Schilling | 2015-12-11 | 2 | -27/+47 |
| * | | | | | | Prepare logic to handle nested elements and add pending test cases | Sergio Bertolin | 2015-12-11 | 2 | -99/+183 |
| * | | | | | | Added tests disabling options using testing app | Sergio Bertolin | 2015-12-11 | 2 | -5/+108 |
| * | | | | | | Add an OCS app for testing instead of using sudo and exec | Joas Schilling | 2015-12-11 | 5 | -41/+172 |
| * | | | | | | Added functionality to change server configuration | Sergio Bertolin | 2015-12-11 | 2 | -17/+42 |
| * | | | | | | Added functionality for changing server configuration | Sergio Bertolin | 2015-12-11 | 2 | -0/+38 |
* | | | | | | | Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-... | Thomas Müller | 2016-01-07 | 14 | -21/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove deprecated shipped flag from info.xml which has no use anymore | Joas Schilling | 2016-01-07 | 9 | -9/+0 |
| * | | | | | | | Add ownCloud min and max version for shipped apps | Joas Schilling | 2016-01-07 | 10 | -12/+14 |
| * | | | | | | | Add a warning to the app:check-code if the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+9 |
| * | | | | | | | Add a warning on the apps list when the version is missing | Joas Schilling | 2016-01-07 | 2 | -0/+15 |
* | | | | | | | | Merge pull request #21512 from owncloud/allow-searching-by-app-id | Thomas Müller | 2016-01-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow searching apps by ID | Joas Schilling | 2016-01-07 | 1 | -0/+5 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #21481 from owncloud/ext-smb-dependencies | Thomas Müller | 2016-01-07 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Check libsmbclient-php as well as smbclient binary | Robin McCorkell | 2016-01-07 | 1 | -2/+4 |
* | | | | | | | | | Merge pull request #21502 from owncloud/di_mimetypedetector | Thomas Müller | 2016-01-07 | 2 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI container | Roeland Jago Douma | 2016-01-07 | 2 | -0/+6 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #21507 from owncloud/users-dropdownscroll | Thomas Müller | 2016-01-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix users list dropdown position after scroll | Vincent Petry | 2016-01-07 | 1 | -0/+5 |
* | | | | | | | | | | Merge pull request #21455 from owncloud/fix-method-signature | Thomas Müller | 2016-01-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix method call + undefined variable | Lukas Reschke | 2016-01-07 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers | Thomas Müller | 2016-01-07 | 3 | -14/+40 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Allow downgrades for our brave developers, that switch between branches | Joas Schilling | 2016-01-07 | 3 | -14/+40 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #20773 from owncloud/share2.0_create | Thomas Müller | 2016-01-07 | 14 | -74/+2542 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | [Sharing 2.0] Some error cases report 404 instead of 403 | Roeland Jago Douma | 2016-01-06 | 2 | -8/+16 |
| * | | | | | | | [Sharing 2.0] Add L10N instance to manager for translated errors | Roeland Jago Douma | 2016-01-06 | 4 | -28/+65 |