summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Javascript mimetype icon resolverRoeland Jago Douma2015-07-069-2/+559
* | | | Merge pull request #17418 from owncloud/fix-public-download-button-regressionJan-Christoph Borchardt2015-07-061-1/+1
|\ \ \ \
| * | | | Fix regression of button at public download pageMorris Jobke2015-07-061-1/+1
* | | | | Merge pull request #16924 from owncloud/copy-recursive-polyfillThomas Müller2015-07-062-0/+135
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add unit testsRobin Appelman2015-07-031-0/+46
| * | | | better handling of foldersRobin Appelman2015-07-031-1/+1
| * | | | phpdocRobin Appelman2015-06-151-2/+30
| * | | | add recursive copy polyfill for storage backendsRobin Appelman2015-06-141-0/+61
* | | | | Merge pull request #17290 from owncloud/remove-readonly-wrapperThomas Müller2015-07-063-76/+2
|\ \ \ \ \
| * | | | | remove no longer needed readonly wrapperRobin Appelman2015-07-011-74/+0
| * | | | | use permissions mask wrapper instead of readonly wrapperRobin Appelman2015-07-012-2/+2
* | | | | | Merge pull request #16964 from owncloud/versions_occThomas Müller2015-07-063-0/+304
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | add occ tool to delete versionsBjoern Schiessle2015-06-163-0/+304
* | | | | | Merge pull request #17403 from owncloud/reorg-sampe.config.phpLukas Reschke2015-07-061-96/+98
|\ \ \ \ \ \
| * | | | | | refine sample config textMorris Jobke2015-07-061-9/+12
| * | | | | | [config sample] merge Miscellaneous & All other optionsMorris Jobke2015-07-061-87/+86
* | | | | | | Merge pull request #17304 from owncloud/fix-17265Vincent Petry2015-07-062-2/+20
|\ \ \ \ \ \ \
| * | | | | | | Check if response could get generatedLukas Reschke2015-07-022-2/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activi...Joas Schilling2015-07-062-13/+26
|\ \ \ \ \ \ \
| * | | | | | | Use federated cloud id as a parameter typeJoas Schilling2015-07-021-3/+3
| * | | | | | | Add the item name to the federated sahre activityJoas Schilling2015-07-022-1/+6
| * | | | | | | Use the app constant to fix the groupingJoas Schilling2015-07-022-9/+11
| * | | | | | | Use the item name when refering to the unaccepted remote shareJoas Schilling2015-07-022-2/+8
* | | | | | | | Merge pull request #16733 from owncloud/add-smashbox-tests-remote-sharesJoas Schilling2015-07-064-3/+122
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add OCS api to get, accept and decline remote sharesJoas Schilling2015-07-034-1/+120
| * | | | | | | Allow sharing with type remote shareJoas Schilling2015-07-031-2/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-068-8/+38
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-0528-20/+158
* | | | | | | | Merge pull request #16846 from RealRancor/apps_list_issue_templateRobin McCorkell2015-07-041-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Add occ app:list and ldap:show-config to issue_template.mdRealRancor2015-07-041-1/+15
|/ / / / / / / /
* | | | | | | / [tx-robot] updated from transifexJenkins for ownCloud2015-07-0466-72/+8
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #17378 from owncloud/kill-more-legacy-classesMorris Jobke2015-07-0353-555/+184
|\ \ \ \ \ \ \
| * | | | | | | Fix unit testThomas Müller2015-07-031-1/+0
| * | | | | | | Fixing unit test executionThomas Müller2015-07-032-4/+3
| * | | | | | | Remove OC_AppconfigThomas Müller2015-07-037-172/+41
| * | | | | | | Remove OC_LogThomas Müller2015-07-0345-209/+142
| * | | | | | | Remove legacy search classesThomas Müller2015-07-034-171/+0
|/ / / / / / /
* | | | | | | Merge pull request #17379 from owncloud/kill-file-mapperVincent Petry2015-07-037-1240/+282
|\ \ \ \ \ \ \
| * | | | | | | Remove file mapper - was only use in Windows and never worked properlyThomas Müller2015-07-037-1240/+282
* | | | | | | | Merge pull request #16923 from owncloud/flysystem-baseThomas Müller2015-07-031-0/+243
|\ \ \ \ \ \ \ \
| * | | | | | | | also dont download existing on fopen when using w+ and wb+Robin Appelman2015-07-031-2/+2
| * | | | | | | | add phpdocRobin Appelman2015-07-031-0/+55
| * | | | | | | | add flysystem adapaterRobin Appelman2015-07-031-0/+188
| |/ / / / / / /
* | | | | | | | Merge pull request #15470 from rullzer/files_sharing_getUrlContentVincent Petry2015-07-032-51/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | Depreatace OC_Util::getUrlContentRoeland Jago Douma2015-05-181-0/+1
| * | | | | | | | Move away from private static deprecated functioRoeland Jago Douma2015-05-181-51/+56
* | | | | | | | | Merge pull request #17382 from owncloud/remove-bogus-testresultThomas Müller2015-07-031-0/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove bogus test resultVincent Petry2015-07-031-0/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #17365 from owncloud/update-refThomas Müller2015-07-031-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Update reference to include newest php-parserLukas Reschke2015-07-031-0/+0