aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix and tidy up tests after merge conflictsArthur Schiwon2016-10-131-16/+8
* Update tests for phunit 5.5Victor Dubiniuk2016-10-135-30/+47
* Harden emptyVictor Dubiniuk2016-10-137-50/+59
* Merge pull request #1704 from nextcloud/avatar_dropdownblizzz2016-10-122-9/+27
|\
| * [9.2] Show avatar in share drop down (#25976)Thomas Müller2016-10-112-9/+27
* | Merge pull request #1713 from nextcloud/rebase_1493Roeland Jago Douma2016-10-121-0/+2
|\ \
| * | fix issue #1482 - mail invites through v1 webdavClaudemir Todo Bom2016-10-121-0/+2
* | | Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xmlMorris Jobke2016-10-125-107/+26
|\ \ \
| * | | Readd Notify commandRoeland Jago Douma2016-10-121-0/+1
| * | | Move console command registration to info.xml for encryption as well as files...Thomas Müller2016-10-125-107/+25
| |/ /
* | | Merge pull request #1712 from nextcloud/us_tear_down_fs_between_cronMorris Jobke2016-10-121-0/+2
|\ \ \
| * | | [master] Tear down FS between cron jobs (#26223)Vincent Petry2016-10-121-0/+2
| |/ /
* | | Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepageRoeland Jago Douma2016-10-121-6/+46
|\ \ \ | |/ / |/| |
| * | Better search functionalityJoas Schilling2016-10-111-5/+23
| * | Fix authors that have a mail or homepageJoas Schilling2016-10-111-2/+24
* | | [tx-robot] updated from transifexNextcloud bot2016-10-1264-66/+82
* | | Merge pull request #1705 from nextcloud/us_register-commands-in-info.xmlJoas Schilling2016-10-1115-175/+68
|\ \ \
| * | | Add tests for commands in info.xmlRoeland Jago Douma2016-10-111-0/+7
| * | | [9.2] Register commands in info.xml (#26248)Thomas Müller2016-10-1114-175/+61
* | | | Merge pull request #1702 from nextcloud/fix_tooltip_ncMorris Jobke2016-10-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Use Nextcloud in share tooltipRoeland Jago Douma2016-10-111-1/+1
| |/ /
* | | Merge pull request #1407 from nextcloud/multiline_commentsMorris Jobke2016-10-119-7/+348
|\ \ \ | |_|/ |/| |
| * | fix textarea submitskjnldsv2016-10-111-2/+3
| * | Fix js testRoeland Jago Douma2016-10-041-1/+1
| * | Add autosize to comments inputRoeland Jago Douma2016-10-042-3/+11
| * | Add autosizeRoeland Jago Douma2016-10-046-2/+334
* | | Merge pull request #1682 from nextcloud/bump_doctrineMorris Jobke2016-10-112-10/+10
|\ \ \ | |_|/ |/| |
| * | Fix QueryBuilderTestsThomas Müller2016-10-111-10/+10
| * | [3rdparty] Bump doctrineRoeland Jago Douma2016-10-111-0/+0
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-10-114-0/+4
* | Merge pull request #1677 from nextcloud/cleanup-testsMorris Jobke2016-10-101-10/+15
|\ \
| * | Fix typehintRoeland Jago Douma2016-10-101-2/+2
| * | Cleanup test caseThomas Müller2016-10-101-10/+15
* | | Merge pull request #1683 from nextcloud/issue-1437-installing-app-with-code-c...Roeland Jago Douma2016-10-101-1/+1
|\ \ \ | |/ / |/| |
| * | Add app name to the callJoas Schilling2016-10-101-1/+1
* | | Merge pull request #1679 from nextcloud/downstream-26282Roeland Jago Douma2016-10-101-1/+1
|\ \ \
| * | | Improve user list rendering perf by not resorting after every add (#26282)Vincent Petry2016-10-101-1/+1
* | | | Merge pull request #1680 from nextcloud/downstream-26308Roeland Jago Douma2016-10-109-1/+1
|\ \ \ \
| * | | | fix drag and drop icon for files appMorris Jobke2016-10-101-1/+1
| * | | | Remove PNG fallbacks from files app (#26308)Vincent Petry2016-10-108-0/+0
| |/ / /
* | | | Merge pull request #1675 from nextcloud/remove-unneeded-variableLukas Reschke2016-10-101-5/+2
|\ \ \ \
| * | | | remove unneeded variable & proper element creationMorris Jobke2016-10-101-5/+2
| |/ / /
* | | | Merge pull request #1674 from nextcloud/downstream-26183Morris Jobke2016-10-101-0/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Added test for 26182Sergio Bertolin2016-10-101-0/+14
| |/ /
* | | Merge pull request #1668 from nextcloud/user_ldap_use_appconfigMorris Jobke2016-10-1027-61/+165
|\ \ \
| * | | Use more IConfig and add unit testsRoeland Jago Douma2016-10-102-21/+120
| * | | DI IConfig into ldap helperRoeland Jago Douma2016-10-1026-27/+43
| * | | Do not query data that is already in the appconfigRoeland Jago Douma2016-10-101-23/+12
* | | | Merge pull request #1673 from nextcloud/php7.1-rc3Morris Jobke2016-10-101-2/+2
|\ \ \ \
| * | | | Bump 7.1 CI to RC3Roeland Jago Douma2016-10-101-2/+2
| | |/ / | |/| |