summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2018 from nextcloud/firefox-svg-workaroundMorris Jobke2016-11-051-0/+11
|\ | | | | Workaround for disappearing app icons for Firefox before version 51
| * Workaround for disappearing app icons for Firefox before version 51Julius Haertl2016-11-041-0/+11
| | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | Merge pull request #2021 from henrymohn/bug-1875_Password-HintMorris Jobke2016-11-051-11/+10
|\ \ | | | | | | Removed else statement preventing Success message from displaying cau…
| * | Removed else statement preventing Success message from displaying causing ↵Henry Mohn2016-11-041-11/+10
| | | | | | | | | | | | | | | | | | bug #1875 Signed-off-by: Henry Mohn <hmohniii@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0528-38/+360
| | |
* | | Merge pull request #2014 from nextcloud/cleanup_oc_group_a_tadRoeland Jago Douma2016-11-043-231/+269
|\ \ \ | | | | | | | | Cleanup OC_Group usage a bit
| * | | Cleanup OC_Group usage a bitRoeland Jago Douma2016-11-043-231/+269
| | | | | | | | | | | | | | | | | | | | | | | | This is deprecated internal stuff. Should not be used anymore. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2015 from nextcloud/swift-bucketLukas Reschke2016-11-041-0/+4
|\ \ \ \ | |_|/ / |/| | | allow using 'bucket' to set the swift container
| * | | allow using 'bucket' to set the swift containerRobin Appelman2016-11-041-0/+4
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #2007 from nextcloud/downstream-26411Morris Jobke2016-11-041-8/+18
|\ \ \ | |/ / |/| | [oc] Fix initMountPoints to set usersSetup earlier
| * | Fix initMountPoints to set usersSetup earlierVincent Petry2016-11-031-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | This is needed because in some cases like LDAP, the user manager itself might trigger avatar updates which would internally also call initMountPoints with the same user. This could cause the same user to be setup twice, and in some sharing situations could cause recursive deduplication of shares by adding "(2)" every time.
* | | Merge pull request #2010 from nextcloud/downstream-26534Joas Schilling2016-11-041-1/+6
|\ \ \ | | | | | | | | [oC] Fixed disappearing of share info in file view
| * | | Fixed disappearing of share info in file viewMichael Jobst2016-11-041-1/+6
| | |/ | |/|
* | | Merge pull request #1880 from nextcloud/downstream-26235Morris Jobke2016-11-047-143/+273
|\ \ \ | |/ / |/| | Integration tests refactoring
| * | Add sleep functionRoeland Jago Douma2016-11-042-0/+10
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Fix testsRoeland Jago Douma2016-11-041-6/+15
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Remove unneeded behat methodMorris Jobke2016-11-021-10/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Adapted favorites and dav2 featuresSergio Bertolin2016-11-026-127/+248
| | | | | | | | | | | | | | | | | | | | | | | | Adapted sharing and external features, random failures in sharing:857 Added weddav related feature Removed forgotten leftovers
* | | Merge pull request #2008 from nextcloud/remove_removed_scriptRoeland Jago Douma2016-11-041-1/+0
|\ \ \ | | | | | | | | Remove adding sharedialogmailview
| * | | Remove adding sharedialogmailviewRoeland Jago Douma2016-11-041-1/+0
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0478-190/+268
| | |
* | | Merge pull request #2006 from nextcloud/downstream-26380Lukas Reschke2016-11-031-0/+2
|\ \ \ | | | | | | | | [oC] Hide "Add group" for subadmins
| * | | 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
|\ \ \ | | | | | | | | 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>