Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dont apply callback wrapper when fopen failed | Robin Appelman | 2015-06-01 | 1 | -1/+1 |
| | |||||
* | dont lock on meta data operations | Robin Appelman | 2015-06-01 | 1 | -4/+4 |
| | |||||
* | phpdoc and minor issues | Robin Appelman | 2015-06-01 | 3 | -13/+21 |
| | |||||
* | Use md5 + prefix for file locking keys in memcache | Vincent Petry | 2015-06-01 | 2 | -3/+5 |
| | | | | | Also trim slashes from paths to make sure the locks are based on the same paths. | ||||
* | Use md5 for lock key | Vincent Petry | 2015-06-01 | 2 | -4/+16 |
| | |||||
* | Add CAS methods to Null memcache | Vincent Petry | 2015-06-01 | 1 | -0/+12 |
| | | | | | This prevents breaking ownCloud completely when memcache is not enabled and the locking code is triggered | ||||
* | fix test | Robin Appelman | 2015-06-01 | 1 | -2/+2 |
| | |||||
* | fix unlocking when moving mount points | Robin Appelman | 2015-06-01 | 1 | -0/+5 |
| | |||||
* | high level locking wip | Robin Appelman | 2015-06-01 | 2 | -5/+86 |
| | |||||
* | always use arraycache for unit tests | Robin Appelman | 2015-06-01 | 1 | -1/+1 |
| | |||||
* | add locking to the view apo | Robin Appelman | 2015-06-01 | 1 | -2/+71 |
| | |||||
* | add locking to the storage api | Robin Appelman | 2015-06-01 | 6 | -0/+117 |
| | |||||
* | expose locking provider in the server container | Robin Appelman | 2015-06-01 | 2 | -0/+26 |
| | |||||
* | Merge pull request #16628 from owncloud/webdav-validatepath | Thomas Müller | 2015-06-01 | 2 | -0/+14 |
|\ | | | | | Validate target file name for some webdav ops | ||||
| * | Validate target file name for some webdav ops | Vincent Petry | 2015-05-29 | 2 | -0/+14 |
| | | |||||
* | | Merge pull request #16650 from owncloud/fix-sqlite-only-setup | Thomas Müller | 2015-06-01 | 1 | -1/+4 |
|\ \ | | | | | | | [setup] Disable buttons only in the case they are present | ||||
| * | | [setup] Disable buttons only in the case they are present | Morris Jobke | 2015-06-01 | 1 | -1/+4 |
| | | | | | | | | | | | | * fixes #16648 | ||||
* | | | Merge pull request #16629 from owncloud/files-renametoreservedname | Vincent Petry | 2015-06-01 | 2 | -24/+16 |
|\ \ \ | | | | | | | | | Check target name on rename with web UI | ||||
| * | | | Check target name on rename with web UI | Vincent Petry | 2015-05-29 | 2 | -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-calls | Lukas Reschke | 2015-06-01 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Fix files_external l10n | ||||
| * | | | Fix files_external l10n | Morris Jobke | 2015-05-30 | 1 | -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-management | Lukas Reschke | 2015-06-01 | 1 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Fix L10n in apps management | ||||
| * | | | | Fix L10n in apps management | Morris Jobke | 2015-05-30 | 1 | -6/+6 |
| |/ / / | | | | | | | | | | | | | * fixes #16632 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-01 | 4 | -0/+12 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-31 | 54 | -24/+118 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-30 | 34 | -2/+62 |
| | | | |||||
* | | | Add information how to report security bugs | Lukas Reschke | 2015-05-29 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles | Björn Schießle | 2015-05-29 | 2 | -1/+15 |
|\ \ | | | | | | | Abort expiration when file is gone | ||||
| * | | Abort expiration when file is gone | Vincent Petry | 2015-05-29 | 2 | -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-wide | Thomas Müller | 2015-05-29 | 13 | -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 again | Jan-Christoph Borchardt | 2015-05-28 | 1 | -3/+3 |
| | | | | |||||
| * | | | also replace logo-mail with new look | Jan-Christoph Borchardt | 2015-05-22 | 1 | -0/+0 |
| | | | | |||||
| * | | | replace logo-wide on share page as well with better icon + text | Jan-Christoph Borchardt | 2015-05-22 | 6 | -24/+22 |
| | | | | |||||
| * | | | remove logo-wide from tests | Jan-Christoph Borchardt | 2015-05-21 | 7 | -886/+16 |
| | | | | |||||
* | | | | Merge pull request #16615 from owncloud/syntaxfix | Morris Jobke | 2015-05-29 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | fix formatting error | ||||
| * | | | | fix formatting error | Carla Schroder | 2015-05-28 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #16619 from mmattel/missing_translations_in_ldap | Morris Jobke | 2015-05-29 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Missing translation in ldap part.wizard-server.php | ||||
| * | | | | | Missing translation in ldap part.wizard-server.php | Martin | 2015-05-29 | 1 | -3/+3 |
|/ / / / / | |||||
* / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-29 | 12 | -6/+20 |
|/ / / / | |||||
* | | | | Merge pull request #16578 from owncloud/fix_16556 | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | show txt preview when file contains text | ||||
| * | | | | show txt preview when file contains text | Georg Ehrke | 2015-05-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16607 from owncloud/ie9-textpreviewfallback | Thomas Müller | 2015-05-28 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fallback to picture preview for IE <= 9 | ||||
| * | | | | | Fallback to picture preview for IE <= 9 | Vincent Petry | 2015-05-28 | 1 | -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üller | 2015-05-28 | 1 | -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' translatable | Martin | 2015-05-27 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #16592 from owncloud/fix-16574 | Morris Jobke | 2015-05-28 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add type hint for OC_Channel | ||||
| * | | | | | | Add type hint for OC_Channel | Victor Dubiniuk | 2015-05-27 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16380 from rullzer/fix_16281 | Morris Jobke | 2015-05-28 | 2 | -15/+117 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Properly format recipients | ||||
| * | | | | | | Properly format remote recipients | Roeland Jago Douma | 2015-05-27 | 2 | -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-shareinforeturn404whendisabled | Vincent Petry | 2015-05-28 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Return 404 in shareinfo.php when outgoing s2s disabled |