summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-0275-385/+468
|\
| * 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
| |\|
| * | 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
| |\ \
| * | | 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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | vertically center rename input boxJan-Christoph Borchardt2013-08-172-3/+9
| * | | | | use jQuery.get instead of jQuery.ajaxGeorg Ehrke2013-08-161-6/+2
| * | | | | checkstyle double quotes in HTMLJan-Christoph Borchardt2013-08-151-2/+2
| * | | | | adjust New file dialog for new stylesJan-Christoph Borchardt2013-08-152-3/+6
| * | | | | fix file summary positionJan-Christoph Borchardt2013-08-141-2/+1
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-1475-95/+241
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'oc_preview' of github.com:owncloud/core into oc_previewJan-Christoph Borchardt2013-08-141-2/+6
| |\ \ \ \ \ \
| | * | | | | | fix adding preview-icon to clss attributeGeorg Ehrke2013-08-141-2/+6
| * | | | | | | increase row height to 50px, properly position everything, checkboxes, action...Jan-Christoph Borchardt2013-08-144-44/+131
| |/ / / / / /
| * | | | | | fix breaking error due to ... a wrong icon link. Seriously?Jan-Christoph Borchardt2013-08-141-1/+1
| * | | | | | lazy load preview iconsGeorg Ehrke2013-08-142-7/+15
| * | | | | | use web.svg instead of web.pngGeorg Ehrke2013-08-141-1/+1
| * | | | | | don't use hardcoded size for previewGeorg Ehrke2013-08-142-2/+4
| * | | | | | fix merge conflictsGeorg Ehrke2013-08-052-12/+46
| |\ \ \ \ \ \
| * | | | | | | style fixesGeorg Ehrke2013-07-302-2/+2
| * | | | | | | Merge branch 'master' into oc_previewThomas Müller2013-07-3023-79/+158
| |\ \ \ \ \ \ \
| * | | | | | | | add class='preview-icon' to rows in file app that make use of previewsGeorg Ehrke2013-07-291-2/+10
| * | | | | | | | implement use of previews in sharing appGeorg Ehrke2013-07-112-1/+9
| * | | | | | | | merge conflicts ...Georg Ehrke2013-07-1075-634/+1161
| |\ \ \ \ \ \ \ \
| * | | | | | | | | properly encode pathGeorg Ehrke2013-07-101-1/+1
| * | | | | | | | | some style adjustmentsGeorg Ehrke2013-07-102-5/+5
| * | | | | | | | | fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a bett...Georg Ehrke2013-07-021-2/+2
| * | | | | | | | | implement preview loading after uploadGeorg Ehrke2013-07-022-8/+16
| * | | | | | | | | increase size of preview to size of rowGeorg Ehrke2013-06-261-1/+1
| * | | | | | | | | implement server side use of previewsGeorg Ehrke2013-06-261-1/+2
| * | | | | | | | | increase Files row height to tappable 44px, more breathing spaceJan-Christoph Borchardt2013-06-251-9/+47
* | | | | | | | | | enable user to inform recipients about a shared file by mailBjoern Schiessle2013-08-302-1/+3
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \