summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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-1810-0/+10
* | | 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-171-0/+1
* | | | Whitespace cleanupBart Visscher2013-01-1626-80/+78
* | | | Spaces to tabsBart Visscher2013-01-166-696/+696
* | | | 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 #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
* | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-1417-393/+661
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Move { to same lineLukas Reschke2013-01-141-2/+1
| * | | | | Expand if to multiple linesLukas Reschke2013-01-141-2/+6
| | |/ / / | |/| | |
| * | | | Merge pull request #1177 from owncloud/OC_User--isAdminUser()Bart Visscher2013-01-148-72/+29
| |\ \ \ \
| | * | | | Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-142-47/+0
| | * | | | Check if user is admin - boolLukas Reschke2013-01-148-25/+29
| | |/ / /
| * | | | Merge pull request #1172 from owncloud/isSubDirectoryBart Visscher2013-01-141-24/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| | * | | Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| | * | | Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| | * | | Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
| * | | | Merge pull request #1112 from Raydiation/masterBart Visscher2013-01-141-17/+5
| |\ \ \ \
| | * | | | added cleanup recommendations by including ocs in the cachedKey method and mo...Bernhard Posselt2013-01-071-5/+5
| | * | | | readded ocs routesBernhard Posselt2013-01-071-0/+5
| | * | | | fixed error that displayed a white page and a warning that routes could not b...Bernhard Posselt2013-01-071-17/+0
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-141-1/+7
| | |/ / / | |/| | |
| * | | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharingThomas Müller2013-01-101-96/+484
| |\ \ \ \
| | * | | | add more linebreaks, replace SQL LIMIT with paramJörn Friedrich Dreyer2013-01-091-96/+484
| | |/ / /
| * | / / [tx-robot] updated from transifexJenkins for ownCloud2013-01-111-6/+17
| | |/ / | |/| |
| * | | Merge pull request #1127 from owncloud/fixing-641-for-webdav-masterThomas Müller2013-01-102-0/+78
| |\ \ \
| | * | | webdav returns "503 Service Unavailable" in case the ownCloud server is curre...Thomas Mueller2013-01-092-0/+78
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-101-2/+32
| * | | Upstream merged my patch to add additional ssl root certificates to the webda...Björn Schießle2013-01-081-173/+0
| |/ /
* | | fixing returnsThomas Mueller2013-01-062-8/+8
* | | fixing returnsThomas Mueller2013-01-061-4/+3
* | | add missing returnThomas Mueller2013-01-061-1/+2