summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | release all locks on shutdownRobin Appelman2015-06-013-0/+34
| * | | | | dont apply callback wrapper when fopen failedRobin Appelman2015-06-011-1/+1
| * | | | | dont lock on meta data operationsRobin Appelman2015-06-011-4/+4
| * | | | | phpdoc and minor issuesRobin Appelman2015-06-013-13/+21
| * | | | | Use md5 + prefix for file locking keys in memcacheVincent Petry2015-06-012-3/+5
| * | | | | Use md5 for lock keyVincent Petry2015-06-012-4/+16
| * | | | | Add CAS methods to Null memcacheVincent Petry2015-06-011-0/+12
| * | | | | fix testRobin Appelman2015-06-011-2/+2
| * | | | | fix unlocking when moving mount pointsRobin Appelman2015-06-011-0/+5
| * | | | | high level locking wipRobin Appelman2015-06-012-5/+86
| * | | | | always use arraycache for unit testsRobin Appelman2015-06-011-1/+1
| * | | | | add locking to the view apoRobin Appelman2015-06-011-2/+71
| * | | | | add locking to the storage apiRobin Appelman2015-06-016-0/+117
| * | | | | expose locking provider in the server containerRobin Appelman2015-06-012-0/+26
* | | | | | Merge pull request #16655 from owncloud/fix-search-results-phraseThomas Müller2015-06-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix grammar of search results phraseTom Needham2015-06-011-1/+1
|/ / / / /
* | | | | 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
| |/ / / / / / /