summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-1514-13/+16
* Merge pull request #11050 from owncloud/enc-flockfixLukas Reschke2014-09-151-1/+1
|\
| * Remove passing by reference to allow for proper GCVincent Petry2014-09-121-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1414-13/+15
* | Merge pull request #11054 from owncloud/fix-unit-tests-11041-masterThomas Müller2014-09-131-0/+2
|\ \
| * | content size checks are not valid for LOCKThomas Müller2014-09-121-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1325-24/+37
* | | Don't terminate the script if the pgsql database could not be deletedThomas Müller2014-09-121-1/+1
|/ /
* | Merge pull request #11041 from owncloud/no-size-check-on-lock-masterRaghu Nayyar2014-09-131-1/+1
|\ \
| * | content size checks are not valid for LOCKThomas Müller2014-09-121-1/+1
* | | Merge pull request #10974 from owncloud/fix-app-content-overflowBernhard Posselt2014-09-121-1/+0
|\ \ \
| * | | This fixes the double scrollbars issueBernhard Posselt2014-09-091-1/+0
* | | | remove 'set -e' - causes issues during ci executionThomas Müller2014-09-121-1/+1
* | | | Merge pull request #11043 from owncloud/test-againstNullClark Tomlinson2014-09-121-0/+4
|\ \ \ \
| * | | | Return false in case one of the values is nullLukas Reschke2014-09-121-0/+4
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1257-94/+87
|/ / / /
* | | | Merge pull request #11024 from owncloud/fix-nojavascriptJan-Christoph Borchardt2014-09-111-1/+2
|\ \ \ \
| * | | | fix nojavascript message alignmentJan-Christoph Borchardt2014-09-111-1/+2
* | | | | Merge pull request #11022 from owncloud/icons-fixJan-Christoph Borchardt2014-09-1116-153/+136
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix folder icon alignment, fix #10866Jan-Christoph Borchardt2014-09-1110-112/+102
| * | | | fix svg of calendar filetype iconJan-Christoph Borchardt2014-09-112-34/+32
| * | | | fix size of toggle icon, make container squareJan-Christoph Borchardt2014-09-112-4/+1
| * | | | improve style of checkmark icon, less bold, fitting ownCloud styleJan-Christoph Borchardt2014-09-112-3/+1
* | | | | Merge pull request #11018 from owncloud/fix-notification-layerLukas Reschke2014-09-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix notification visibility, fix #11016Jan-Christoph Borchardt2014-09-111-1/+1
* | | | | Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecause...Thomas Müller2014-09-111-2/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add custom hex2bin implementation for 5.3Lukas Reschke2014-09-111-2/+18
* | | | | Merge pull request #11007 from owncloud/replaces-10850Thomas Müller2014-09-113-1/+3
|\ \ \ \ \
| * | | | | Add X-UA-Compatible to all templatesLukas Reschke2014-09-113-1/+3
* | | | | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_overLukas Reschke2014-09-114-2/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refresh if maintenance mode is overkondou2014-09-094-2/+25
* | | | | | Merge pull request #10962 from owncloud/repair_search_luceneLukas Reschke2014-09-113-2/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | repair search lucene before installingJörn Friedrich Dreyer2014-09-103-2/+66
| |/ / / /
* | | | | Merge pull request #9698 from owncloud/fix-9666Thomas Müller2014-09-113-6/+8
|\ \ \ \ \
| * | | | | Fix contructor in testRobin Appelman2014-09-101-3/+3
| * | | | | Fix mkdir error in mountconfig.phpRobin McCorkell2014-09-101-1/+1
| * | | | | Load apps in test situationsRobin McCorkell2014-09-102-2/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1128-151/+774
* | | | | | Merge pull request #10992 from oparoz/patch-3Robin McCorkell2014-09-101-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Create .user.ini for PHP-FPMOlivier Paroz2014-09-101-0/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #10988 from owncloud/usetransactions-wrong-nameThomas Müller2014-09-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix method nameRobin Appelman2014-09-101-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #10990 from owncloud/fix-testCallRegister-masterLukas Reschke2014-09-101-1/+1
|\ \ \ \
| * | | | requesttoken has now a length of 30 charsThomas Müller2014-09-101-1/+1
|/ / / /
* | | | Merge pull request #10929 from owncloud/issue/10514Vincent Petry2014-09-101-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Set overwritewebroot when installing owncloud to avoid problemsJoas Schilling2014-09-081-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1039-41/+89
* | | | Merge pull request #9512 from libasys/patch-2Lukas Reschke2014-09-091-1/+2
|\ \ \ \
| * | | | Fix use Sharing Api with calendarlibasys2014-07-081-2/+3
* | | | | Merge pull request #10844 from owncloud/acceptance-enableappsLukas Reschke2014-09-094-9/+304
|\ \ \ \ \