summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2575 from owncloud/fixing-1461-masterJörn Friedrich Dreyer2013-03-281-5/+25
|\
| * fixes #1463 - file size is now displayed correctly in IE8Thomas Mueller2013-03-261-2/+6
| * fixes #1461Thomas Mueller2013-03-261-3/+19
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-273-0/+13
* | prevent to fire delete ajax a second time.Thomas Mueller2013-03-262-3/+3
|/
* Merge pull request #2270 from owncloud/fix_json_encoded_pubic_downloadBjörn Schießle2013-03-261-1/+1
|\
| * let public link download handle json encoded file listsBjörn Schießle2013-03-131-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-231-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-211-5/+5
* | Merge pull request #2363 from owncloud/uploadsizeBernhard Posselt2013-03-182-1/+3
|\ \
| * | Don't block uploads if the max upload size is unknownRobin Appelman2013-03-151-0/+2
| * | Improve handeling of unlimited max upload sizeRobin Appelman2013-03-151-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-181-1/+50
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-162-1/+8
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-153-1/+11
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-142-0/+9
* | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
|\ \ | |/ |/|
| * only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| * don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-131-0/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-121-8/+8
* Merge pull request #1584 from owncloud/ocs_multiple_methodsTom Needham2013-03-093-1/+30
|\
| * Merge in masterTom Needham2013-03-0916-12/+32
| |\
| * \ Rebase to current masterTom Needham2013-03-0570-467/+744
| |\ \
| * | | Add further capabilities to /cloud/capabilitites api callTom Needham2013-02-103-1/+30
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-102-9/+26
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-091-0/+1
| |_|/ |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-082-7/+9
* | | Merge pull request #2167 from owncloud/input-type-fixFrank Karlitschek2013-03-071-1/+1
|\ \ \
| * | | add type=text to ZIP size field, fix second part of #2097Jan-Christoph Borchardt2013-03-061-1/+1
* | | | remove debug outputBjörn Schießle2013-03-071-2/+1
* | | | json encode list of filesBjörn Schießle2013-03-072-3/+11
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-072-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-065-1/+5
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-054-0/+5
* | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075Jan-Christoph Borchardt2013-03-041-1/+1
| |/ |/|
* | Merge pull request #2069 from owncloud/fix_sanitize_callLukas Reschke2013-03-041-1/+1
|\ \
| * | use p() for the output and not for the comparisonBjörn Schießle2013-03-041-1/+1
* | | Merge pull request #2044 from owncloud/fix_1779_including_permanent_sharesBart Visscher2013-03-041-1/+7
|\ \ \
| * | | durhurrrhurrrJörn Friedrich Dreyer2013-03-031-1/+7
* | | | Datepicker height fixed.raghunayyar2013-03-042-2/+2
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0446-90/+48
* | | Merge pull request #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-031-18/+19
|\ \ \ | |/ / |/| |
| * | fix oc#47Georg Ehrke2013-03-011-18/+19
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-038-31/+39
* | | Merge branch 'master' into from-insane-autoescape-to-pThomas Mueller2013-03-011-0/+1
|\ \ \
| * | | fixes #2001 - in case the user has no permissions to upload/create files/fold...Thomas Mueller2013-03-011-1/+2
* | | | Sed was wrongLukas Reschke2013-02-281-1/+1
* | | | [Files] Use p() instead of echoLukas Reschke2013-02-271-2/+1
* | | | Merge masterLukas Reschke2013-02-271-2/+2
|\| | |