summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #632 from owncloud/fix_629Thomas Müller2013-01-061-1/+1
|\
| * use regex which was suggested by dragotinGeorg Ehrke2012-12-171-1/+1
| * fix pattern for database namesGeorg Ehrke2012-11-291-1/+1
* | Merge pull request #1092 from owncloud/rename_dotThomas Müller2013-01-063-6/+18
|\ \
| * | rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has ...Thomas Mueller2013-01-062-5/+17
| * | Files: prevent people from renaming files to '.'Robin Appelman2013-01-052-2/+2
* | | Merge pull request #1079 from owncloud/update-progressMichael Gapczynski2013-01-057-49/+159
|\ \ \
| * \ \ Merge branch 'master' into update-progressMichael Gapczynski2013-01-05149-3387/+4619
| |\ \ \ | |/ / / |/| | |
* | | | 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-0418-488/+799
|\ \ \ \
| * | | | Remove the WIP external sharing apiTom Needham2012-12-314-84/+0
| * | | | Remove WIP OAuth codeTom Needham2012-12-312-206/+0
| * | | | Remove accidental submoduleTom Needham2012-12-311-0/+0
| * | | | Code cleanup and add copyright infoTom Needham2012-12-311-1/+23
| * | | | Merge branch 'master' into ocs_apiTom Needham2012-12-31444-8363/+11975
| |\ \ \ \
| * | | | | Remove unused methodsTom Needham2012-12-311-16/+0
| * | | | | check if adminFrank Karlitschek2012-12-294-1/+10
| * | | | | Fall back to default log file if logfile config file not found, suppress writ...Michael Gapczynski2012-12-291-5/+10
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2912-15/+17
| * | | | | Change post_write hook to write to prevent creating a duplicate of the origin...Michael Gapczynski2012-12-291-1/+1
| * | | | | prevent keyboardshortcuts from catching events outside the main doc - e.g. th...Thomas Mueller2012-12-291-0/+3
| * | | | | Merge branch 'master' into ocs_apiTom Needham2012-12-16124-2770/+3675
| |\ \ \ \ \
| * | | | | | 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-141030-26105/+46695
| |\ \ \ \ \ \
| * | | | | | | Remove 3rdparty repo from ocs_api branchTom Needham2012-12-14577-192246/+0
| * | | | | | | API: Tidy up routes.php, remove redundant call registrationTom Needham2012-12-141-9/+0
| * | | | | | | 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-125-320/+17
| * | | | | | | 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
| * | | | | | | External Share API: Move url down one level in responseTom Needham2012-10-314-2/+15
| * | | | | | | Detect http protocol in providers.phpTom Needham2012-10-281-1/+1
| * | | | | | | Fix url generated for public shared filesTom Needham2012-10-281-2/+2
| * | | | | | | Merge master into ocs_apiTom Needham2012-10-282011-185584/+52808
| |\ \ \ \ \ \ \
| * | | | | | | | Add API method for sharing a file, currently only via a link.Tom Needham2012-10-284-2/+73
| * | | | | | | | Allow apps to pass defaults and requirements for their API callsTom Needham2012-10-281-2/+4
| * | | | | | | | Merge branch 'master' into ocs_apiTom Needham2012-09-17215-1970/+2373
| |\ \ \ \ \ \ \ \
| * | | | | | | | | API: Parse PUT and DELETE variablesTom Needham2012-09-171-0/+6
| * | | | | | | | | API: Fix merge conflict remnantsTom Needham2012-09-171-1/+0
| * | | | | | | | | API: Allow admins to access SUBADMIN api methodsTom Needham2012-09-141-2/+8
| * | | | | | | | | API: Add required auth level to OCS routes, move some routes to provisioning_...Tom Needham2012-09-131-13/+9
| * | | | | | | | | API: Use http authentication, check the auth level requiredTom Needham2012-09-131-19/+22