summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4588 from nextcloud/update-redirection-login-flowRoeland Jago Douma2017-05-043-6/+7
|\
| * Update login flow redirectionMario Danic2017-05-043-6/+7
* | Merge pull request #4700 from nextcloud/redis-cluster-compatibilityRoeland Jago Douma2017-05-041-2/+2
|\ \ | |/ |/|
| * Compatibility with Redis and RedisClusterMorris Jobke2017-05-041-2/+2
* | Merge pull request #4694 from nextcloud/fix_4676Christoph Wurst2017-05-041-0/+24
|\ \ | |/ |/|
| * Load proper fonts in guest.cssRoeland Jago Douma2017-05-041-0/+24
* | Merge pull request #4681 from nextcloud/link_radioMorris Jobke2017-05-043-59/+68
|\ \
| * | Fix event firingRoeland Jago Douma2017-05-041-3/+3
| * | Add radio class to read/write sharing options and 1px left adjustmentFelix A. Epp2017-05-042-3/+6
| * | Fix read-only label idFelix A. Epp2017-05-041-1/+1
| * | Make files drop more permanentRoeland Jago Douma2017-05-042-59/+65
* | | Merge pull request #4693 from nextcloud/fix_4644Roeland Jago Douma2017-05-042-1/+16
|\ \ \
| * | | Do not reload the filelist on first openRoeland Jago Douma2017-05-042-1/+16
| | |/ | |/|
* | | Merge pull request #4690 from nextcloud/fix-igroup-sinceMorris Jobke2017-05-041-1/+1
|\ \ \
| * | | IGroup::getDisplayName is available version 12, not 11 (9.2)Julius Härtl2017-05-041-1/+1
| |/ /
* | | Merge pull request #4689 from nextcloud/fix-password-protected-mail-sharesBjörn Schießle2017-05-042-2/+52
|\ \ \ | |/ / |/| |
| * | check password for mail shares as wellBjoern Schiessle2017-05-042-2/+52
|/ /
* | Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissionsMorris Jobke2017-05-041-6/+2
|\ \
| * | Revert "fix permissions of mountpoints"Morris Jobke2017-05-041-6/+2
|/ /
* | Merge pull request #4682 from nextcloud/try-to-start-browser-sessions-again-w...Morris Jobke2017-05-045-14/+99
|\ \
| * | Set timeout multiplier to 10 for acceptance tests run by DroneDaniel Calviño Sánchez2017-05-031-3/+3
| * | Add option to acceptance test runners to set a custom timeout multiplierDaniel Calviño Sánchez2017-05-032-1/+48
| * | Try again to start browser sessions when they failDaniel Calviño Sánchez2017-05-031-1/+27
| * | Generalize attribute nameDaniel Calviño Sánchez2017-05-031-8/+8
| * | Fix exponential increase of timeout when finding ancestor elementsDaniel Calviño Sánchez2017-05-031-1/+13
* | | [tx-robot] updated from transifexNextcloud bot2017-05-0436-4/+252
| |/ |/|
* | [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