summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-0338-8/+142
* Merge pull request #4662 from nextcloud/remove-named-selectors-from-acceptanc...Morris Jobke2017-05-026-30/+33
|\
| * Replace "named" Mink selectors with "named_exact" Mink selectorsDaniel Calviño Sánchez2017-05-021-14/+14
| * Remove "content" locator from acceptance testsDaniel Calviño Sánchez2017-05-026-16/+19
* | Merge pull request #4545 from individual-it/access-control-3726blizzz2017-05-031-10/+19
|\ \
| * | some small refactoring and reformatingArtur Neumann2017-04-271-6/+16
| * | use jqXHR.fail() to check for failuresArtur Neumann2017-04-271-10/+9
* | | Merge pull request #4623 from nextcloud/fileinfo-mount-permissionsMorris Jobke2017-05-021-2/+6
|\ \ \
| * | | fix permissions of mountpointsRobin Appelman2017-05-011-2/+6
* | | | Merge pull request #4667 from nextcloud/split-up-more-integration-testsMorris Jobke2017-05-023-388/+406
|\ \ \ \
| * | | | Split up sharing-v1-part2.feature to avoid timeoutsMorris Jobke2017-05-023-388/+406
* | | | | Merge pull request #4669 from nextcloud/checkersMorris Jobke2017-05-021-40/+5
|\ \ \ \ \
| * | | | | Consolidate all the code checkers into one jobMorris Jobke2017-05-021-40/+5
* | | | | | Merge pull request #4665 from nextcloud/enable-redisMorris Jobke2017-05-023-0/+36
|\ \ \ \ \ \
| * | | | | | Add redis support to our CI jobsMorris Jobke2017-05-023-0/+36
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4620 from nextcloud/preview-error-handlingRoeland Jago Douma2017-05-029-6/+26
|\ \ \ \ \ \
| * | | | | | fix preview testsRobin Appelman2017-05-021-0/+3
| * | | | | | Handle more error casesMorris Jobke2017-05-024-0/+8
| * | | | | | Add PHPDocMorris Jobke2017-05-023-2/+6
| * | | | | | better handling of preview generation errorsRobin Appelman2017-05-022-4/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #4664 from nextcloud/redis-sample-config.phpLukas Reschke2017-05-021-1/+2
|\ \ \ \ \ \
| * | | | | | Improve documentationMorris Jobke2017-05-021-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4611 from nextcloud/js-use-dot-notationRoeland Jago Douma2017-05-026-9/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use dot notation for array access - JSLint recommendationMorris Jobke2017-05-016-9/+9
* | | | | | Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menuLukas Reschke2017-05-022-0/+28
|\ \ \ \ \ \
| * | | | | | Do not show an email action for contacts with emtpy email addressesChristoph Wurst2017-05-022-0/+28
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4636 from nextcloud/jquery-migrate-browserLukas Reschke2017-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | Remove dependency on jquery-migrate.js for browser detectionMorris Jobke2017-05-011-1/+1
* | | | | | | Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codesLukas Reschke2017-05-023-8/+111
|\ \ \ \ \ \ \
| * | | | | | | Hide 2FA backup codes if no other 2FA providers are enabledChristoph Wurst2017-05-023-8/+111
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4657 from nextcloud/add_caching_imageexportRoeland Jago Douma2017-05-022-1/+20
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix testsRoeland Jago Douma2017-05-021-1/+15
| * | | | | | Add caching to the imageexport pluginRoeland Jago Douma2017-05-021-0/+5
| |/ / / / /
* | | | | | Merge pull request #4651 from nextcloud/fix_appfetcher_updateMorris Jobke2017-05-026-36/+61
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump versionRoeland Jago Douma2017-05-021-1/+1
| * | | | | Fix testRoeland Jago Douma2017-05-021-20/+10
| * | | | | Make sure the AppFetcher fetches the new applist from the appstoreRoeland Jago Douma2017-05-024-15/+50
* | | | | | Merge pull request #4638 from nextcloud/fix-copy-tooltipLukas Reschke2017-05-021-3/+0
|\ \ \ \ \ \
| * | | | | | Fix "Copied" message for public linksMorris Jobke2017-05-011-3/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4649 from nextcloud/update-links-to-12Lukas Reschke2017-05-022-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update documentation go.php URL to 12Lukas Reschke2017-05-022-4/+4
* | | | | | Merge pull request #4650 from nextcloud/appcache_on_updatev12.0.0beta1Lukas Reschke2017-05-023-78/+129
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump versionRoeland Jago Douma2017-05-021-1/+1
| * | | | | Fix and update testsRoeland Jago Douma2017-05-021-65/+116
| * | | | | Do not do ETag caching when the version is updatedRoeland Jago Douma2017-05-021-12/+12
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-02112-922/+2648
* | | | | Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-...Morris Jobke2017-05-012-7/+54
|\ \ \ \ \
| * | | | | Add missing spaceLukas Reschke2017-05-011-1/+1
| * | | | | Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-012-8/+55
* | | | | | Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ \ \ \ \ \