summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* [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
| |\ \ \
| | * \ \ Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1780-518/+588
| | |\ \ \
| | * | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-151-1/+1
| | * | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-123-0/+16
| * | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbuttonChristopher2013-08-181-4/+14
| |\ \ \ \ \
| | * | | | | remove unneeded extra ID selectorsJan-Christoph Borchardt2013-08-181-2/+2
| | * | | | | move upload progress bar near upload button, more contextualJan-Christoph Borchardt2013-08-181-3/+13
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-186-6/+6
| |\ \ \ \ \
| | * | | | | Add _many_ newlines at the end of fileskondou2013-08-186-6/+6
| | |/ / / /
| * | | | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-182-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix spacing of all touched lines.Andreas Fischer2013-08-171-1/+1
| | * | | | Compare result are already true/falseBart Visscher2013-08-172-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-174-315/+331
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | communicate size of newly created file back and update UIThomas Müller2013-08-163-310/+316