summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filesystemRobin Appelman2012-10-274-4/+16
|\
| * Merge branch 'routing'Bart Visscher2012-10-274-4/+16
| |\
| | * Merge branch 'master' into routingBart Visscher2012-10-1732-74/+503
| | |\
| | * | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-281-0/+12
| | * | Merge branch 'master' into routingBart Visscher2012-09-281-1/+1
| | |\ \
| | * \ \ Merge branch 'master' into routingBart Visscher2012-09-2860-158/+613
| | |\ \ \
| | * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-0747-171/+384
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-3056-198/+118
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-2951-108/+356
| | |\ \ \ \ \ \
| | * | | | | | | Fix linkTo calls for new routingBart Visscher2012-08-153-4/+4
* | | | | | | | | fix delete and sort filesRobin Appelman2012-10-273-11/+22
* | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-273-7/+35
|\| | | | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-273-7/+35
* | | | | | | | | move some stuff to the new apiRobin Appelman2012-10-267-12/+13
* | | | | | | | | merge master into filesystemRobin Appelman2012-10-261-6/+5
|\| | | | | | | |
| * | | | | | | | separate buttons for new file and uploadJan-Christoph Borchardt2012-10-261-6/+5
* | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-263-7/+22
|\| | | | | | | |
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-263-7/+22
* | | | | | | | | merge master into filesystemRobin Appelman2012-10-254-5/+5
|\| | | | | | | |
| * | | | | | | | dir in newfile has to start with /Bart Visscher2012-10-251-1/+1
| * | | | | | | | Merge pull request #81 from fmms/masterLukas Reschke2012-10-241-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Checkstyle: NoSpaceAfterCommaFelix Moeller2012-10-231-2/+2
| * | | | | | | | | Revert e1a4fe98908dbf8f9e795fd852b231381d4f3ce4Lukas Reschke2012-10-241-1/+1
| * | | | | | | | | urldecode target directoryBjörn Schießle2012-10-241-1/+1
* | | | | | | | | | cleanup OC_Files a bitRobin Appelman2012-10-245-20/+34
* | | | | | | | | | merge master into filesystemRobin Appelman2012-10-246-25/+53
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #76 from fmms/masterLukas Reschke2012-10-231-1/+1
| |\| | | | | | | |
| | * | | | | | | | Codestyle: FunctionCallArgumentSpacingFelix Moeller2012-10-231-1/+1
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-242-21/+49
| * | | | | | | | | Fix urlencoding in the breadcrumbLukas Reschke2012-10-231-1/+1
| * | | | | | | | | Merge pull request #62 from fmms/masterLukas Reschke2012-10-232-2/+2
| |\| | | | | | | |
| | * | | | | | | | Make Jenkins more happy.Felix Moeller2012-10-232-2/+2
* | | | | | | | | | merge master into filesystemRobin Appelman2012-10-2310-8/+196
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #12 from scambra/fixesicewind19912012-10-232-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | check free space using folder's ownerscambra2012-09-192-2/+2
| * | | | | | | | | | Files: urldecode urlencoded dir names, fixes oc-2111Arthur Schiwon2012-10-231-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-236-3/+175
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-222-0/+16
* | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-212-0/+43
|\| | | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-212-0/+43
* | | | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-2031-105/+238
|\| | | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2014-18/+130
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-1930-88/+109
* | | | | | | | | | merge master into filesystemRobin Appelman2012-10-1851-473/+29
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #39 from scambra/date-l10n-fixesThomas Müller2012-10-181-5/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Translate modification date when file is created/uploaded, use same strings a...scambra2012-10-161-5/+4
| * | | | | | | | | | fix oc-605Jörn Friedrich Dreyer2012-10-182-9/+11
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-1848-445/+0
| * | | | | | | | | | Merge pull request #37 from scambra/js-interpolation-l10nThomas Müller2012-10-172-14/+14
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | use interpolation for some translations in jsscambra2012-10-162-14/+14
| | |/ / / / / / / /