Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix and tidy up tests after merge conflicts | Arthur Schiwon | 2016-10-13 | 1 | -16/+8 |
* | Update tests for phunit 5.5 | Victor Dubiniuk | 2016-10-13 | 5 | -30/+47 |
* | Harden empty | Victor Dubiniuk | 2016-10-13 | 7 | -50/+59 |
* | Merge pull request #1704 from nextcloud/avatar_dropdown | blizzz | 2016-10-12 | 2 | -9/+27 |
|\ | |||||
| * | [9.2] Show avatar in share drop down (#25976) | Thomas Müller | 2016-10-11 | 2 | -9/+27 |
* | | Merge pull request #1713 from nextcloud/rebase_1493 | Roeland Jago Douma | 2016-10-12 | 1 | -0/+2 |
|\ \ | |||||
| * | | fix issue #1482 - mail invites through v1 webdav | Claudemir Todo Bom | 2016-10-12 | 1 | -0/+2 |
* | | | Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xml | Morris Jobke | 2016-10-12 | 5 | -107/+26 |
|\ \ \ | |||||
| * | | | Readd Notify command | Roeland Jago Douma | 2016-10-12 | 1 | -0/+1 |
| * | | | Move console command registration to info.xml for encryption as well as files... | Thomas Müller | 2016-10-12 | 5 | -107/+25 |
| |/ / | |||||
* | | | Merge pull request #1712 from nextcloud/us_tear_down_fs_between_cron | Morris Jobke | 2016-10-12 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | [master] Tear down FS between cron jobs (#26223) | Vincent Petry | 2016-10-12 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepage | Roeland Jago Douma | 2016-10-12 | 1 | -6/+46 |
|\ \ \ | |/ / |/| | | |||||
| * | | Better search functionality | Joas Schilling | 2016-10-11 | 1 | -5/+23 |
| * | | Fix authors that have a mail or homepage | Joas Schilling | 2016-10-11 | 1 | -2/+24 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-12 | 64 | -66/+82 |
* | | | Merge pull request #1705 from nextcloud/us_register-commands-in-info.xml | Joas Schilling | 2016-10-11 | 15 | -175/+68 |
|\ \ \ | |||||
| * | | | Add tests for commands in info.xml | Roeland Jago Douma | 2016-10-11 | 1 | -0/+7 |
| * | | | [9.2] Register commands in info.xml (#26248) | Thomas Müller | 2016-10-11 | 14 | -175/+61 |
* | | | | Merge pull request #1702 from nextcloud/fix_tooltip_nc | Morris Jobke | 2016-10-11 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use Nextcloud in share tooltip | Roeland Jago Douma | 2016-10-11 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1407 from nextcloud/multiline_comments | Morris Jobke | 2016-10-11 | 9 | -7/+348 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix textarea submit | skjnldsv | 2016-10-11 | 1 | -2/+3 |
| * | | Fix js test | Roeland Jago Douma | 2016-10-04 | 1 | -1/+1 |
| * | | Add autosize to comments input | Roeland Jago Douma | 2016-10-04 | 2 | -3/+11 |
| * | | Add autosize | Roeland Jago Douma | 2016-10-04 | 6 | -2/+334 |
* | | | Merge pull request #1682 from nextcloud/bump_doctrine | Morris Jobke | 2016-10-11 | 2 | -10/+10 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix QueryBuilderTests | Thomas Müller | 2016-10-11 | 1 | -10/+10 |
| * | | [3rdparty] Bump doctrine | Roeland Jago Douma | 2016-10-11 | 1 | -0/+0 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-11 | 4 | -0/+4 |
* | | Merge pull request #1677 from nextcloud/cleanup-tests | Morris Jobke | 2016-10-10 | 1 | -10/+15 |
|\ \ | |||||
| * | | Fix typehint | Roeland Jago Douma | 2016-10-10 | 1 | -2/+2 |
| * | | Cleanup test case | Thomas Müller | 2016-10-10 | 1 | -10/+15 |
* | | | Merge pull request #1683 from nextcloud/issue-1437-installing-app-with-code-c... | Roeland Jago Douma | 2016-10-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add app name to the call | Joas Schilling | 2016-10-10 | 1 | -1/+1 |
* | | | Merge pull request #1679 from nextcloud/downstream-26282 | Roeland Jago Douma | 2016-10-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Improve user list rendering perf by not resorting after every add (#26282) | Vincent Petry | 2016-10-10 | 1 | -1/+1 |
* | | | | Merge pull request #1680 from nextcloud/downstream-26308 | Roeland Jago Douma | 2016-10-10 | 9 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fix drag and drop icon for files app | Morris Jobke | 2016-10-10 | 1 | -1/+1 |
| * | | | | Remove PNG fallbacks from files app (#26308) | Vincent Petry | 2016-10-10 | 8 | -0/+0 |
| |/ / / | |||||
* | | | | Merge pull request #1675 from nextcloud/remove-unneeded-variable | Lukas Reschke | 2016-10-10 | 1 | -5/+2 |
|\ \ \ \ | |||||
| * | | | | remove unneeded variable & proper element creation | Morris Jobke | 2016-10-10 | 1 | -5/+2 |
| |/ / / | |||||
* | | | | Merge pull request #1674 from nextcloud/downstream-26183 | Morris Jobke | 2016-10-10 | 1 | -0/+14 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added test for 26182 | Sergio Bertolin | 2016-10-10 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge pull request #1668 from nextcloud/user_ldap_use_appconfig | Morris Jobke | 2016-10-10 | 27 | -61/+165 |
|\ \ \ | |||||
| * | | | Use more IConfig and add unit tests | Roeland Jago Douma | 2016-10-10 | 2 | -21/+120 |
| * | | | DI IConfig into ldap helper | Roeland Jago Douma | 2016-10-10 | 26 | -27/+43 |
| * | | | Do not query data that is already in the appconfig | Roeland Jago Douma | 2016-10-10 | 1 | -23/+12 |
* | | | | Merge pull request #1673 from nextcloud/php7.1-rc3 | Morris Jobke | 2016-10-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Bump 7.1 CI to RC3 | Roeland Jago Douma | 2016-10-10 | 1 | -2/+2 |
| | |/ / | |/| | |