summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-linkMorris Jobke2016-11-033-148/+219
|\ | | | | Use mail for encrypting the password reset token as well
| * Fix testsRoeland Jago Douma2016-11-031-166/+174
| | | | | | | | | | | | * Tests fixed and controller coverage to 100% Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * [WIP] Use mail for encrypting the password reset token as wellLukas Reschke2016-11-033-11/+74
| |
* | Merge pull request #1741 from nextcloud/new_previewLukas Reschke2016-11-0332-382/+2353
|\ \ | | | | | | Improve previews
| * | Update changelogRoeland Jago Douma2016-11-031-0/+7
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add cache 1 day cache to preview endpointRoeland Jago Douma2016-11-032-5/+26
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | More testsRoeland Jago Douma2016-11-038-45/+783
| | | | | | | | | | | | | | | | | | | | | | | | | | | * PreviewController test * PublicPreview test * Versions Preview test * Trash Preview test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Added genertor helper & testsRoeland Jago Douma2016-11-037-50/+477
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update thumbnail endpoint to new generatoRoeland Jago Douma2016-11-031-6/+17
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move over files_trashbinRoeland Jago Douma2016-11-033-82/+134
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Moved over files_versionsRoeland Jago Douma2016-11-037-80/+137
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix urlgenerator testRoeland Jago Douma2016-11-031-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Update autoloaderRoeland Jago Douma2016-11-032-0/+8
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move publicpreview overRoeland Jago Douma2016-11-033-133/+119
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move Ipreview to more of DI thingyRoeland Jago Douma2016-11-035-52/+116
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix name conflictRoeland Jago Douma2016-11-031-3/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move fileRoeland Jago Douma2016-11-032-4/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move preview endpoint to controllerRoeland Jago Douma2016-11-035-121/+132
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Watch for file modification/deletionRoeland Jago Douma2016-11-033-0/+180
| | | | | | | | | | | | | | | | | | | | | * Only connect the watcher once the instance is properly setup else AppData fails hard. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move to AppDataRoeland Jago Douma2016-11-033-38/+34
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | New preview generatorRoeland Jago Douma2016-11-035-11/+423
| |/ | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2002 from nextcloud/propagate-mtime-iontLukas Reschke2016-11-031-1/+1
|\ \ | | | | | | explicitly cast mtime to int in propagation
| * | explicitly cast mtime to intRobin Appelman2016-11-031-1/+1
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #1733 from nextcloud/dav-eventsRoeland Jago Douma2016-11-0311-51/+1410
|\ \ \ | | | | | | | | Activities for calendars, events and todos
| * | | Add more testsJoas Schilling2016-11-031-5/+102
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add tests for triggerCalendarActivityJoas Schilling2016-11-031-4/+139
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Start unit tests for the activity listenerJoas Schilling2016-11-031-0/+100
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add tests for dispatching of the eventsJoas Schilling2016-11-032-5/+66
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use the event dispatcherJoas Schilling2016-11-038-177/+189
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use a different type for events and todosJoas Schilling2016-11-032-3/+20
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Activities for events and todosJoas Schilling2016-11-033-6/+189
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Move the methods into a new classJoas Schilling2016-11-0310-337/+497
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add activities for sharesJoas Schilling2016-11-032-7/+100
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix unshare actions for author != ownerJoas Schilling2016-11-032-16/+54
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add activity for unshare from groupJoas Schilling2016-11-032-0/+37
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Unshare user activitiesJoas Schilling2016-11-032-4/+80
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Start working on calendar activitiesJoas Schilling2016-11-033-1/+351
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2003 from nextcloud/query-logger-limitMorris Jobke2016-11-032-2/+15
|\ \ \ \ | | | | | | | | | | Cap the number of queries we save in the query logger
| * | | | Cap the number of queries we save in the query loggerRobin Appelman2016-11-032-2/+15
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #2000 from nextcloud/sharebymail-iconBjörn Schießle2016-11-031-0/+1
|\ \ \ \ | |_|/ / |/| | | add share by mail icon, fix #1979
| * | | add share by mail icon, fix #1979Jan-Christoph Borchardt2016-11-031-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1908 from nextcloud/downstream-26078Morris Jobke2016-11-035-166/+139
|\ \ \ | | | | | | | | Upload autorename on client side
| * | | Upload autorename on client sideVincent Petry2016-11-025-166/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the need for POST to collection which would hit against upload limits. The client tries to auto rename the file by adding a suffix "(2)". It tries to use the file list on the client side to guess a suitable name. In case a file still cannot be uploaded and creates a conflict, which can happen when the file was concurrently uploaded, the logic will continue increasing the suffix.
* | | | Merge pull request #1994 from nextcloud/proper-cron-hintsRoeland Jago Douma2016-11-033-3/+20
|\ \ \ \ | |_|/ / |/| | | Show a hint for system based cron user name
| * | | Show a hint for system based cron user nameMorris Jobke2016-11-033-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * makes it easier to setup cron job * gives hints for PHP documentation * disables the cron setting if requirements not met * fixes #1989 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #1997 from nextcloud/changelogRoeland Jago Douma2016-11-031-0/+8
|\ \ \ \ | | | | | | | | | | Introducing changelog.md
| * | | | Added changelog.mdRoeland Jago Douma2016-11-031-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #1996 from nextcloud/allow-phpunit-optionsRoeland Jago Douma2016-11-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Allow to run autotest with phpunit options
| * | | | Allow to run autotest with phpunit optionsJoas Schilling2016-11-031-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1915 from nextcloud/downstream-26398Lukas Reschke2016-11-0315-113/+498
|\ \ \ \ | |/ / / |/| | | Add using casing check/fix for initMountPoints