summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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 pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-143-23/+8
| |\
| | * Reword a phrasekondou2013-08-141-1/+1
| | * Use plural translationskondou2013-08-093-23/+8
| * | Merge pull request #4363 from owncloud/fix-4355Thomas Müller2013-08-141-11/+16
| |\ \
| | * | Use multiple lines for the JSON data array.Andreas Fischer2013-08-081-1/+5
| | * | Adjust JSON code to stable5.Andreas Fischer2013-08-081-1/+2
| | * | Do not repeat JSON success code.Andreas Fischer2013-08-081-8/+7
| | * | Do not repeat definition of $target.Andreas Fischer2013-08-081-5/+6
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1314-4/+51
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1110-0/+13
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-09500-522/+1549
| |/
| * Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-081-1/+1
| |\
| | * Merge branch 'master' into css_cleanup_kondoukondou2013-07-24862-1086/+79955
| | |\
| | * | General CSS cleanupkondou2013-07-091-1/+1
| * | | Merge pull request #4243 from owncloud/no_empty_versionsBjörn Schießle2013-08-081-2/+5
| |\ \ \
| | * | | don't create empty versionsBjoern Schiessle2013-07-301-2/+5
| * | | | Merge pull request #4340 from owncloud/true-false-as-filenameThomas Müller2013-08-081-1/+1
| |\ \ \ \
| | * | | | Check expected type after JSON decode instead of checking what is not expected.Andreas Fischer2013-08-071-1/+1
| * | | | | more error messages which might be useful for the user to debug his server co...Bjoern Schiessle2013-08-082-2/+6
| * | | | | improved error message to refect openSSL PHP extension and stock openSSL conf...Bjoern Schiessle2013-08-081-1/+1
| * | | | | also write error message to the logBjoern Schiessle2013-08-081-0/+1
| * | | | | catch broken server config and disable encryption app.Bjoern Schiessle2013-08-082-1/+13
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0710-20/+37
* | | | | | 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
|\| | | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-052-1/+3
| * | | | | Merge pull request #4285 from owncloud/scan-files-script-masterThomas Müller2013-08-051-0/+31
| |\ \ \ \ \
| | * | | | | remove cli checkThomas Müller2013-08-021-4/+0
| | * | | | | adjust usage textThomas Müller2013-08-021-2/+2
| | * | | | | Use console.php entry point for file scanning from consoleBart Visscher2013-08-021-0/+35
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-044-1/+8
| | |/ / / / | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-038-1/+22
| * | | | | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-028-27/+27
| |\ \ \ \ \
| | * | | | | Use isIgnoredDir()kondou2013-07-101-1/+1
| | * | | | | Use !== and === in files_trashbin-appkondou2013-07-108-27/+27
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-025-12/+26
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #4270 from owncloud/fix_4253Björn Schießle2013-08-012-11/+14
| |\ \ \ \ \