summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | Also trim slashes from paths to make sure the locks are based on the same paths.
* Use md5 for lock keyVincent Petry2015-06-012-4/+16
|
* Add CAS methods to Null memcacheVincent Petry2015-06-011-0/+12
| | | | | This prevents breaking ownCloud completely when memcache is not enabled and the locking code is triggered
* 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 #16628 from owncloud/webdav-validatepathThomas Müller2015-06-012-0/+14
|\ | | | | Validate target file name for some webdav ops
| * 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 present
| * | [setup] Disable buttons only in the case they are presentMorris Jobke2015-06-011-1/+4
| | | | | | | | | | | | * fixes #16648
* | | Merge pull request #16629 from owncloud/files-renametoreservednameVincent Petry2015-06-012-24/+16
|\ \ \ | | | | | | | | Check target name on rename with web UI
| * | | Check target name on rename with web UIVincent Petry2015-05-292-24/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | When renaming over the web UI, check early that the target name is valid. This prevents nonsensical error messages when renaming to a name with a trailing backslash.
* | | Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-callsLukas Reschke2015-06-011-0/+10
|\ \ \ | | | | | | | | Fix files_external l10n
| * | | Fix files_external l10nMorris Jobke2015-05-301-0/+10
| | | | | | | | | | | | | | | | | | | | * current l10n..pl script can't extract JS functions that are within a handlebars template - therefore they are duplicated until the script is fixed
* | | | Merge pull request #16637 from owncloud/fix-l10n-apps-managementLukas Reschke2015-06-011-6/+6
|\ \ \ \ | | | | | | | | | | Fix L10n in apps management
| * | | | Fix L10n in apps managementMorris Jobke2015-05-301-6/+6
| |/ / / | | | | | | | | | | | | * fixes #16632
* | | | [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 gone
| * | Abort expiration when file is goneVincent Petry2015-05-292-1/+15
| | | | | | | | | | | | | | | | | | | | | Sometimes a background job for versions expiration was scheduled for a file that has been moved or deleted since. This prevents showing useless warnings in the log and simply bail out.
* | | Merge pull request #16517 from owncloud/remove-logo-wideThomas Müller2015-05-2913-907/+35
|\ \ \ | | | | | | | | replace logo-wide on share page as well with better icon + text
| * | | 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 error
| * | | | 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.php
| * | | | | 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 text
| * | | | 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 <= 9
| * | | | | Fallback to picture preview for IE <= 9Vincent Petry2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE 9 and below do not provide window.btoa and there is currently no way to generate base64 strings without introducting further dependencies. So for now the solution is to fall back to the ugly picture mode for text files whenever IE <= 9 is used.
* | | | | | Merge pull request #16585 from ↵Thomas Müller2015-05-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | mmattel/Missing_translation_in_External_storage_back_end Make string 'SFTP with secret key login' translateable
| * | | | | | 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_Channel
| * | | | | | 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 recipients
| * | | | | | Properly format remote recipientsRoeland Jago Douma2015-05-272-15/+117
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A list of recipients can now be properly formatted with remote shares. Before the shares where simply shown in full in the "Shared with others" section. * Unit tests updated and added
* | | | | | Merge pull request #16610 from owncloud/s2s-shareinforeturn404whendisabledVincent Petry2015-05-281-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return 404 in shareinfo.php when outgoing s2s disabled