Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-28 | 14 | -22/+34 |
| | |||||
* | Merge pull request #4521 from nextcloud/custom-mount-types | Roeland Jago Douma | 2017-04-28 | 8 | -7/+68 |
|\ | | | | | allow apps to set custom mount types | ||||
| * | Make sure mountType is actually defined | Roeland Jago Douma | 2017-04-28 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | allow apps to set custom mount types | Robin Appelman | 2017-04-28 | 8 | -7/+68 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | Merge pull request #4574 from nextcloud/rename-extension-point | Lukas Reschke | 2017-04-28 | 1 | -1/+1 |
|\ \ | | | | | | | Rename extension point | ||||
| * | | Rename extension point | Lukas Reschke | 2017-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | To align with upstream. Fixes https://github.com/nextcloud/guests/issues/3 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #4575 from nextcloud/add-sharing-types-for-guest | Roeland Jago Douma | 2017-04-28 | 2 | -0/+2 |
|\ \ \ | | | | | | | | | Add sharing types for guests | ||||
| * | | | Add sharing types for guests | Lukas Reschke | 2017-04-28 | 2 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/guests/issues/4 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #4576 from ↵ | Joas Schilling | 2017-04-28 | 1 | -1/+0 |
|\ \ \ | |/ / |/| | | | | | | | | nextcloud/disable-oc-migration-until-we-found-a-path Disable OC Migration until we found a path to do it | ||||
| * | | Disable OC Migration until we found a path to do it | Joas Schilling | 2017-04-28 | 1 | -1/+0 |
|/ / | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #4562 from nextcloud/contactmenu-second-tooltip | Joas Schilling | 2017-04-28 | 1 | -1/+3 |
|\ \ | |/ |/| | Show tooltip for second action in contacts menu | ||||
| * | Show tooltip for second action. | Ivan Sein | 2017-04-27 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com> | ||||
* | | Merge pull request #4524 from nextcloud/downstream-27508 | Roeland Jago Douma | 2017-04-28 | 16 | -287/+670 |
|\ \ | | | | | | | Keep file id on move | ||||
| * | | Fix class names | Joas Schilling | 2017-04-27 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Fix last unit tests | Joas Schilling | 2017-04-27 | 2 | -200/+32 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Don't end the abstract class name with Test.php | Joas Schilling | 2017-04-27 | 4 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Add comment | Vincent Petry | 2017-04-27 | 1 | -0/+2 |
| | | | |||||
| * | | Properly handle missing READ permission | Vincent Petry | 2017-04-27 | 7 | -11/+100 |
| | | | |||||
| * | | Fix duplicate name of class | Joas Schilling | 2017-04-27 | 2 | -6/+6 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Fix forbidden backslash DAV integration tests | Vincent Petry | 2017-04-26 | 1 | -12/+12 |
| | | | |||||
| * | | Fix FutureFile MOVE to keep destination node | Vincent Petry | 2017-04-26 | 3 | -4/+112 |
| | | | | | | | | | | | | | | | | | | Sabre usually deletes the target node on MOVE before proceeding with the actual move operation. This fix prevents this to happen in case the source node is a FutureFile. | ||||
| * | | Accept moving FutureFile into a Directory | Vincent Petry | 2017-04-26 | 1 | -0/+6 |
| | | | |||||
| * | | Moved unit tests from ObjectTree::move to Directory | Vincent Petry | 2017-04-26 | 3 | -10/+256 |
| | | | |||||
| * | | Remove ObjectTree::move and let is use the IMoveTarget approach instead | Vincent Petry | 2017-04-26 | 1 | -98/+0 |
| | | | | | | | | | | | | This removes the duplicated code | ||||
| * | | Ported ObjectTree::move to IMoveTarget in new DAV endpoint | Vincent Petry | 2017-04-26 | 1 | -4/+110 |
| | | | |||||
| * | | Added test cases from core 16825 | Sergio Bertolin | 2017-04-26 | 1 | -0/+41 |
| | | | |||||
| * | | Simplified new endpoint move test | Vincent Petry | 2017-04-26 | 1 | -9/+4 |
| | | | |||||
| * | | Added case when final chunk move must not change file id | Vincent Petry | 2017-04-26 | 1 | -0/+13 |
| | | | |||||
| * | | Added test about checking file id after a move | Sergio Bertolin | 2017-04-26 | 2 | -2/+45 |
| | | | |||||
* | | | Merge pull request #4569 from nextcloud/fix-icons | Roeland Jago Douma | 2017-04-28 | 7 | -6/+18 |
|\ \ \ | | | | | | | | | Fix icons in sidebar on personal page | ||||
| * | | | Fix icons in sidebar on personal page | Morris Jobke | 2017-04-27 | 7 | -6/+18 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | Merge pull request #4570 from ↵ | Lukas Reschke | 2017-04-28 | 1 | -7/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade Do not disable 3rdparty apps on occ upgrade | ||||
| * | | | | Do not disable 3rdparty apps on occ upgrade | Morris Jobke | 2017-04-27 | 1 | -7/+3 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* / / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-04-28 | 242 | -202/+812 |
|/ / / | |||||
* | | | Merge pull request #4522 from nextcloud/downstream-27596 | Morris Jobke | 2017-04-27 | 3 | -25/+57 |
|\ \ \ | | | | | | | | | Allow to create a user for a specific backend | ||||
| * | | | Use the new method in the old one to remove duplicate code | Joas Schilling | 2017-04-27 | 3 | -36/+41 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Allow to create a user for a specific backend | Joas Schilling | 2017-04-26 | 2 | -0/+27 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #4565 from nextcloud/fix-typo | Morris Jobke | 2017-04-27 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix typo in HTML tags | ||||
| * | | | Fix typo in HTML tags | Morris Jobke | 2017-04-27 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #4561 from nextcloud/text-for-federated | Morris Jobke | 2017-04-27 | 0 | -0/+0 |
|\ \ \ | |/ / |/| | | Add hint for federated sharing | ||||
| * | | Add hint for federated sharing | Morris Jobke | 2017-04-27 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #4540 from nextcloud/settings-help | Morris Jobke | 2017-04-27 | 6 | -6/+11 |
|\ \ \ | |/ / |/| | | Add more hints to settings | ||||
| * | | Add more hints to settings | Jan-Christoph Borchardt | 2017-04-26 | 6 | -6/+11 |
| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | Merge pull request #3770 from nextcloud/faster-search-in-contacts | Morris Jobke | 2017-04-27 | 1 | -7/+6 |
|\ \ \ | | | | | | | | | Factorize query for searching contacts | ||||
| * | | | Add back the name query part | Roeland Jago Douma | 2017-04-21 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Factorize query for searching contacts | Thomas Citharel | 2017-04-21 | 1 | -7/+4 |
| | | | | |||||
* | | | | Merge pull request #4501 from nextcloud/downstream-27144 | Morris Jobke | 2017-04-26 | 6 | -18/+59 |
|\ \ \ \ | | | | | | | | | | | Add duration of last job execution to the table | ||||
| * | | | | Add duration of last job execution to the table | Noveen Sachdeva | 2017-04-25 | 7 | -19/+60 |
| | | | | | |||||
* | | | | | Merge pull request #4519 from nextcloud/downstream-27703 | Morris Jobke | 2017-04-26 | 2 | -0/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Reload file list when leaving hidden state | ||||
| * | | | | | Reload file list when leaving hidden state | Vincent Petry | 2017-04-26 | 2 | -0/+14 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file list is already initialized and was hidden when switching to another file list in the navigation bar, if the user comes back to this list it gets redisplayed. At this point the list needs to be refreshed to be able to reflect any potential file changes done from the other lists. |