summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #20773 from owncloud/share2.0_createThomas Müller2016-01-0714-74/+2542
|\
| * [Sharing 2.0] Some error cases report 404 instead of 403Roeland Jago Douma2016-01-062-8/+16
| * [Sharing 2.0] Add L10N instance to manager for translated errorsRoeland Jago Douma2016-01-064-28/+65
| * [Sharing 2.0] Do not use static function to get numeric storage idRoeland Jago Douma2016-01-062-5/+15
| * [Sharing 2.0] General exceptions return 403Roeland Jago Douma2016-01-061-1/+1
| * Skip one intergration test until we have fixed the getsharesRoeland Jago Douma2016-01-061-17/+20
| * Make sure to login at least once for the intergration testsRoeland Jago Douma2016-01-061-1/+7
| * [Share 2.0] Enable share creation via OCS APIRoeland Jago Douma2016-01-063-5/+432
| * [Share 2.0] Make the share manager ready for share creationRoeland Jago Douma2016-01-062-21/+1676
| * [Share 2.0] Make share provider ready for create sharesRoeland Jago Douma2016-01-063-13/+302
| * [Share 2.0] Update share classRoeland Jago Douma2016-01-062-2/+35
| * [Share 2.0] Update db structure to stay backwards compatibleRoeland Jago Douma2016-01-062-7/+7
* | Merge pull request #21495 from owncloud/polyfillThomas Müller2016-01-071-0/+0
|\ \
| * | [3rdparty] Bump symfony/polyfill-phpRoeland Jago Douma2016-01-071-0/+0
* | | Merge pull request #21493 from owncloud/fix-repair-pathThomas Müller2016-01-0719-4/+1
|\ \ \
| * | | Move lib/repair to lib/private/repairMorris Jobke2016-01-0719-4/+1
* | | | Merge pull request #21359 from owncloud/check-changesThomas Müller2016-01-073-7/+2
|\ \ \ \
| * | | | fix js unit testsMorris Jobke2016-01-071-2/+2
| * | | | Also remove it from the web interfaceRobin Appelman2016-01-071-2/+0
| * | | | remove mention of 'filesystem_check_changes' => 2 from the config sampleRobin Appelman2016-01-071-3/+0
| |/ / /
* | | | Merge pull request #21503 from owncloud/public-fixdownloadlinktokenLukas Reschke2016-01-072-4/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Add token in webdav download link of public pageVincent Petry2016-01-072-4/+8
|/ / /
* | | Merge pull request #21404 from owncloud/symfony_console_2.8.0Thomas Müller2016-01-071-0/+0
|\ \ \ | |/ / |/| |
| * | [3rdparty] Bump symfony/console to 2.8.0Roeland Jago Douma2016-01-011-0/+0
* | | Merge pull request #21343 from owncloud/ldap-showremnants-json-outputThomas Müller2016-01-071-11/+15
|\ \ \
| * | | Add an option to occ ldap:showremnants to output a json encoded array for use...Stephen Colebrook2015-12-221-11/+15
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-07184-2034/+1786
* | | | Merge pull request #20994 from owncloud/personal-pageThomas Müller2016-01-065-102/+149
|\ \ \ \
| * | | | fix overlap and functionality of cropperJan-Christoph Borchardt2015-12-283-3/+19
| * | | | improve layout of personal settings pageJan-Christoph Borchardt2015-12-285-103/+134
* | | | | Merge pull request #21349 from owncloud/web_use_shareeThomas Müller2016-01-062-19/+406
|\ \ \ \ \
| * | | | | Added js tests for the Sharee API usageRoeland Jago Douma2015-12-301-0/+292
| * | | | | Fix unit testsRoeland Jago Douma2015-12-302-7/+33
| * | | | | Filter out share owner in sharee suggestion listRoeland Jago Douma2015-12-301-0/+9
| * | | | | Web sharing uses sharee endpointRoeland Jago Douma2015-12-301-15/+75
* | | | | | Merge pull request #21398 from owncloud/sharing-disabled-cacheThomas Müller2016-01-061-2/+3
|\ \ \ \ \ \
| * | | | | | Cache sharing disabled in the viewRobin Appelman2015-12-301-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21443 from owncloud/fix-container-lookupThomas Müller2016-01-061-1/+1
|\ \ \ \ \ \
| * | | | | | Lookup the App name instead of OCAJoas Schilling2016-01-041-1/+1
* | | | | | | Merge pull request #21444 from owncloud/move-regenerate-belowThomas Müller2016-01-068-8/+72
|\ \ \ \ \ \ \
| * | | | | | | Assign DB group for unit testsLukas Reschke2016-01-041-0/+4
| * | | | | | | Move regeneration of session ID into session classesLukas Reschke2016-01-048-8/+68
| |/ / / / / /
* | | | | | | Merge pull request #21459 from owncloud/make-ldap-more-robustThomas Müller2016-01-062-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Make LDAP more robust to exceptions and log them properlyMorris Jobke2016-01-062-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #21469 from owncloud/drop-old-gallery-tableThomas Müller2016-01-061-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Drop oc_gallery_sharing which was removed in 8.0.0Morris Jobke2016-01-061-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #21482 from owncloud/htaccess-ico-ruleThomas Müller2016-01-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow ico files to be served staticallyMorris Jobke2016-01-061-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #21488 from th3fallen/patch-1Thomas Müller2016-01-061-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Blacklist myselfClark Tomlinson2016-01-061-4/+12
|/ / / / / /