summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-153-15/+10
|\
| * fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-301-1/+1
| * Replace delete icon with spinnerVictor Dubiniuk2013-07-291-5/+3
| * Merge branch 'master' into delete-fixThomas Müller2013-07-2329-87/+65
| |\
| * | fix delete button not showing in IE8Jan-Christoph Borchardt2013-07-221-4/+4
| * | use new delete icon for deleted files as wellJan-Christoph Borchardt2013-07-181-1/+1
| * | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+1
| * | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-181-4/+1
* | | Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_fir...Thomas Müller2013-08-151-2/+3
|\ \ \
| * | | fix #2711 using a custom event, also use css selectors over filterAttrJörn Friedrich Dreyer2013-08-081-2/+3
* | | | fixing all broken translation filesThomas Müller2013-08-1568-204/+204
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1568-263/+204
* | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-142-13/+6
|\ \ \ \
| * | | | Reword a phrasekondou2013-08-141-1/+1
| * | | | Use plural translationskondou2013-08-092-13/+6
* | | | | 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-111-0/+3
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0971-71/+213
|/ / / /
* | | | Merge pull request #3912 from owncloud/css_cleanup_kondouJan-Christoph Borchardt2013-08-081-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-2433-95/+199
| |\ \ \ \
| * | | | | General CSS cleanupkondou2013-07-091-1/+1
* | | | | | 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
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-071-0/+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-021-12/+12
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-311-0/+3
* | | | | Merge pull request #4203 from owncloud/trashbin_improvementsBjörn Schießle2013-07-295-6/+20
|\ \ \ \ \
| * | | | | remove whitespacesBjoern Schiessle2013-07-291-1/+1
| * | | | | fix typoBjörn Schießle2013-07-261-1/+1
| * | | | | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-265-7/+21
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-291-0/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-271-0/+2
|/ / / /
* | | | Merge branch 'master' into sabre-objecttreeRobin Appelman2013-07-2470-212/+480
|\ \ \ \
| * \ \ \ Merge branch 'master' into more-themable-stringsThomas Müller2013-07-2418-69/+120
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into disable-anon-upload-masterThomas Müller2013-07-2222-78/+100
| | |\ \ \
| | | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-2223-22/+3
| | | * | | Merge pull request #4131 from owncloud/scanner-splitBart Visscher2013-07-211-45/+29
| | | |\ \ \
| | | | * | | Split scanning logic from ajax fileRobin Appelman2013-07-191-45/+29
| | | * | | | Merge pull request #4118 from owncloud/remove-size-experimentMorris Jobke2013-07-214-10/+5
| | | |\ \ \ \
| | | | * | | | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-184-10/+5
| | | | | |_|/ | | | | |/| |
| | | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-211-0/+6
| | | | |/ / | | | |/| |
| | | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-192-11/+18
| | | |/ /