summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4302 from synchrone/masterMorris Jobke2013-08-141-0/+1
|\ | | | | Fixing owncloud/core#4301
| * Fixing owncloud/core#4301Alexander Bogdanov2013-08-021-0/+1
| | | | | | Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
* | Merge pull request #4393 from owncloud/fix_4326Andreas Fischer2013-08-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | provide correct path for require_once * owncloud/fix_4326: use __DIR__ instead of realpath provide correct path for require_once
| * | use __DIR__ instead of realpathBjoern Schiessle2013-08-141-1/+1
| | |
| * | provide correct path for require_onceBjoern Schiessle2013-08-121-1/+1
| | |
* | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-143-23/+8
|\ \ \ | | | | | | | | Use plural translations
| * | | 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
|\ \ \ | | | | | | | | Send mime-type for new files
| * | | 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
|\ \ | | | | | | General CSS cleanup
| * \ Merge branch 'master' into css_cleanup_kondoukondou2013-07-24862-1086/+79955
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css settings/templates/personal.php
| * | | 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 versions
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Allow true and false as filenames.
| * | | | | Check expected type after JSON decode instead of checking what is not expected.Andreas Fischer2013-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This will also allow "true" and "false" as filenames instead of only "null".
* | | | | | more error messages which might be useful for the user to debug his server ↵Bjoern Schiessle2013-08-082-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | config
* | | | | | improved error message to refect openSSL PHP extension and stock openSSL ↵Bjoern Schiessle2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | configuration issues
* | | | | | 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
| | | | | |
* | | | | | [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
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding new cli script to rescan files
| * | | | | | 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 !== and === in files_trashbin app
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | cancel sharing if some users doesn't have a working encryption set-up.
| * | | | | 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 tags
| * | | | | | 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 log
| * | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | More verbose 404, closes #3225
| * | | | | Use default cursor for list itemsVictor Dubiniuk2013-07-301-1/+1
| | | | | |