summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4522 from nextcloud/downstream-27596Morris Jobke2017-04-273-25/+57
|\
| * Use the new method in the old one to remove duplicate codeJoas Schilling2017-04-273-36/+41
| * Allow to create a user for a specific backendJoas Schilling2017-04-262-0/+27
* | Merge pull request #4565 from nextcloud/fix-typoMorris Jobke2017-04-271-1/+1
|\ \
| * | Fix typo in HTML tagsMorris Jobke2017-04-271-1/+1
* | | Merge pull request #4561 from nextcloud/text-for-federatedMorris Jobke2017-04-270-0/+0
|\ \ \ | |/ / |/| |
| * | Add hint for federated sharingMorris Jobke2017-04-271-0/+1
* | | Merge pull request #4540 from nextcloud/settings-helpMorris Jobke2017-04-276-6/+11
|\ \ \ | |/ / |/| |
| * | Add more hints to settingsJan-Christoph Borchardt2017-04-266-6/+11
* | | Merge pull request #3770 from nextcloud/faster-search-in-contactsMorris Jobke2017-04-271-7/+6
|\ \ \
| * | | Add back the name query partRoeland Jago Douma2017-04-211-1/+3
| * | | Factorize query for searching contactsThomas Citharel2017-04-211-7/+4
* | | | Merge pull request #4501 from nextcloud/downstream-27144Morris Jobke2017-04-266-18/+59
|\ \ \ \
| * | | | Add duration of last job execution to the tableNoveen Sachdeva2017-04-257-19/+60
* | | | | Merge pull request #4519 from nextcloud/downstream-27703Morris Jobke2017-04-262-0/+14
|\ \ \ \ \
| * | | | | Reload file list when leaving hidden stateVincent Petry2017-04-262-0/+14
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4515 from nextcloud/downstream-27643Morris Jobke2017-04-2615-141/+242
|\ \ \ \ \
| * | | | | Update autoloaderRoeland Jago Douma2017-04-262-4/+0
| * | | | | Fix missing conflict resolutionsJoas Schilling2017-04-263-12/+0
| * | | | | Adjust query/event logging code in favour of more complex owncloud/diagnostic...Piotr Mrówczyński2017-04-2613-137/+254
| |/ / / /
* | | | | Merge pull request #4517 from nextcloud/downstream-27637Morris Jobke2017-04-261-4/+4
|\ \ \ \ \
| * | | | | Fix recovery checkbox label to properly pointVincent Petry2017-04-261-4/+4
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-27218-542/+896
* | | | | Merge pull request #4537 from nextcloud/change-linkMorris Jobke2017-04-261-5/+5
|\ \ \ \ \
| * | | | | Change feed to website planet link, fix wordingJan-Christoph Borchardt2017-04-261-5/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4526 from nextcloud/downstream-27269Morris Jobke2017-04-262-32/+48
|\ \ \ \ \
| * | | | | Use regex to detect part filesVincent Petry2017-04-262-34/+44
| * | | | | #7496 Don`t allow upload of files with extension .partIlja Neumann2017-04-261-0/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #4454 from nextcloud/add-bundles-to-install-pageMorris Jobke2017-04-2633-95/+1230
|\ \ \ \ \
| * | | | | Fix testsLukas Reschke2017-04-261-5/+5
| * | | | | Update autoload mapLukas Reschke2017-04-262-0/+2
| * | | | | Add SocialSharingBundleLukas Reschke2017-04-264-0/+89
| * | | | | Fix bundles header positionJan-Christoph Borchardt2017-04-261-2/+2
| * | | | | Style app bundlesJan-Christoph Borchardt2017-04-263-10/+32
| * | | | | Use .installed layoutLukas Reschke2017-04-262-4/+4
| * | | | | Styling fixes to bundle headerJan-Christoph Borchardt2017-04-261-1/+9
| * | | | | Add tests for repairstepLukas Reschke2017-04-262-1/+145
| * | | | | Add spreed to Groupware bundleLukas Reschke2017-04-262-0/+2
| * | | | | Add tests for bundle codeLukas Reschke2017-04-265-0/+250
| * | | | | Remove unrequired getDescription() methodLukas Reschke2017-04-264-29/+1
| * | | | | Adjust testsLukas Reschke2017-04-262-5/+24
| * | | | | Make the emergency disable also accept arraysLukas Reschke2017-04-261-5/+6
| * | | | | Make disableapp.php accept arraysLukas Reschke2017-04-263-53/+135
| * | | | | Fix stylingLukas Reschke2017-04-263-1/+8
| * | | | | Don't sort on app bundlesLukas Reschke2017-04-261-10/+12
| * | | | | Add titlesLukas Reschke2017-04-263-20/+43
| * | | | | Add app bundlesLukas Reschke2017-04-2619-21/+533
| | |/ / / | |/| | |
* | | | | Merge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-...Morris Jobke2017-04-263-0/+214
|\ \ \ \ \
| * | | | | Fix closing details view when viewing file in folderDaniel Calviño Sánchez2017-04-251-0/+1
| * | | | | Add acceptance tests for closing details view in Files appDaniel Calviño Sánchez2017-04-252-0/+213
| | |_|/ / | |/| | |