summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-051-1/+1
|\
| * Merge pull request #4683 from owncloud/publicuploadjserrorThomas Müller2013-09-041-0/+1
| |\
| | * Fixed public upload error that prevents uploadVincent Petry2013-09-011-0/+1
* | | separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-053-114/+131
* | | refactor dialog creationJörn Friedrich Dreyer2013-09-043-7/+38
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-0489-1197/+999
|\| |
| * | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-1/+1
| |\ \
| | * | Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| | * | remove editor div in filelistJörn Friedrich Dreyer2013-08-161-1/+0
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-032-3/+7
| * | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-013-9/+3
| |\ \ \
| | * | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-311-2/+2
| | * | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-312-7/+1
| | | |/ | | |/|
| * / | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0146-27/+91
| |/ /
| * | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1
| * | Merge master into oc_previewGeorg Ehrke2013-08-3068-295/+141
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3067-291/+140
| | * | prefix 'tbody tr' to separate app/core css errorspetemcfarlane2013-08-301-1/+1
| * | | use gerMimeTypeDetector detectPath instead of getMimeTypeGeorg Ehrke2013-08-301-1/+1
| * | | Merge master into oc_previewGeorg Ehrke2013-08-2953-195/+159
| |\| |
| | * | Reimplement filesummary in JSkondou2013-08-283-40/+125
| | * | backport of #4357 to masterThomas Müller2013-08-272-24/+26
| | * | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacementMorris Jobke2013-08-271-1/+1
| | |\ \
| | | * | Fix "select all" checkbox displacement when checkedPellaeon Lin2013-08-261-1/+1
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2745-48/+4
| | * | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-271-80/+0
| | |\ \ \
| | | * | | kill zh_CN.GB2312Thomas Müller2013-08-271-80/+0
| | * | | | storage information is path specificThomas Müller2013-08-272-2/+2
| | |/ / /
| * | | | use random string as id for checkboxGeorg Ehrke2013-08-261-1/+2
| * | | | fix background size in filelist.jsGeorg Ehrke2013-08-261-1/+1
| * | | | Merge master into oc_previewGeorg Ehrke2013-08-267-211/+24
| |\| | |
| | * | | Merge pull request #4542 from owncloud/fixing-4504-masterMorris Jobke2013-08-262-198/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | remove duplicate codeThomas Müller2013-08-222-198/+7
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-253-7/+9
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-232-0/+2
| * | | | fix preview issue when uploading a file with parenthesesGeorg Ehrke2013-08-261-1/+3
| * | | | move path generation for previews to dedicated functionGeorg Ehrke2013-08-232-3/+8
| * | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2319-45/+68
| |\| | |
| | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-6/+8
| | |/ /
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-219-3/+12
| | * | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-203-10/+11
| | |\ \
| | | * \ Merge branch 'master' into fix_jslint_kondoukondou2013-08-1880-830/+894
| | | |\ \
| | | * | | Fix a syntax error & have if-conds in an own linekondou2013-08-012-2/+6
| | | * | | Fix some JSLint warningskondou2013-07-313-15/+14
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-198-25/+34
| | * | | | adding file templates for ods, odt and odpThomas Müller2013-08-181-1/+3
| * | | | | move isMimeSupported out of template filesGeorg Ehrke2013-08-212-3/+4
| * | | | | style fixes for preview libGeorg Ehrke2013-08-191-1/+2
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-1986-736/+651
| |\| | | |
| | * | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-183-0/+16
| | |\ \ \ \