summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add activity if a file was shared by mailBjoern Schiessle2016-11-087-13/+420
* add new definitionBjoern Schiessle2016-11-081-0/+19
* add activity for share by mailBjoern Schiessle2016-11-083-45/+104
* Merge pull request #1880 from nextcloud/downstream-26235Morris Jobke2016-11-047-143/+273
|\
| * Add sleep functionRoeland Jago Douma2016-11-042-0/+10
| * Fix testsRoeland Jago Douma2016-11-041-6/+15
| * Remove unneeded behat methodMorris Jobke2016-11-021-10/+0
| * Adapted favorites and dav2 featuresSergio Bertolin2016-11-026-127/+248
* | Merge pull request #2008 from nextcloud/remove_removed_scriptRoeland Jago Douma2016-11-041-1/+0
|\ \
| * | Remove adding sharedialogmailviewRoeland Jago Douma2016-11-041-1/+0
|/ /
* | [tx-robot] updated from transifexNextcloud bot2016-11-0478-190/+268
* | Merge pull request #2006 from nextcloud/downstream-26380Lukas Reschke2016-11-031-0/+2
|\ \
| * | Hide "Add group" for subadminsVincent Petry2016-11-031-0/+2
* | | 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