Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add .bower.json to version control | Roeland Jago Douma | 2016-10-12 | 5 | -0/+165 |
| | | | | | | We need .bower.json to have bower functioning correctly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | 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 | ||||
| * | fix issue #1482 - mail invites through v1 webdav | Claudemir Todo Bom | 2016-10-12 | 1 | -0/+2 |
| | | | | | | | | | | Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xml | Morris Jobke | 2016-10-12 | 5 | -107/+26 |
|\ \ | | | | | | | [oc] move more commands to info.xml | ||||
| * | | Readd Notify command | Roeland Jago Douma | 2016-10-12 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Move console command registration to info.xml for encryption as well as ↵ | Thomas Müller | 2016-10-12 | 5 | -107/+25 |
| |/ | | | | | | | | | | | files_external Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | 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) | ||||
| * | | [master] Tear down FS between cron jobs (#26223) | Vincent Petry | 2016-10-12 | 1 | -0/+2 |
| |/ | | | | | | | | | | | | | | | | | | | | | Because some cron jobs do not always properly clean up their FS usage and others might not clean up before setting up the FS, this could cause potential side effects. To make sure we exclude side effects, we tear down the FS between cron jobs. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepage | Roeland Jago Douma | 2016-10-12 | 1 | -6/+46 |
|\ \ | |/ |/| | Fix authors with mail and homepage | ||||
| * | Better search functionality | Joas Schilling | 2016-10-11 | 1 | -5/+23 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Fix authors that have a mail or homepage | Joas Schilling | 2016-10-11 | 1 | -2/+24 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | [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 |
|\ \ | | | | | | | [oc] Register commands in info.xml | ||||
| * | | Add tests for commands in info.xml | Roeland Jago Douma | 2016-10-11 | 1 | -0/+7 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | [9.2] Register commands in info.xml (#26248) | Thomas Müller | 2016-10-11 | 14 | -175/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use DI to load console commands from the apps - class name to be defined in the info.xml * Load commands from info.xml * Fix unit test * Allow Di magic for IMountManager Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1702 from nextcloud/fix_tooltip_nc | Morris Jobke | 2016-10-11 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Use Nextcloud in share tooltip | ||||
| * | | Use Nextcloud in share tooltip | Roeland Jago Douma | 2016-10-11 | 1 | -1/+1 |
| |/ | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #1407 from nextcloud/multiline_comments | Morris Jobke | 2016-10-11 | 9 | -7/+348 |
|\ \ | | | | | | | Bring back multiline comments | ||||
| * | | 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 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | 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 |
|\ \ \ | |_|/ |/| | | Bump doctrine | ||||
| * | | Fix QueryBuilderTests | Thomas Müller | 2016-10-11 | 1 | -10/+10 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | [3rdparty] Bump doctrine | Roeland Jago Douma | 2016-10-11 | 1 | -0/+0 |
|/ / | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [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 |
|\ \ | | | | | | | Cleanup test case | ||||
| * | | Fix typehint | Roeland Jago Douma | 2016-10-10 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Cleanup test case | Thomas Müller | 2016-10-10 | 1 | -10/+15 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | Merge pull request #1683 from ↵ | Roeland Jago Douma | 2016-10-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | nextcloud/issue-1437-installing-app-with-code-checker Add app name to the call | ||||
| * | | Add app name to the call | Joas Schilling | 2016-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Regression from 69b063f4c614a46bbe5f0ffcab11ddb08c183f04 Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | 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 (#2… | ||||
| * | | | Improve user list rendering perf by not resorting after every add (#26282) | Vincent Petry | 2016-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | The call to UserList.add() was wrong and was passing "user.lastLogin" as the sort argument which would cause the list to be resorted over and over again for every added item after loading the next page of users. | ||||
* | | | | Merge pull request #1680 from nextcloud/downstream-26308 | Roeland Jago Douma | 2016-10-10 | 9 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Remove PNG fallbacks from files app | ||||
| * | | | | fix drag and drop icon for files app | Morris Jobke | 2016-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | 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 | ||||
| * | | | | remove unneeded variable & proper element creation | Morris Jobke | 2016-10-10 | 1 | -5/+2 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | Merge pull request #1674 from nextcloud/downstream-26183 | Morris Jobke | 2016-10-10 | 1 | -0/+14 |
|\ \ \ \ | |_|/ / |/| | | | Added test for 26182 | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Do not query data that is already in the appconfig | ||||
| * | | | Use more IConfig and add unit tests | Roeland Jago Douma | 2016-10-10 | 2 | -21/+120 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | DI IConfig into ldap helper | Roeland Jago Douma | 2016-10-10 | 26 | -27/+43 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Do not query data that is already in the appconfig | Roeland Jago Douma | 2016-10-10 | 1 | -23/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is already available. We better use a simple regex. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #1673 from nextcloud/php7.1-rc3 | Morris Jobke | 2016-10-10 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Bump 7.1 CI to RC3 | ||||
| * | | | | Bump 7.1 CI to RC3 | Roeland Jago Douma | 2016-10-10 | 1 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #1114 from nextcloud/display_all_reshares | Roeland Jago Douma | 2016-10-10 | 2 | -4/+52 |
|\ \ \ \ | |/ / / |/| | | | Display link reshares | ||||
| * | | | Fix HTML | Roeland Jago Douma | 2016-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | align layout of other link shares | Morris Jobke | 2016-10-10 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Display link reshares | Roeland Jago Douma | 2016-10-10 | 2 | -4/+46 |
|/ / / | | | | | | | | | | | | | | | | | | | * No longer filterout all other link shares * Display link shares in shareelist (below normal shares) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> |