summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-1830-28/+80
* Merge pull request #11136 from owncloud/fix_body_idMorris Jobke2014-09-171-0/+1
|\
| * Error needs to push body-id for new guest layoutRemco Brenninkmeijer2014-09-171-0/+1
* | Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfixLukas Reschke2014-09-172-0/+14
|\ \ | |/ |/|
| * Tentative fix for legacy file actions unit test side effectVincent Petry2014-09-162-0/+14
* | Merge pull request #9554 from owncloud/fix_preview_orientationLukas Reschke2014-09-172-2/+1
|\ \
| * | fix orientation in image-backend, not in preview system itselfGeorg Ehrke2014-07-092-2/+1
* | | Merge pull request #10622 from owncloud/recursive-delete-forbiddenLukas Reschke2014-09-177-17/+46
|\ \ \
| * | | Fix mapping of relative pathsLukas Reschke2014-09-172-15/+31
| * | | Also check if the file itself is updatableRobin Appelman2014-09-173-4/+4
| * | | Check if a folder is deletable before we try to recursively delete itRobin Appelman2014-09-175-2/+11
| * | | Check if the parent is writable to check if a file is deletableRobin Appelman2014-09-171-1/+5
* | | | Merge pull request #10932 from owncloud/issue/10926Morris Jobke2014-09-173-1/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Add unit testLukas Reschke2014-09-081-0/+19
| * | | Add a method to get the absolute url for a routeJoas Schilling2014-09-082-1/+22
* | | | Merge pull request #11092 from owncloud/conceal_sabredav_versionLukas Reschke2014-09-171-0/+8
|\ \ \ \
| * | | | Conceal or display SabreDAV version number in browser and http response headers.scolebrook2014-09-161-0/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1761-202/+170
* | | | | Merge pull request #10745 from owncloud/fix-10708-doctrineLukas Reschke2014-09-162-9/+35
|\ \ \ \ \
| * | | | | adding unit test to truncate the tableThomas Müller2014-09-162-1/+32
| * | | | | Use Doctrine Platform to generate SQL query for table truncation.Andreas Fischer2014-08-291-8/+3
* | | | | | Merge pull request #10902 from owncloud/fix-ellepsisLukas Reschke2014-09-162-0/+7
|\ \ \ \ \ \
| * | | | | | Adding link to ellipsis and fixing stylingClark Tomlinson2014-09-162-0/+7
* | | | | | | Merge pull request #11009 from owncloud/tobiasKaminsky-routeLukas Reschke2014-09-164-2/+99
|\ \ \ \ \ \ \
| * | | | | | | Route for thumbnail generationtobiasKaminsky2014-09-164-2/+99
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #11102 from owncloud/visit1985-issue_108Lukas Reschke2014-09-161-24/+38
|\ \ \ \ \ \ \
| * | | | | | | simplify mysql user creation flowMichael Göhler2014-09-161-24/+38
* | | | | | | | Merge pull request #10896 from owncloud/undo-nav-entryMorris Jobke2014-09-161-0/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | add delete undo stylesBernhard Posselt2014-09-161-0/+35
* | | | | | | | | Merge pull request #7254 from owncloud/core-sortalgoLukas Reschke2014-09-169-4/+527
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed sort algo for additional casesVincent Petry2014-08-114-3/+14
| * | | | | | | | | Fixed file list sortingVincent Petry2014-08-119-4/+516
* | | | | | | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15Lukas Reschke2014-09-16264-9790/+5917
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix failing AmazonS3::touch on updated aws sdkJohan Björk2014-09-031-1/+2
| * | | | | | | | | | Update AWS sdk to 2.6.15Johan Björk2014-09-03263-9789/+5915
* | | | | | | | | | | Merge pull request #11082 from owncloud/deduplicateDependencyCheckThomas Müller2014-09-161-70/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Deduplicate dependency checksLukas Reschke2014-09-161-70/+42
* | | | | | | | | | | | Merge pull request #11108 from owncloud/add-proper-descrLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reword the descriptionLukas Reschke2014-09-161-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #10754 from cetra3/masterLukas Reschke2014-09-161-7/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/owncloud/corecetra32014-09-081738-512781/+6129
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor internal session to write directly to $_SESSIONcetra32014-08-301-7/+37
* | | | | | | | | | | | | Merge pull request #11055 from owncloud/replaceprodnameThomas Müller2014-09-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | replace ownCloud with placeholderVolkan Gezer2014-09-131-2/+2
* | | | | | | | | | | | | | Merge pull request #11084 from owncloud/no-migration-for-mssql-masterLukas Reschke2014-09-162-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Disable database migrations for MSSQL - scripts have to be applied manuallyThomas Müller2014-09-152-0/+26
* | | | | | | | | | | | | | | Merge pull request #11081 from owncloud/trash_fix_expireLukas Reschke2014-09-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obligati...Bjoern Schiessle2014-09-151-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_pathMorris Jobke2014-09-167-5/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | patch tipsy in style.css - don't patch 3rdparty librariesMorris Jobke2014-09-162-1/+6