summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* expose locking provider in the server containerRobin Appelman2015-06-012-0/+26
* Merge pull request #16628 from owncloud/webdav-validatepathThomas Müller2015-06-012-0/+14
|\
| * Validate target file name for some webdav opsVincent Petry2015-05-292-0/+14
* | Merge pull request #16650 from owncloud/fix-sqlite-only-setupThomas Müller2015-06-011-1/+4
|\ \
| * | [setup] Disable buttons only in the case they are presentMorris Jobke2015-06-011-1/+4
* | | Merge pull request #16629 from owncloud/files-renametoreservednameVincent Petry2015-06-012-24/+16
|\ \ \
| * | | Check target name on rename with web UIVincent Petry2015-05-292-24/+16
| | |/ | |/|
* | | Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-callsLukas Reschke2015-06-011-0/+10
|\ \ \
| * | | Fix files_external l10nMorris Jobke2015-05-301-0/+10
* | | | Merge pull request #16637 from owncloud/fix-l10n-apps-managementLukas Reschke2015-06-011-6/+6
|\ \ \ \
| * | | | Fix L10n in apps managementMorris Jobke2015-05-301-6/+6
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-014-0/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-3154-24/+118
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-3034-2/+62
* | | Add information how to report security bugsLukas Reschke2015-05-291-0/+1
|/ /
* | Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfilesBjörn Schießle2015-05-292-1/+15
|\ \
| * | Abort expiration when file is goneVincent Petry2015-05-292-1/+15
* | | Merge pull request #16517 from owncloud/remove-logo-wideThomas Müller2015-05-2913-907/+35
|\ \ \
| * | | change tests back to check for logo-wide, make them pass againJan-Christoph Borchardt2015-05-281-3/+3
| * | | also replace logo-mail with new lookJan-Christoph Borchardt2015-05-221-0/+0
| * | | replace logo-wide on share page as well with better icon + textJan-Christoph Borchardt2015-05-226-24/+22
| * | | remove logo-wide from testsJan-Christoph Borchardt2015-05-217-886/+16
* | | | Merge pull request #16615 from owncloud/syntaxfixMorris Jobke2015-05-291-2/+2
|\ \ \ \
| * | | | fix formatting errorCarla Schroder2015-05-281-2/+2
* | | | | Merge pull request #16619 from mmattel/missing_translations_in_ldapMorris Jobke2015-05-291-3/+3
|\ \ \ \ \
| * | | | | Missing translation in ldap part.wizard-server.phpMartin2015-05-291-3/+3
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-2912-6/+20
|/ / / /
* | | | Merge pull request #16578 from owncloud/fix_16556Thomas Müller2015-05-281-1/+1
|\ \ \ \
| * | | | show txt preview when file contains textGeorg Ehrke2015-05-271-1/+1
* | | | | Merge pull request #16607 from owncloud/ie9-textpreviewfallbackThomas Müller2015-05-281-1/+1
|\ \ \ \ \
| * | | | | Fallback to picture preview for IE <= 9Vincent Petry2015-05-281-1/+1
* | | | | | Merge pull request #16585 from mmattel/Missing_translation_in_External_storag...Thomas Müller2015-05-281-1/+1
|\ \ \ \ \ \
| * | | | | | Make string 'SFTP with secret key login' translatableMartin2015-05-271-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16592 from owncloud/fix-16574Morris Jobke2015-05-281-0/+1
|\ \ \ \ \ \
| * | | | | | Add type hint for OC_ChannelVictor Dubiniuk2015-05-271-0/+1
| |/ / / / /
* | | | | | Merge pull request #16380 from rullzer/fix_16281Morris Jobke2015-05-282-15/+117
|\ \ \ \ \ \
| * | | | | | Properly format remote recipientsRoeland Jago Douma2015-05-272-15/+117
| |/ / / / /
* | | | | | Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabledVincent Petry2015-05-281-0/+5
|\ \ \ \ \ \
| * | | | | | Return 404 in shareinfo.php when outgoing s2s disabledVincent Petry2015-05-281-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16613 from owncloud/quota-onlyforfilesMorris Jobke2015-05-282-14/+28
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Only use quota stream wrapper on "files"Vincent Petry2015-05-282-14/+28
|/ / / / /
* | | | | Merge pull request #16467 from owncloud/apps-fixsortLukas Reschke2015-05-282-9/+27
|\ \ \ \ \
| * | | | | Sort apps by level, then by nameVincent Petry2015-05-202-9/+27
* | | | | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storagesVincent Petry2015-05-285-45/+150
|\ \ \ \ \ \
| * | | | | | copy keys before we move a file between storages to make sure that the new ta...Bjoern Schiessle2015-05-223-27/+107
| * | | | | | distinguish between source and target mount point to allow copy/rename betwee...Bjoern Schiessle2015-05-212-18/+43
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #16577 from owncloud/enc_improve_migrationVincent Petry2015-05-282-58/+63
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | only request encryption module for files which are not excludedBjoern Schiessle2015-05-272-58/+63
| | |_|/ / | |/| | |
* | | | | Merge pull request #16591 from owncloud/enc_improved_error_messageBjörn Schießle2015-05-2812-35/+136
|\ \ \ \ \
| * | | | | detect migration statusBjoern Schiessle2015-05-276-7/+115