| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move file sharing activities to the new API | Joas Schilling | 2016-11-16 | 16 | -609/+1645 |
| | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #2092 from nextcloud/activity-filter-api | Joas Schilling | 2016-11-16 | 32 | -1076/+2410 |
| |\ | | | | | Better API for activity filters, settings and providers + Rich Object support | ||||
| | * | Update the since version to 11.0.0 | Joas Schilling | 2016-11-16 | 18 | -136/+136 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Fix integration tests | Joas Schilling | 2016-11-16 | 3 | -14/+9 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Make sure they are always arrays | Joas Schilling | 2016-11-16 | 1 | -6/+6 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Remove the old activity extension | Joas Schilling | 2016-11-16 | 3 | -720/+0 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Add back the support for the short translations | Joas Schilling | 2016-11-16 | 1 | -4/+68 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Fix InfoParser empty tests | Joas Schilling | 2016-11-16 | 1 | -1/+6 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Fix activity manager tests | Joas Schilling | 2016-11-16 | 4 | -53/+56 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Don't even try to combine when the subject is different | Joas Schilling | 2016-11-16 | 1 | -0/+5 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow combining events | Joas Schilling | 2016-11-16 | 2 | -0/+30 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Provider for the files app | Joas Schilling | 2016-11-16 | 5 | -0/+226 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow to register Providers | Joas Schilling | 2016-11-16 | 6 | -6/+104 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Add ROS and icon support to the events | Joas Schilling | 2016-11-16 | 3 | -24/+278 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Validate the input into Event already | Joas Schilling | 2016-11-16 | 2 | -91/+215 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Register the settings of the files app via info.xml | Joas Schilling | 2016-11-16 | 7 | -20/+499 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow to register settings/types via info.xml | Joas Schilling | 2016-11-16 | 6 | -31/+338 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Move the favorites filter to IFilter | Joas Schilling | 2016-11-16 | 6 | -94/+167 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Move files filter to IFilter | Joas Schilling | 2016-11-16 | 3 | -15/+104 |
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| | * | Allow to register activity filters via info.xml | Joas Schilling | 2016-11-16 | 7 | -76/+378 |
| |/ | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Merge pull request #2145 from nextcloud/docs_to_com | Morris Jobke | 2016-11-16 | 1 | -1/+1 |
| |\ | | | | | docs are on nc.com | ||||
| | * | docs are on nc.com | Roeland Jago Douma | 2016-11-15 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #2144 from nextcloud/fix_1303 | Morris Jobke | 2016-11-15 | 2 | -33/+29 |
| |\ \ | | | | | | | Do not cache version info in the session | ||||
| | * | | Fix tests | Roeland Jago Douma | 2016-11-15 | 2 | -16/+9 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Do not cache version info in the sessions | Roeland Jago Douma | 2016-11-15 | 1 | -29/+32 |
| | |/ | | | | | | | | | | | | | | | | | If the session is cleared and closed for whatever reason the loadVersion will write to the session anyways. This will lead to an exception. This should fix #1303 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-again | Roeland Jago Douma | 2016-11-15 | 5 | -5/+115 |
| |\ \ | | | | | | | Add a magic wrapper to allow phpunit4 to run the code again | ||||
| | * | | Add a magic wrapper from hell to allow phpunit4 to run the code again | Joas Schilling | 2016-11-15 | 5 | -5/+115 |
| | |/ | | | | | | | | | | | | | Remove this once phpunit 5 is the lowest supported version, by reverting: https://github.com/nextcloud/server/pull/2137 Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Merge pull request #2139 from nextcloud/increase-version-to-ELF | Morris Jobke | 2016-11-15 | 60 | -133/+141 |
| |\ \ | | | | | | | Use 11.0 instead 9.2 | ||||
| | * | | @since 9.2.0 to @since 11.0.0 | Roeland Jago Douma | 2016-11-15 | 35 | -101/+101 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Endpoint is now 11.0.0 | Lukas Reschke | 2016-11-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Adjust previous fallbacks | Lukas Reschke | 2016-11-15 | 3 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | 11.0 is 11 and not 9.2 anymore Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Use 11.0 instead 9.2 | Lukas Reschke | 2016-11-15 | 21 | -21/+21 |
| | |/ | | | | | | | | | | | As discussed we're changing the version from 9.2 to 11.0 to make some more sense. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2132 from nextcloud/federated-cloud-id | Roeland Jago Douma | 2016-11-15 | 1 | -1/+1 |
| |\ \ | |/ |/| | specify Federated Cloud ID syntax | ||||
| | * | specify Federated Cloud ID syntax | Jan-Christoph Borchardt | 2016-11-15 | 1 | -1/+1 |
| |/ | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-15 | 6 | -22/+26 |
| | | |||||
| * | Merge pull request #2125 from nextcloud/downstream-26546 | Morris Jobke | 2016-11-15 | 1 | -3/+3 |
| |\ | | | | | Transfer ownership now returns exit code on error | ||||
| | * | Transfer ownership now returns exit code on error (#26546) | Vincent Petry | 2016-11-14 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #2119 from nextcloud/downstream-26555 | Roeland Jago Douma | 2016-11-14 | 1 | -1/+5 |
| |\ \ | | | | | | | disabling dropping on dragging objects temporarily | ||||
| | * | | disabling dropping on dragging objects temporarily | Michael Jobst | 2016-11-14 | 1 | -1/+5 |
| | |/ | | | | | | | better solution | ||||
| * | | Merge pull request #2117 from ↵ | Roeland Jago Douma | 2016-11-14 | 1 | -0/+3 |
| |\ \ | | | | | | | | | | | | | nextcloud/master-add-bruteforce-check-to-person-endpoint Add bruteforce checker to Person.php | ||||
| | * | | Add bruteforce checker to Person.php | Lukas Reschke | 2016-11-14 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | Also check for attempts on this endpoint Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #2084 from nextcloud/files_drop_avatars_disabled | Morris Jobke | 2016-11-14 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fixes files_drop when avatars are disabled | ||||
| | * | | | Fixes files_drop when avatars are disabled | Roeland Jago Douma | 2016-11-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #2080 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #2115 from nextcloud/oc_26527 | Roeland Jago Douma | 2016-11-14 | 1 | -15/+21 |
| |\ \ \ \ | | | | | | | | | | | Skip broken shares when transferring ownership (#26527) | ||||
| | * | | | | Skip broken shares when transferring ownership (#26527) | Vincent Petry | 2016-11-14 | 1 | -15/+21 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #2114 from nextcloud/downstream-26498 | Roeland Jago Douma | 2016-11-14 | 3 | -5/+13 |
| |\ \ \ \ | | | | | | | | | | | make object prefix configurable | ||||
| | * | | | | make object prefix configurable | Jörn Friedrich Dreyer | 2016-11-14 | 3 | -5/+13 |
| | |/ / / | |||||
| * | | | | Merge pull request #2110 from nextcloud/oc_26526 | Roeland Jago Douma | 2016-11-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | First process group shares and then user shares | ||||
| | * | | | | First process group shares and then user shares | Vincent Petry | 2016-11-14 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a validation failure where the code checks whether a file is already shared with another user, but the check disables itself when the owner is the same. Processing the groups first prevents the check to kick in too early when the group share still has the old owner while we try transferring the user share. | ||||
| * | | | | Merge pull request #2111 from nextcloud/oc_26549 | Roeland Jago Douma | 2016-11-14 | 5 | -19/+1 |
| |\ \ \ \ | | | | | | | | | | | Remove unused $view from FilesPlugin (#26549) | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |