aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-0913-94/+264
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge in masterTom Needham2013-03-09231-1636/+2339
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Rebase to current masterTom Needham2013-03-051389-33246/+89446
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add further capabilities to /cloud/capabilitites api callTom Needham2013-02-106-1/+63
| * | | | | | | | | | | | more code styleTom Needham2013-02-101-1/+1
| * | | | | | | | | | | | Code style and remove OAuth codeTom Needham2013-02-101-11/+3
| * | | | | | | | | | | | Change capabilities exposure for files_versions since it extends filesTom Needham2013-02-101-3/+2
| * | | | | | | | | | | | Remove debug call, correct app identifierTom Needham2013-02-102-3/+1
| * | | | | | | | | | | | Fix api result merging.Tom Needham2013-02-095-9/+10
| * | | | | | | | | | | | Merge in masterTom Needham2013-02-09838-10671/+20944
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use OC_User::isAdminUser() in lib/api.phpTom Needham2013-02-091-2/+2
| * | | | | | | | | | | | | Merge branch 'ocs_capabilities' into ocs_multiple_methodsTom Needham2013-02-091012-30311/+65034
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add capabilities exposure to the versioning appTom Needham2013-02-093-0/+32
| | * | | | | | | | | | | | | Remove accidental inclusion of apps repo.Tom Needham2013-02-091-0/+0
| | * | | | | | | | | | | | | Change strucutre of cloud/capabilities responseTom Needham2013-02-091-1/+6
| | * | | | | | | | | | | | | Fix merge conflictTom Needham2013-02-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | fixing variable name typeThomas Mueller2013-01-311-1/+1
| | | * | | | | | | | | | | | | Merge branch 'master' into ocs_capabilitiesThomas Mueller2013-01-311051-26145/+59113
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge masterTom Needham2013-02-041217-33377/+75327
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Remove app related values and change structure of /cloud/capabilties callTom Needham2013-02-041-9/+9
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add <syncpollinterval> and order the result for /cloud/capabilitiesTom Needham2013-01-161-5/+6
| | * | | | | | | | | | | | | | | Add new /cloud/capabilities route and remove unused methodsTom Needham2013-01-162-44/+13
| * | | | | | | | | | | | | | | | API: Remove api response structure from OC_OCS_Result, handle multiple regist...Tom Needham2013-01-252-45/+158
* | | | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1032-234/+293
* | | | | | | | | | | | | | | | | Merge pull request #2214 from riso/fix_xsendfileLukas Reschke2013-03-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fixed typo that broke xsendfileValerio Ponte2013-03-091-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #2213 from owncloud/fix_2208Frank Karlitschek2013-03-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | remove remaining br-tags that do not belong hereArthur Schiwon2013-03-091-2/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-03-0985-419/+540
| |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #2165 from owncloud/fix_2155Lukas Reschke2013-03-082-6/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix foldersize check to validate zip input sizeArthur Schiwon2013-03-081-5/+11
| * | | | | | | | | | | | | | Offer download of whole shared dir only if it does not exceed zip input limitArthur Schiwon2013-03-071-1/+5
* | | | | | | | | | | | | | | 5.0.0 RC3v5.0.0RC3Frank Karlitschek2013-03-081-2/+2
* | | | | | | | | | | | | | | Merge pull request #2189 from owncloud/versioning_sync_clientBernhard Posselt2013-03-082-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | remove some debug output; move code to the right functionBjörn Schießle2013-03-083-7/+9
| * | | | | | | | | | | | | | remove debug outputBjörn Schießle2013-03-081-2/+1
| * | | | | | | | | | | | | | distinguish between touch and writeBjörn Schießle2013-03-073-1/+16
* | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0895-805/+1161
| |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | fixed header content paddingFlorian Hülsmann2013-03-071-1/+1
* | | | | | | | | | | | | | Merge pull request #2173 from owncloud/fix-shared-storageBernhard Posselt2013-03-076-20/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change findById to findByStorageId in mount testMichael Gapczynski2013-03-071-1/+1
| * | | | | | | | | | | | | | Fix fetching source path of shared filesMichael Gapczynski2013-03-076-19/+62
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2174 from owncloud/fix_printed_brsblizzz2013-03-071-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove <br> from error messages, because they will be escaped and the used te...Arthur Schiwon2013-03-071-15/+15
* | | | | | | | | | | | | | | Merge pull request #2167 from owncloud/input-type-fixFrank Karlitschek2013-03-072-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add type=text to ZIP size field, fix second part of #2097Jan-Christoph Borchardt2013-03-061-1/+1
| * | | | | | | | | | | | | | add email input type to styled inputs, fix #2097Jan-Christoph Borchardt2013-03-061-5/+14
* | | | | | | | | | | | | | | Merge pull request #2162 from owncloud/trash_bin_homeJan-Christoph Borchardt2013-03-072-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add dirlisting var to file listBjörn Schießle2013-03-071-0/+1
| * | | | | | | | | | | | | | | no dir parameter neededBjörn Schießle2013-03-071-1/+1