summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #13890 from owncloud/add-no-referrerLukas Reschke2015-02-169-19/+44
|\ \ \ \ \ \ \
| * | | | | | | Add noreferrer to footer URILukas Reschke2015-02-161-1/+2
| * | | | | | | Deduplicate template code and do not translate the linksJoas Schilling2015-02-097-11/+35
| * | | | | | | Add `rel="noreferrer"` where possible and switch to HTTPSLukas Reschke2015-02-046-12/+12
* | | | | | | | Merge pull request #14243 from owncloud/console-execution-time-masterMorris Jobke2015-02-161-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | console commands shall not be limited with respect to execution time - fixes ...Thomas Müller2015-02-161-0/+3
* | | | | | | | | Merge pull request #14076 from owncloud/autotest-external-ftpThomas Müller2015-02-163-4/+105
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | [files_external] ftp testsMorris Jobke2015-02-103-4/+105
* | | | | | | | | Merge pull request #14201 from owncloud/propagator-dont-decrease-mtimeThomas Müller2015-02-163-4/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update testRobin Appelman2015-02-131-0/+2
| * | | | | | | | | Dont lower the mtime of a folder when propagating changesRobin Appelman2015-02-132-4/+27
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #13809 from owncloud/fix-autoloader-messageThomas Müller2015-02-161-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Properly show the warning about the missing composer autoloaderMorris Jobke2015-01-311-1/+4
* | | | | | | | | | Merge pull request #13922 from owncloud/smb-autotest-externalThomas Müller2015-02-165-13/+112
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [files_external] add SMB autotestMorris Jobke2015-02-105-13/+112
* | | | | | | | | | | Merge pull request #14138 from owncloud/fix-image-flip-php53Thomas Müller2015-02-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Check if imageflip is availableMorris Jobke2015-02-121-1/+1
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-166-22/+30
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1536-48/+98
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1430-70/+128
* | | | | | | | | | | Merge pull request #14206 from owncloud/issue/14204-revert-14171Thomas Müller2015-02-132-17/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update version to a higher one then beforeJoas Schilling2015-02-131-1/+1
| * | | | | | | | | | Revert "Improve: Index for file_map"Joas Schilling2015-02-131-18/+0
| * | | | | | | | | | Revert "Incorporate review changes"Joas Schilling2015-02-132-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #14178 from RealRancor/fix_config_sampleMorris Jobke2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed anchor in config.sample.phpRealRancor2015-02-121-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-alway...Lukas Reschke2015-02-132-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Ensure that passed argument is always a stringLukas Reschke2015-02-132-1/+10
* | | | | | | | | | | Merge pull request #14086 from hlop/masterLukas Reschke2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | App install behind a ProxyWitali Rott2015-02-111-1/+1
* | | | | | | | | | | Merge pull request #14171 from owncloud/fix/11639Joas Schilling2015-02-132-1/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Incorporate review changesLukas Reschke2015-02-122-3/+1
| * | | | | | | | | | | Improve: Index for file_mapwindaishi2015-02-121-0/+18
| | |/ / / / / / / / / | |/| | | | | | | | |
* / | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1398-148/+22
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #13771 from owncloud/fix-humanfileSizeLukas Reschke2015-02-122-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | generate valid human readable text for 0 - fixed #9342Thomas Müller2015-01-292-1/+3
* | | | | | | | | | | Merge pull request #13780 from owncloud/cmreflector-inheritanceLukas Reschke2015-02-121-2/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | another test for overriding the docblockBernhard Posselt2015-01-291-0/+14
| * | | | | | | | | | | additional inheritance testsBernhard Posselt2015-01-291-2/+44
* | | | | | | | | | | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-masterLukas Reschke2015-02-122-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | catch any whitespaces which might get written to the output buffer while load...Thomas Müller2015-02-122-11/+13
* | | | | | | | | | | | | Merge pull request #14159 from owncloud/remove-internalThomas Müller2015-02-121-5/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Remove internal annotationLukas Reschke2015-02-121-5/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #14121 from Zillode/app-faviconMorris Jobke2015-02-122-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Disable application-specific favicons for non-user pagesLode Hoste2015-02-112-4/+4
* | | | | | | | | | | | | Merge pull request #9038 from owncloud/add_tag_fileLukas Reschke2015-02-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add .tag file to make tar balls tracableDaniel Molkentin2014-06-141-0/+1
* | | | | | | | | | | | | | Merge pull request #14071 from owncloud/add_timeout_for_post_requestsBjörn Schießle2015-02-121-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add timeout to curl requestBjoern Schiessle2015-02-121-1/+2
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #13913 from rullzer/showusergroupsLukas Reschke2015-02-122-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |