summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | 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
| * | | | | | | | | | | | | | let the home icon link to the files view in the trash binBjörn Schießle2013-03-072-1/+22
* | | | | | | | | | | | | | | Merge pull request #2163 from owncloud/fix_file_downloadBjörn Schießle2013-03-073-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | create a meanigful file name if files are from the root folderBjörn Schießle2013-03-071-1/+7
| * | | | | | | | | | | | | | remove debug outputBjörn Schießle2013-03-071-2/+1
| * | | | | | | | | | | | | | json encode list of filesBjörn Schießle2013-03-073-5/+14
|/ / / / / / / / / / / / / /
* | | / / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-03-0735-383/+429
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #2134 from owncloud/fix_2127blizzz2013-03-061-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | return 403 when mkdir failed on webDAV, fixes #2127Arthur Schiwon2013-03-061-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2130 from owncloud/fix_2128Thomas Müller2013-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix #2128Georg Ehrke2013-03-061-1/+1
* | | | | | | | | | | | Merge pull request #2129 from owncloud/don't-sanitize-error-messageBernhard Posselt2013-03-062-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add warning about sanitizationLukas Reschke2013-03-061-2/+3
| * | | | | | | | | | | Don't sanitize error message hintLukas Reschke2013-03-061-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2120 from owncloud/clear-cachesBernhard Posselt2013-03-062-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clear the CSS and JS cache earlier to make sure update goes smoothlyMichael Gapczynski2013-03-052-4/+4
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |