summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-0526-34/+118
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-0514-15/+45
| * 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
| * | 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-038-7/+37
| * | | This function doesn't cache anymore. Adjusted PHPDoc to suit.ringmaster2013-09-021-1/+1
| * | | Don't cache the pkey, skip generation if the keyfile existsringmaster2013-09-022-13/+11
| * | | Employ config option for OpenSSL config file, if provided.Owen Winkler2013-09-022-6/+20
| * | | Start a branch for easier OpenSSL configuration.Owen Winkler2013-09-022-1/+12
* | | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-0294-398/+656
|\| | |
| * | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-014-10/+4
| |\ \ \
| | * | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-312-3/+3
| | * | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-312-7/+1
| | | |/ | | |/|
| * / | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0149-32/+96
| |/ /
| * | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1
| * | Merge master into oc_previewGeorg Ehrke2013-08-3073-300/+164
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3072-296/+163
| | * | 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-2985-354/+1742
| |\| |
| * | | 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-2614-217/+52
| |\ \ \
| * | | | 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-2396-477/+243
| |\ \ \ \
| * | | | | move isMimeSupported out of template filesGeorg Ehrke2013-08-215-5/+12
| * | | | | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-194-0/+137
| * | | | | style fixes for preview libGeorg Ehrke2013-08-191-1/+2
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-19225-1661/+1433
| |\ \ \ \ \
| * | | | | | 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-14509-583/+1697
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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 js errorGeorg Ehrke2013-08-071-1/+1
| * | | | | | | implement previews of single shared filesGeorg Ehrke2013-08-072-1/+5
| * | | | | | | fix merge conflictsGeorg Ehrke2013-08-0568-57/+340
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into oc_previewGeorg Ehrke2013-07-3010-5/+70
| |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-01 11:48:32 +0000