summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch 'master' into update-progressMichael Gapczynski2013-01-0514-505/+710
|\
| * Merge pull request #1066 from owncloud/fix-388-masterThomas Müller2013-01-053-21/+85
| |\
| | * remove duplicate returnThomas Mueller2013-01-051-2/+0
| | * enhanced log messageThomas Mueller2013-01-041-1/+1
| | * documentation adjusted on the wayThomas Mueller2013-01-041-0/+1
| | * Fallback to use COM or exec('stat ..') is only executed if stat or filesize r...Thomas Mueller2013-01-041-12/+35
| | * OC_Helper::is_function_enabled() added to find out if a function is availableThomas Mueller2013-01-041-18/+43
| | * workaround for 32-bit systems to handle filesizes bigger than 2GBThomas Mueller2013-01-032-2/+19
| * | Merge pull request #1053 from owncloud/ocs_apiMichael Gapczynski2013-01-0411-484/+625
| |\ \
| | * | Remove WIP OAuth codeTom Needham2012-12-312-206/+0
| | * | Code cleanup and add copyright infoTom Needham2012-12-311-1/+23
| | * | Merge branch 'master' into ocs_apiTom Needham2012-12-3120-874/+1142
| | |\ \
| | * | | Remove unused methodsTom Needham2012-12-311-16/+0
| | * | | Fall back to default log file if logfile config file not found, suppress writ...Michael Gapczynski2012-12-291-5/+10
| | * | | Merge branch 'master' into ocs_apiTom Needham2012-12-1614-178/+198
| | |\ \ \
| | * | | | API: PUT and DELETE variables are now accessed from the parameters arrayTom Needham2012-12-151-3/+3
| | * | | | Merge master into ocs_api, fix conflicts.Tom Needham2012-12-14126-1146/+2987
| | |\ \ \ \
| | * | | | | API: Add check to see if the user is authorised to run the api methodTom Needham2012-12-121-5/+9
| | * | | | | API: Include totalitems and itemsperpage meta data when needed.Tom Needham2012-12-121-1/+7
| | * | | | | API: Remove old code. Move remaining methods to OC_OCS_Result.Tom Needham2012-12-124-319/+10
| | * | | | | API: OCS methods now use OC_OCS_Result to return dataTom Needham2012-12-124-10/+10
| | * | | | | API: Further tidying, implement OC_OCS_Result object for api results.Tom Needham2012-12-122-60/+74
| | * | | | | API: Specify the response format using a GET parameterTom Needham2012-12-111-9/+5
| | * | | | | Merge master into ocs_apiTom Needham2012-10-28117-1090/+2590
| | |\ \ \ \ \
| | * | | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-281-1/+1
| | * | | | | | Allow apps to pass defaults and requirements for their API callsTom Needham2012-10-281-2/+4
| | * | | | | | Merge branch 'master' into ocs_apiTom Needham2012-09-174-8/+13
| | |\ \ \ \ \ \
| | * | | | | | | API: Parse PUT and DELETE variablesTom Needham2012-09-171-0/+6