summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update Files icon from home to files, update Home icon from checkbox to homeJan-Christoph Borchardt2013-01-284-34/+78
* undo padding change on buttons, otherwise it will mess up the upload and new ...Jan-Christoph Borchardt2013-01-281-1/+1
* merge changes in navigationJan-Christoph Borchardt2013-01-283-6/+5
|\
| * More Style Fixesraghunayyar2013-01-251-2/+1
| * Defined height for #leftcontentraghunayyar2013-01-252-2/+2
| * Style fixes on core/navigation Branch.raghunayyar2013-01-251-2/+2
* | fix up content and content-wrapper merge ...Jan-Christoph Borchardt2013-01-18261-3245/+4370
|\ \ | |/ |/|
| * Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
| |\
| | * Rename TestException to DatabaseSetupExceptionSean Comeau2013-01-141-5/+5
| | * Use a custom exception instead of adding a delimiter to the error messageSean Comeau2013-01-141-8/+31
| | * Throw an exception when creating a MySQL user fails and display exception err...Sean Comeau2013-01-101-3/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1791-1695/+1975
| * | Merge pull request #1204 from Raydiation/masterBart Visscher2013-01-163-10/+8
| |\ \
| | * | dont show horizontal scrollbarBernhard Posselt2013-01-161-1/+1
| | * | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-163-10/+8
| |/ /
| * | Merge pull request #1180 from owncloud/whitespace-cleanupBart Visscher2013-01-1651-1058/+1056
| |\ \
| | * | Whitespace cleanupBart Visscher2013-01-1634-107/+105
| | * | Spaces to tabsBart Visscher2013-01-1618-951/+951
| |/ /
| * | Merge pull request #1185 from owncloud/fixing-1162-masterJan-Christoph Borchardt2013-01-162-5/+19
| |\ \
| | * | handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| * | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
| |\ \ \
| | * \ \ Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into...Björn Schießle2013-01-160-0/+0
| | |\ \ \
| | | * | | initializeBjörn Schießle2013-01-161-1/+2
| | * | | | initialize $versionCreatedBjörn Schießle2013-01-161-1/+2
| | |/ / /
| | * | | Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into...Björn Schießle2013-01-150-0/+0
| | |\ \ \
| | | * | | fix for issue #1189, missing variables addedBjörn Schießle2013-01-151-1/+3
| | * | | | fix for issue #1186, missing variables addedBjörn Schießle2013-01-151-1/+3
| | |/ / /
| * | | | Merge pull request #1195 from owncloud/cache_preparedThomas Müller2013-01-151-2/+14
| |\ \ \ \
| | * | | | Clear cached prepared statements when switching between mdb2 and pdoRobin Appelman2013-01-161-2/+4
| | * | | | Cache prepared statements in OC_DBRobin Appelman2013-01-151-0/+10
| | |/ / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-16122-473/+1270
| * | | | Merge pull request #1178 from owncloud/return_true_because_of_poniesThomas Müller2013-01-152-8/+1
| |\ \ \ \
| | * | | | Remove uneeded returnsLukas Reschke2013-01-142-5/+1
| | * | | | Remove uneeded returnLukas Reschke2013-01-141-3/+0
| * | | | | Fix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaafDaniel Molkentin2013-01-151-1/+3
| * | | | | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-masterBart Visscher2013-01-1518-34/+30
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | remove php closing tagThomas Mueller2013-01-143-3/+1
| | * | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-14469-8058/+10445
| | |\ \ \ \
| | * | | | | fixing <input> tagThomas Mueller2013-01-073-6/+6
| | * | | | | fixing returnsThomas Mueller2013-01-062-8/+8
| | * | | | | fixing returnsThomas Mueller2013-01-061-4/+3
| | * | | | | add missing returnThomas Mueller2013-01-061-1/+2
| | * | | | | remove silly assignmentThomas Mueller2013-01-061-1/+0
| | * | | | | fixing undefined variable $whereThomas Mueller2013-01-061-1/+1
| | * | | | | fixing undefined variable $result - should be $query I assumeThomas Mueller2013-01-061-1/+1
| | * | | | | initialize $resultThomas Mueller2013-01-061-1/+1
| | * | | | | fixing undefined $eventSourceThomas Mueller2013-01-061-1/+2
| | * | | | | fixing call of OC_Log::write() - missing parameterThomas Mueller2013-01-061-1/+1
| | * | | | | removing unused parameter $parametersThomas Mueller2013-01-061-2/+2
| | * | | | | removing undefined $responseThomas Mueller2013-01-061-4/+2