summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | fix test and make warning translatableBjoern Schiessle2013-08-012-3/+9
| | * | cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-9/+6
| * | | Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdocJörn Friedrich Dreyer2013-08-011-0/+15
| |\ \ \
| | * | | added @var tagsChristian Berendt2013-08-011-0/+15
| * | | | Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_loggingJörn Friedrich Dreyer2013-08-011-0/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | write all catched exception messages to the logChristian Berendt2013-08-011-0/+14
| | |/ /
| * / / [tx-robot] updated from transifexJenkins for ownCloud2013-08-0123-3/+90
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-3111-1/+46
| * | Merge pull request #4225 from owncloud/better-404Thomas Müller2013-07-303-0/+30
| |\ \
| | * | Use default cursor for list itemsVictor Dubiniuk2013-07-301-1/+1
| | * | RewordingVictor Dubiniuk2013-07-291-1/+1
| | * | Move styles from core to appVictor Dubiniuk2013-07-292-0/+13
| | * | Allow apps to have own 404 content, closes #3225Victor Dubiniuk2013-07-292-0/+17
| * | | added missing isEmpty ajax fileBjoern Schiessle2013-07-301-0/+14
* | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-07-3010-5/+70
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-3010-5/+70
* | | | style fixesGeorg Ehrke2013-07-303-3/+3
* | | | Merge branch 'master' into oc_previewThomas Müller2013-07-30958-1821/+80173
|\| | |
| * | | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-298-48/+133
| |\ \ \ | | |/ / | |/| |
| | * | remove whitespacesBjoern Schiessle2013-07-291-1/+1
| | * | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-1/+1
| | * | found some more places where we can disable buttons while performing a actionBjörn Schießle2013-07-261-6/+18
| | * | Hide Delete Permanently button when Restore happensBjörn Schießle2013-07-261-0/+4
| | * | make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| | * | fix typoBjörn Schießle2013-07-261-1/+1
| | * | expire trash bin if trash bin exceeds max size after a new file was added to ...Björn Schießle2013-07-262-7/+34
| | * | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-266-7/+36
| | * | don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5