summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-linkMorris Jobke2016-11-033-148/+219
|\
| * Fix testsRoeland Jago Douma2016-11-031-166/+174
| * [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
|\ \
| * | Update changelogRoeland Jago Douma2016-11-031-0/+7
| * | Add cache 1 day cache to preview endpointRoeland Jago Douma2016-11-032-5/+26
| * | More testsRoeland Jago Douma2016-11-038-45/+783
| * | Added genertor helper & testsRoeland Jago Douma2016-11-037-50/+477
| * | Update thumbnail endpoint to new generatoRoeland Jago Douma2016-11-031-6/+17
| * | Move over files_trashbinRoeland Jago Douma2016-11-033-82/+134
| * | Moved over files_versionsRoeland Jago Douma2016-11-037-80/+137
| * | Fix urlgenerator testRoeland Jago Douma2016-11-031-1/+1
| * | Update autoloaderRoeland Jago Douma2016-11-032-0/+8
| * | Move publicpreview overRoeland Jago Douma2016-11-033-133/+119
| * | Move Ipreview to more of DI thingyRoeland Jago Douma2016-11-035-52/+116
| * | Fix name conflictRoeland Jago Douma2016-11-031-3/+3
| * | Move fileRoeland Jago Douma2016-11-032-4/+5
| * | Move preview endpoint to controllerRoeland Jago Douma2016-11-035-121/+132
| * | Watch for file modification/deletionRoeland Jago Douma2016-11-033-0/+180
| * | Move to AppDataRoeland Jago Douma2016-11-033-38/+34
| * | New preview generatorRoeland Jago Douma2016-11-035-11/+423
| |/
* | Merge pull request #2002 from nextcloud/propagate-mtime-iontLukas Reschke2016-11-031-1/+1
|\ \
| * | explicitly cast mtime to intRobin Appelman2016-11-031-1/+1
* | | Merge pull request #1733 from nextcloud/dav-eventsRoeland Jago Douma2016-11-0311-51/+1410
|\ \ \
| * | | Add more testsJoas Schilling2016-11-031-5/+102
| * | | Add tests for triggerCalendarActivityJoas Schilling2016-11-031-4/+139
| * | | Start unit tests for the activity listenerJoas Schilling2016-11-031-0/+100
| * | | Add tests for dispatching of the eventsJoas Schilling2016-11-032-5/+66
| * | | Use the event dispatcherJoas Schilling2016-11-038-177/+189
| * | | Use a different type for events and todosJoas Schilling2016-11-032-3/+20
| * | | Activities for events and todosJoas Schilling2016-11-033-6/+189
| * | | Move the methods into a new classJoas Schilling2016-11-0310-337/+497
| * | | Add activities for sharesJoas Schilling2016-11-032-7/+100
| * | | Fix unshare actions for author != ownerJoas Schilling2016-11-032-16/+54
| * | | Add activity for unshare from groupJoas Schilling2016-11-032-0/+37
| * | | Unshare user activitiesJoas Schilling2016-11-032-4/+80
| * | | Start working on calendar activitiesJoas Schilling2016-11-033-1/+351
* | | | Merge pull request #2003 from nextcloud/query-logger-limitMorris Jobke2016-11-032-2/+15
|\ \ \ \
| * | | | Cap the number of queries we save in the query loggerRobin Appelman2016-11-032-2/+15
|/ / / /
* | | | Merge pull request #2000 from nextcloud/sharebymail-iconBjörn Schießle2016-11-031-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | add share by mail icon, fix #1979Jan-Christoph Borchardt2016-11-031-0/+1
| | |/ | |/|
* | | Merge pull request #1908 from nextcloud/downstream-26078Morris Jobke2016-11-035-166/+139
|\ \ \
| * | | Upload autorename on client sideVincent Petry2016-11-025-166/+139
* | | | Merge pull request #1994 from nextcloud/proper-cron-hintsRoeland Jago Douma2016-11-033-3/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Show a hint for system based cron user nameMorris Jobke2016-11-033-3/+20
* | | | Merge pull request #1997 from nextcloud/changelogRoeland Jago Douma2016-11-031-0/+8
|\ \ \ \
| * | | | Added changelog.mdRoeland Jago Douma2016-11-031-0/+8
* | | | | Merge pull request #1996 from nextcloud/allow-phpunit-optionsRoeland Jago Douma2016-11-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow to run autotest with phpunit optionsJoas Schilling2016-11-031-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1915 from nextcloud/downstream-26398Lukas Reschke2016-11-0315-113/+498
|\ \ \ \ | |/ / / |/| | |