summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2279 from owncloud/refactor_upload_jsBart Visscher2013-04-064-252/+298
|\
| * use css browser switch instead of deprecated jquery browser detectionJörn Friedrich Dreyer2013-03-281-7/+7
| * '#upload' is actually '#uploadprogresswrapper', fix css and js to show cancel...Jörn Friedrich Dreyer2013-03-282-6/+7
| * use local variable to walk DOM only onceJörn Friedrich Dreyer2013-03-281-4/+5
| * use === to compare empty string ''Jörn Friedrich Dreyer2013-03-281-1/+1
| * don't update progress bar in ie < 10Jörn Friedrich Dreyer2013-03-281-1/+3
| * return created table row, use as context in fileupload eventsJörn Friedrich Dreyer2013-03-281-11/+153
| * refactor files.js, make proper use of fileupload eventsJörn Friedrich Dreyer2013-03-281-237/+136
| * return original filename to fileuploadJörn Friedrich Dreyer2013-03-281-0/+1
* | Merge pull request #1974 from owncloud/use-rawurlencodeBart Visscher2013-04-061-2/+2
|\ \
| * | Just use rawurlencode in files list templateBart Visscher2013-02-271-2/+2
* | | Merge pull request #2738 from Kondou-ger/fix_alert_issuesBart Visscher2013-04-061-4/+4
|\ \ \
| * | | Translate 'Error' in corekondou2013-04-061-4/+4
| * | | Fixed things in alert-messagesroot2013-04-051-4/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-061-0/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-051-1/+28
|/ / /
* | | Merge pull request #2611 from owncloud/filename-widthBart Visscher2013-04-041-1/+1
|\ \ \
| * | | Using max-width instead of width for filename.raghunayyar2013-03-301-1/+1
| * | | Adds a fixed width to the filename to prevent horizontal scroll.raghunayyar2013-03-291-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-04-041-0/+5
* | | Merge pull request #2576 from owncloud/fixing-2125-masterJan-Christoph Borchardt2013-03-311-1/+1
|\ \ \
| * | | fixes #2125 - the warning is now displayed with a disabled buttonThomas Mueller2013-03-261-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-301-0/+1
| |/ / |/| |
* | | 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
| |_|/ / |/| | |