summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update licence headers via scriptMorris Jobke2015-10-05328-190/+450
* Update license header script to only use code changesMorris Jobke2015-10-051-2/+3
* Merge pull request #19591 from owncloud/files-renametooltipplacementHendrik Leppelsack2015-10-051-2/+2
|\
| * Fix tooltip placement on rename errorVincent Petry2015-10-051-2/+2
|/
* Merge pull request #19582 from owncloud/fix_19456Morris Jobke2015-10-052-0/+9
|\
| * add some output to explain the pre-conditions for decrypt-allBjoern Schiessle2015-10-052-0/+9
|/
* Merge pull request #19576 from owncloud/update-example-themeThomas Müller2015-10-051-0/+81
|\
| * Update example theme with App URLs and PHPDocMorris Jobke2015-10-051-0/+81
* | Merge pull request #19574 from owncloud/fix-sharing-tests-assuming-empty-shar...Thomas Müller2015-10-051-12/+23
|\ \
| * | Clear the shares after the test like storages and filesJoas Schilling2015-10-051-12/+23
* | | Merge pull request #19487 from owncloud/split_share_middlewareThomas Müller2015-10-058-86/+229
|\ \ \ | |_|/ |/| |
| * | sharingcheckmiddleware now handles externalshares as wellRoeland Jago Douma2015-10-028-66/+195
| * | Split files_sharing middelwareRoeland Jago Douma2015-10-022-29/+43
* | | Merge pull request #19416 from owncloud/node-hook-connectorThomas Müller2015-10-053-1/+332
|\ \ \
| * | | remove unused useRobin Appelman2015-09-281-1/+0
| * | | pass view hooks trough to the node hooksRobin Appelman2015-09-281-1/+5
| * | | Add hook connector to connect view and node hooksRobin Appelman2015-09-282-0/+328
* | | | Merge pull request #19552 from owncloud/inline_fileactions_alttextThomas Müller2015-10-052-1/+58
|\ \ \ \
| * | | | If an inline files action provides an alt text show itRoeland Jago Douma2015-10-032-1/+58
* | | | | Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorterThomas Müller2015-10-052-25/+47
|\ \ \ \ \
| * | | | | Fix filelist size issues, breadcrumb, multiselectVincent Petry2015-10-022-25/+47
| | |_|/ / | |/| | |
* | | | | Merge pull request #19547 from owncloud/fix-16154Thomas Müller2015-10-051-4/+5
|\ \ \ \ \
| * | | | | LDAP Wizard: do not be picky about credentials when only looking for the portArthur Schiwon2015-10-031-4/+5
* | | | | | Merge pull request #19560 from owncloud/add-note-about-x-forwarded-forJörn Friedrich Dreyer2015-10-051-0/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add notice about X-Forwarded-ForLukas Reschke2015-10-051-0/+3
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-052-0/+10
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-0444-20/+482
* | | | | Merge pull request #19543 from owncloud/fix-19542Thomas Müller2015-10-031-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Check if decoded JSON returned nullLukas Reschke2015-10-021-1/+1
| |/ / /
* | | | Merge pull request #19545 from owncloud/fix-16908Thomas Müller2015-10-032-0/+3
|\ \ \ \
| * | | | Add remark that $run is not supported anymoreLukas Reschke2015-10-022-0/+3
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-03190-30/+798
|/ / /
* | | Merge pull request #19534 from owncloud/fix_19532Thomas Müller2015-10-021-0/+5
|\ \ \
| * | | if mountpoint is applicable to all users the old API expects a array with 'all'Bjoern Schiessle2015-10-021-0/+5
* | | | Merge pull request #19538 from owncloud/versions-lockThomas Müller2015-10-021-0/+9
|\ \ \ \
| * | | | Lock files when rolling back versionRobin Appelman2015-10-021-0/+9
* | | | | Merge pull request #19272 from owncloud/mimetypes-enhancedThomas Müller2015-10-028-35/+186
|\ \ \ \ \
| * | | | | Added mimetype repair stepRoeland Jago Douma2015-10-023-1/+125
| * | | | | Updated some mimetypesRoeland Jago Douma2015-10-023-1/+3
| * | | | | Allow recursive mimetype aliasesRobin McCorkell2015-10-022-2/+2
| * | | | | Introduce a few new mimetypes for codeRobin McCorkell2015-10-023-33/+58
* | | | | | Merge pull request #19536 from owncloud/share-focusonsharefieldThomas Müller2015-10-021-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Focus on share field after first displayVincent Petry2015-10-021-1/+8
| |/ / / /
* | | | | Merge pull request #19525 from owncloud/share-preventmovemountpointintoshared...Robin Appelman2015-10-022-27/+141
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent moving mount point into already shared folder (outgoing)Vincent Petry2015-10-022-27/+141
* | | | | Merge pull request #19533 from owncloud/free-space-infRobin Appelman2015-10-021-1/+1
|\ \ \ \ \
| * | | | | Work around INF=0 on some shared hostsRobin Appelman2015-10-021-1/+1
* | | | | | Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_youThomas Müller2015-10-022-17/+171
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix and extend unit testsRoeland Jago Douma2015-10-022-14/+111
| * | | | | More fileinfoRoeland Jago Douma2015-10-021-4/+8