| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Display external storage GUI even if user mounting disabled | Robin McCorkell | 2016-03-16 | 6 | -5/+14 |
| | | |||||
| * | Merge pull request #23253 from owncloud/give-swift-more-time | Thomas Müller | 2016-03-16 | 1 | -2/+3 |
| |\ | | | | | Give swift 15 seconds after startup | ||||
| | * | Give swift 15 seconds after startup | Morris Jobke | 2016-03-16 | 1 | -2/+3 |
| | | | |||||
| * | | Merge pull request #23082 from owncloud/contacts_calendar_name_color | Thomas Müller | 2016-03-16 | 1 | -0/+5 |
| |\ \ | | | | | | | add title and color to birthday calendar | ||||
| | * | | add title and color to birthday calendar | Georg Ehrke | 2016-03-10 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #23300 from owncloud/smb-not-available | Thomas Müller | 2016-03-16 | 1 | -14/+40 |
| |\ \ \ | |_|/ |/| | | handle connection errors as storage not available in smb | ||||
| | * | | handle connection errors as storage not available in smb | Robin Appelman | 2016-03-16 | 1 | -14/+40 |
| | | | | |||||
| * | | | Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1 | Thomas Müller | 2016-03-16 | 2 | -1/+54 |
| |\ \ \ | | | | | | | | | Ensure that stored version is at least 1 for cross-storage copy | ||||
| | * | | | Ensure that stored version is at least 1 for cross-storage copy | Lukas Reschke | 2016-03-16 | 2 | -1/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a move operation from an unencrypted to an encrypted storage the old encrypted version would stay with "0" while the correct value would be "1". Thus we manually set the value to "1" for those cases. See also https://github.com/owncloud/core/issues/23078 | ||||
| * | | | | Merge pull request #22994 from owncloud/check-syntax-on-travis | Thomas Müller | 2016-03-16 | 2 | -0/+13 |
| |\ \ \ \ | | | | | | | | | | | Check the syntax on travis | ||||
| | * | | | | Execute PHP Parallel Linter on Travis | Lukas Reschke | 2016-03-16 | 2 | -0/+13 |
| | |/ / / | |||||
| * | | | | Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0 | Thomas Müller | 2016-03-16 | 1 | -0/+8 |
| |\ \ \ \ | |_|/ / |/| | | | Require at least libxml 2.7.0 | ||||
| | * | | | Require at least libxml 2.7.0 | Lukas Reschke | 2016-03-12 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23168 | ||||
| * | | | | Merge pull request #23155 from owncloud/fed-unshare-with | Thomas Müller | 2016-03-16 | 2 | -1/+33 |
| |\ \ \ \ | |_|/ / |/| | | | Specify the target user when unsharing a federated share | ||||
| | * | | | Specify the target user when unsharing a federated share | Robin Appelman | 2016-03-14 | 2 | -1/+33 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-16 | 16 | -42/+126 |
| | | | | | |||||
| * | | | | Merge pull request #23157 from owncloud/remove-share-prop-entries | Thomas Müller | 2016-03-15 | 3 | -0/+105 |
| |\ \ \ \ | | | | | | | | | | | remove old share propagation entries from appconfig | ||||
| | * | | | | remove old share propagation entries from appconfig | Robin Appelman | 2016-03-15 | 3 | -0/+105 |
| | | | | | | |||||
| * | | | | | Merge pull request #23164 from owncloud/db-connection-precondition-fix | Thomas Müller | 2016-03-15 | 2 | -7/+25 |
| |\ \ \ \ \ | | | | | | | | | | | | | Prevent certain DBs throwing exceptions on same-value updates | ||||
| | * | | | | | Prevent certain DBs throwing exceptions on same-value updates | Robin McCorkell | 2016-03-15 | 2 | -7/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A PreconditionNotMetException must only be thrown if explicit preconditions are specified for setValues(), not if the value is merely the same as was already in the DB. | ||||
| * | | | | | | Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess | Thomas Müller | 2016-03-15 | 7 | -8/+135 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix several .htaccess and .user.ini related problems | ||||
| | * | | | | | | always_populate_raw_post_data has been removed with PHP 7.0 | Lukas Reschke | 2016-03-15 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Add support for custom values in integrity checker | Lukas Reschke | 2016-03-15 | 5 | -7/+123 |
| | | | | | | | | |||||
| | * | | | | | | Replace all required values | Lukas Reschke | 2016-03-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Duplicate block for PHP 7 | Lukas Reschke | 2016-03-15 | 1 | -0/+12 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23251 from owncloud/fix_22907 | Thomas Müller | 2016-03-15 | 2 | -2/+42 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | allow group shares, even if not all public keys are available | ||||
| | * | | | | | | allow group shares, even if not all public keys are available | Bjoern Schiessle | 2016-03-15 | 2 | -2/+42 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #23226 from owncloud/fix_23190 | Thomas Müller | 2016-03-15 | 3 | -8/+38 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Generate a valid URL for link notification | ||||
| | * | | | | | Generate a valid URL for link notification | Roeland Jago Douma | 2016-03-15 | 3 | -8/+38 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #23197 * Updated unit test | ||||
| * | | | | | Merge pull request #22998 from owncloud/delay-loading-the-scanner | Thomas Müller | 2016-03-15 | 2 | -5/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | Delay check till scanner is used | ||||
| | * | | | | | Delay check till scanner is used | Lukas Reschke | 2016-03-09 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987 | ||||
| * | | | | | | Merge pull request #23039 from owncloud/invalid-share-storage | Thomas Müller | 2016-03-15 | 4 | -11/+36 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | dont break when there is an invalid share | ||||
| | * | | | | | | move failedstorage to core | Robin Appelman | 2016-03-11 | 4 | -6/+6 |
| | | | | | | | | |||||
| | * | | | | | | dont break when there is an invalid share | Robin Appelman | 2016-03-11 | 2 | -6/+31 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23074 from ↵ | Thomas Müller | 2016-03-15 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias | ||||
| | * | | | | | | Correctly escape join statements and use selectAlias | Joas Schilling | 2016-03-10 | 3 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23243 from owncloud/revert-23171-master | Lukas Reschke | 2016-03-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revert "Removed unnecessary check 'installed' system value' call." | ||||
| | * | | | | | | | Revert "Removed unnecessary check 'installed' system value' call." | Lukas Reschke | 2016-03-15 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-15 | 38 | -16/+142 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #23171 from maxolasersquad/master | Thomas Müller | 2016-03-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed unnecessary check 'installed' system value' call. | ||||
| | * | | | | | | | Removed unnecessary check 'installed' system value' call. | David Baucum | 2016-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | OC_Utils::checkServer makes an unnecessary call to $config->getSystemValue('installed', false), which replicates the call made immediately before it during the call to needUpgrade. | ||||
| * | | | | | | | | Merge pull request #23225 from owncloud/Phiber2000-fix_logtimezone | Thomas Müller | 2016-03-14 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix broken logtimezone | ||||
| | * | | | | | | | | fix broken logtimezone | Phiber2000 | 2016-03-14 | 1 | -3/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #22901 from owncloud/add-dav-authenticated | Thomas Müller | 2016-03-14 | 2 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add DAV authenticated also to other scopes | ||||
| | * | | | | | | | | | Add DAV authenticated also to other scopes | Lukas Reschke | 2016-03-07 | 2 | -1/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22893 | ||||
| * | | | | | | | | | | Merge pull request #23124 from owncloud/improved-rewrite-rule | Thomas Müller | 2016-03-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Improved rewrite rule | ||||
| | * | | | | | | | | | | Improved rewrite rule | Lukas Reschke | 2016-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://github.com/owncloud/core/issues/23098 and https://github.com/owncloud/core/issues/23117 | ||||
| * | | | | | | | | | | | Merge pull request #23190 from owncloud/use-proper-url-for-search-results | Thomas Müller | 2016-03-14 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use proper URLs for search results | ||||
| | * | | | | | | | | | | | Use proper URLs for search results | Lukas Reschke | 2016-03-12 | 1 | -4/+6 |
| | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23136 | ||||
| * | | | | | | | | | | | Merge pull request #23191 from owncloud/fix-external-dav-storage | Thomas Müller | 2016-03-14 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Verify the getResponse returns a ResponseInterface | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |