summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into move-datadirectory-checksMichael Gapczynski2013-01-18622-6831/+6456
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-01-1920-118/+140
| * Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-188-16/+171
| |\
| | * fixing indentThomas Mueller2013-01-185-73/+73
| | * adding a ajax call to get the current file storage stats like free spaceThomas Mueller2013-01-112-0/+42
| | * load jquery-visibilityThomas Mueller2013-01-111-0/+1
| | * adding jquery-visibilityThomas Mueller2013-01-111-0/+32
| | * Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-11275-5555/+8279
| | |\
| | * \ Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-06502-7419/+14471
| | |\ \
| | * | | the maximum upload size is now part of the response of the upload and delete ...Thomas Müller2012-12-206-17/+98
| * | | | Merge pull request #1224 from davidgumberg/patch-2Lukas Reschke2013-01-181-1/+1
| |\ \ \ \
| | * | | | Typo fix (comment) /lib/base.phpdavidgumberg2013-01-181-1/+1
| |/ / / /
| * | | | Fix wrong word in commentBart Visscher2013-01-181-1/+1
| * | | | fix error message, add "appid" to the output to know which app caused the err...Björn Schießle2013-01-181-1/+1
| * | | | Merge pull request #1205 from owncloud/ocs_apiThomas Müller2013-01-181-0/+2
| |\ \ \ \
| | * | | | Correct spelling of 'Authorization'tomneedham2013-01-171-1/+1
| | * | | | Fix incorrect indentationTom Needham2013-01-161-2/+2
| | * | | | Return 401 headers when authentication is required for the api callTom Needham2013-01-161-0/+2
| * | | | | Merge pull request #1181 from owncloud/return-503-in-maintenanceThomas Müller2013-01-181-0/+6
| |\ \ \ \ \
| | * | | | | in case of maintenance the error page returns http status 503.Thomas Mueller2013-01-141-0/+6
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1876-215/+288
| * | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |