summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #2761 from nextcloud/dont-resolve-shares-if-public-sharing...Björn Schießle2016-12-222-55/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | no need to throw a exception we catch two lines laterBjoern Schiessle2016-12-221-5/+4
| * | | | | | | | | Only don't resolve public linksRoeland Jago Douma2016-12-201-4/+3
| * | | | | | | | | Don't resolve public share token if public sharing is disabledLukas Reschke2016-12-202-52/+102
* | | | | | | | | | Merge pull request #2563 from nextcloud/fix-password-resetMorris Jobke2016-12-222-1/+46
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | fix password reset if encryption is enabledBjoern Schiessle2016-12-082-1/+46
* | | | | | | | | | Merge pull request #2802 from nextcloud/trash-improvementsMorris Jobke2016-12-222-10/+81
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | make code more robustBjoern Schiessle2016-12-211-10/+25
| * | | | | | | | | check for class name in case class is not loadedBjoern Schiessle2016-12-211-2/+1
| * | | | | | | | | add a copy to the owners trash bin if another user moves a file out of a shar...Bjoern Schiessle2016-12-212-10/+67
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2803 from nextcloud/hide-notification-for-updatesJoas Schilling2016-12-221-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Hide update notification if notification center is enabledMorris Jobke2016-12-211-1/+2
* | | | | | | | | Merge pull request #2811 from nextcloud/extended_apcu_casLukas Reschke2016-12-221-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extend APCu test with int CASRoeland Jago Douma2016-12-211-0/+12
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2808 from alantygel/patch-1Morris Jobke2016-12-221-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Translation string corrected > 1 userAlan Tygel2016-12-211-1/+1
| |/ / / / / / /
* / / / / / / / [tx-robot] updated from transifexNextcloud bot2016-12-228-2/+8
|/ / / / / / /
* | | | | | | Merge pull request #2792 from nextcloud/update-drone-imagesMorris Jobke2016-12-211-9/+9
|\ \ \ \ \ \ \
| * | | | | | | update drone images to latest versionMorris Jobke2016-12-201-9/+9
| |/ / / / / /
* | | | | | | Merge pull request #2796 from nextcloud/set-exit-code-to-1-if-test-is-failingMorris Jobke2016-12-211-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Set exit code to 1 if integration test is failingLukas Reschke2016-12-201-2/+5
| |/ / / / / /
* | | | | | | Merge pull request #2758 from nextcloud/only-one-dav-backendLukas Reschke2016-12-216-25/+76
|\ \ \ \ \ \ \
| * | | | | | | Adjust integration test to Nextcloud brandingLukas Reschke2016-12-191-2/+2
| * | | | | | | Fix error when $view is null when being passed into some pluginsThomas Müller2016-12-192-24/+27
| * | | | | | | Fix "Call to a member function getUID() on null"Thomas Müller2016-12-191-0/+1
| * | | | | | | No challenge within federated authThomas Müller2016-12-191-0/+8
| * | | | | | | Allow registration of federated authThomas Müller2016-12-191-4/+3
| * | | | | | | Register only one dav auth backendThomas Citharel2016-12-191-4/+4
| * | | | | | | Add test for duplicate 401 headers on DAVVincent Petry2016-12-192-0/+40
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #2724 from nextcloud/fix-23591Lukas Reschke2016-12-218-52/+292
|\ \ \ \ \ \ \
| * | | | | | | Add proper testsLukas Reschke2016-12-196-49/+220
| * | | | | | | Update testsVictor Dubiniuk2016-12-161-1/+18
| * | | | | | | Check return value for file_put_contents. Add return value to the commandsVictor Dubiniuk2016-12-164-19/+71
* | | | | | | | Merge pull request #2784 from nextcloud/2fa_command_testsLukas Reschke2016-12-212-0/+198
|\ \ \ \ \ \ \ \
| * | | | | | | | Add tests for 2FA commandsRoeland Jago Douma2016-12-202-0/+198
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-2112-2/+16
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2790 from nextcloud/update-integration-test-imageMorris Jobke2016-12-201-20/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Update integration test imageLukas Reschke2016-12-201-20/+20
* | | | | | | | | Merge pull request #2273 from nextcloud/fix_invalid_calendarLukas Reschke2016-12-205-0/+452
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add DAV repair step to fix calendar dataRoeland Jago Douma2016-11-245-0/+452
* | | | | | | | | | Merge pull request #2789 from nextcloud/add-smb-testsLukas Reschke2016-12-209-264/+115
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Run coverageLukas Reschke2016-12-201-2/+12
| * | | | | | | | | Add SMB tests and execute files_external testsLukas Reschke2016-12-209-264/+105
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2719 from nextcloud/behat-transferownershipLukas Reschke2016-12-207-21/+414
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix finding transferred folder in integration testsVincent Petry2016-12-191-1/+1
| * | | | | | | | | Adjust to Nextcloud changesLukas Reschke2016-12-192-13/+41
| * | | | | | | | | Add transfer ownership integration tests (#26543)Vincent Petry2016-12-196-40/+405
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #2769 from nextcloud/improve_user_user_coverageMorris Jobke2016-12-201-49/+204
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve OC\User\User coverageRoeland Jago Douma2016-12-201-49/+204
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #2765 from nextcloud/kill-repairlegacystoragesChristoph Wurst2016-12-205-582/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |